From a9f3a8f4a0daa4034975fdbfb727c713d2288b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josh=20Goldberg=20=E2=9C=A8?= Date: Wed, 11 Nov 2026 10:56:20 -0500 Subject: [PATCH 01/18] ref(lint): Enable no-unnecessary-condition in cli Co-Authored-By: Claude Opus 5.5 --- .oxlintrc.json | 6 +++ .../cli/src/commands/alert/issues/edit.ts | 2 +- .../cli/src/commands/alert/issues/list.ts | 6 +-- .../cli/src/commands/alert/metrics/create.ts | 4 +- .../cli/src/commands/alert/metrics/edit.ts | 2 +- .../cli/src/commands/alert/metrics/list.ts | 6 +-- packages/cli/src/commands/api.ts | 2 +- packages/cli/src/commands/cli/defaults.ts | 2 +- packages/cli/src/commands/cli/upgrade.ts | 4 +- .../cli/src/commands/dashboard/resolve.ts | 2 +- packages/cli/src/commands/dashboard/view.ts | 2 +- packages/cli/src/commands/event/send.ts | 2 +- packages/cli/src/commands/feedback/view.ts | 2 +- packages/cli/src/commands/issue/list.ts | 8 +--- packages/cli/src/commands/issue/utils.ts | 10 ++--- packages/cli/src/commands/issue/view.ts | 2 +- .../cli/src/commands/local/control-plane.ts | 2 +- packages/cli/src/commands/local/daemon.ts | 2 +- packages/cli/src/commands/local/run.ts | 2 + packages/cli/src/commands/local/server.ts | 3 +- packages/cli/src/commands/log/list.ts | 6 +-- packages/cli/src/commands/monitor/run.ts | 4 +- packages/cli/src/commands/proguard/uuid.ts | 2 +- packages/cli/src/commands/release/list.ts | 4 +- packages/cli/src/commands/replay/list.ts | 4 +- packages/cli/src/commands/trace/view.ts | 2 +- packages/cli/src/commands/trial/list.ts | 2 +- packages/cli/src/commands/wasm-split.ts | 2 +- packages/cli/src/lib/api/chunk-upload.ts | 2 +- packages/cli/src/lib/api/infrastructure.ts | 2 +- packages/cli/src/lib/api/issues.ts | 4 +- packages/cli/src/lib/api/projects.ts | 4 +- packages/cli/src/lib/api/status-page.ts | 10 ++--- packages/cli/src/lib/banner.ts | 2 +- packages/cli/src/lib/chunk-loader.ts | 3 +- packages/cli/src/lib/clipboard.ts | 7 +-- packages/cli/src/lib/datasets.ts | 5 ++- packages/cli/src/lib/db/auth.ts | 4 +- packages/cli/src/lib/db/migration.ts | 44 +++++++++---------- packages/cli/src/lib/db/sqlite.ts | 6 ++- packages/cli/src/lib/delta-upgrade.ts | 25 ++++------- packages/cli/src/lib/detect-agent.ts | 2 +- packages/cli/src/lib/formatters/colors.ts | 13 +++--- .../cli/src/lib/formatters/event-outcomes.ts | 4 +- .../src/lib/formatters/explore-timeseries.ts | 2 +- packages/cli/src/lib/formatters/feedback.ts | 2 +- packages/cli/src/lib/formatters/human.ts | 20 ++++----- packages/cli/src/lib/formatters/local.ts | 4 +- packages/cli/src/lib/formatters/markdown.ts | 25 +++++------ packages/cli/src/lib/formatters/replay.ts | 2 +- packages/cli/src/lib/formatters/seer.ts | 2 +- packages/cli/src/lib/formatters/sql.ts | 2 +- packages/cli/src/lib/formatters/trace.ts | 4 +- packages/cli/src/lib/games/snake-terminal.ts | 4 +- packages/cli/src/lib/ghcr.ts | 2 +- packages/cli/src/lib/help.ts | 2 +- packages/cli/src/lib/interactive-login.ts | 2 +- packages/cli/src/lib/introspect.ts | 28 +++++------- packages/cli/src/lib/list-command.ts | 2 +- packages/cli/src/lib/region.ts | 4 +- packages/cli/src/lib/release-notes.ts | 2 +- packages/cli/src/lib/replay-search.ts | 2 +- packages/cli/src/lib/resolve-target.ts | 2 +- packages/cli/src/lib/response-cache-store.ts | 3 +- packages/cli/src/lib/scan/concurrent.ts | 6 ++- packages/cli/src/lib/scan/grep.ts | 6 +-- packages/cli/src/lib/scan/walker.ts | 4 +- packages/cli/src/lib/sentryclirc-import.ts | 2 +- packages/cli/src/lib/sixel.ts | 8 ++-- packages/cli/src/lib/snapshots/archive.ts | 2 +- packages/cli/src/lib/telemetry.ts | 2 +- .../src/lib/telemetry/credential-redaction.ts | 2 +- packages/cli/src/lib/upgrade.ts | 2 +- packages/cli/src/lib/walk-up.ts | 2 +- packages/cli/src/output-schemas/dashboard.ts | 2 +- packages/cli/test/commands/api.test.ts | 12 ++--- .../cli/test/commands/dashboard/list.test.ts | 14 ++---- packages/cli/test/commands/log/list.test.ts | 1 + .../cli/test/lib/api/chunk-upload.test.ts | 6 ++- .../cli/test/lib/completions.property.test.ts | 5 ++- .../cli/test/lib/formatters/trace.test.ts | 8 ---- 81 files changed, 206 insertions(+), 228 deletions(-) diff --git a/.oxlintrc.json b/.oxlintrc.json index 3fc1c7fdfb..0eafbfa64d 100644 --- a/.oxlintrc.json +++ b/.oxlintrc.json @@ -157,6 +157,12 @@ "no-console": "error" } }, + { + "files": ["packages/cli/**/*.{ts,tsx,js,mjs,cjs}"], + "rules": { + "typescript/no-unnecessary-condition": "error" + } + }, { "files": ["packages/cli/script/**/*.ts"], "rules": { diff --git a/packages/cli/src/commands/alert/issues/edit.ts b/packages/cli/src/commands/alert/issues/edit.ts index 7c57aa489e..e44c708f4b 100644 --- a/packages/cli/src/commands/alert/issues/edit.ts +++ b/packages/cli/src/commands/alert/issues/edit.ts @@ -329,7 +329,7 @@ export const editCommand = buildCommand({ ...updated, org: target.org, project: target.project, - id: stringifyUnknown(updated.id ?? rule.id), + id: stringifyUnknown(updated.id), // The workflows endpoint returns `enabled` rather than `status`; map it // back to a status label so human/JSON output matches the create path. status: !updated.enabled ? "disabled" : "active", diff --git a/packages/cli/src/commands/alert/issues/list.ts b/packages/cli/src/commands/alert/issues/list.ts index f8bcb90a49..ada48d56df 100644 --- a/packages/cli/src/commands/alert/issues/list.ts +++ b/packages/cli/src/commands/alert/issues/list.ts @@ -329,9 +329,7 @@ async function handleResolvedTargets( ); const filteredRows = flags.query ? allRows.filter((row) => - (row.rule.name ?? "") - .toLowerCase() - .includes(flags.query?.toLowerCase() ?? ""), + row.rule.name.toLowerCase().includes(flags.query?.toLowerCase() ?? ""), ) : allRows; @@ -453,7 +451,7 @@ function formatIssueAlertListHuman(result: IssueAlertListResult): string { const tableRows: Row[] = rows.map(({ rule: r, target }) => ({ id: r.id, - name: tableCell(r.name ?? "(untitled)"), + name: tableCell(r.name), ...(isMultiProject && { project: `${target.org}/${target.project}`, }), diff --git a/packages/cli/src/commands/alert/metrics/create.ts b/packages/cli/src/commands/alert/metrics/create.ts index 6d1f796827..4772bababd 100644 --- a/packages/cli/src/commands/alert/metrics/create.ts +++ b/packages/cli/src/commands/alert/metrics/create.ts @@ -237,10 +237,8 @@ export const createCommand = buildCommand({ dataset, timeWindow: flags["time-window"], triggers, + projects, }; - if (projects && projects.length > 0) { - body.projects = projects; - } if (flags.environment !== undefined) { body.environment = flags.environment; } diff --git a/packages/cli/src/commands/alert/metrics/edit.ts b/packages/cli/src/commands/alert/metrics/edit.ts index 05bbab2b76..d996649dfc 100644 --- a/packages/cli/src/commands/alert/metrics/edit.ts +++ b/packages/cli/src/commands/alert/metrics/edit.ts @@ -324,7 +324,7 @@ export const editCommand = buildCommand({ yield new CommandOutput({ ...updated, org: orgSlug, - id: stringifyUnknown(updated.id ?? rule.id), + id: stringifyUnknown(updated.id), // The detectors endpoint returns `enabled` rather than `status`. status: !updated.enabled ? "disabled" : "active", } satisfies MetricAlertEditOutput); diff --git a/packages/cli/src/commands/alert/metrics/list.ts b/packages/cli/src/commands/alert/metrics/list.ts index 97fd60a6fb..b380a9f5d6 100644 --- a/packages/cli/src/commands/alert/metrics/list.ts +++ b/packages/cli/src/commands/alert/metrics/list.ts @@ -339,9 +339,7 @@ async function handleResolvedOrgs( ); const filteredRows = flags.query ? allRows.filter((row) => - (row.rule.name ?? "") - .toLowerCase() - .includes(flags.query?.toLowerCase() ?? ""), + row.rule.name.toLowerCase().includes(flags.query?.toLowerCase() ?? ""), ) : allRows; @@ -464,7 +462,7 @@ function formatMetricAlertListHuman(result: MetricAlertListResult): string { const tableRows: Row[] = rows.map(({ rule: r, orgSlug }) => ({ id: r.id, - name: tableCell(r.name ?? "(untitled)"), + name: tableCell(r.name), ...(isMultiOrg && { org: orgSlug }), aggregate: r.aggregate, dataset: r.dataset, diff --git a/packages/cli/src/commands/api.ts b/packages/cli/src/commands/api.ts index f9a7865def..e69e2ffc7a 100644 --- a/packages/cli/src/commands/api.ts +++ b/packages/cli/src/commands/api.ts @@ -880,7 +880,7 @@ function parseUrlEncodedParams( * @internal Exported for testing */ export function dataToQueryParams( - data: Record | unknown[] | string, + data: unknown, ): Record { if (typeof data === "string") { return parseUrlEncodedParams(data); diff --git a/packages/cli/src/commands/cli/defaults.ts b/packages/cli/src/commands/cli/defaults.ts index 7a0230c7e2..6c2012b2bf 100644 --- a/packages/cli/src/commands/cli/defaults.ts +++ b/packages/cli/src/commands/cli/defaults.ts @@ -467,7 +467,7 @@ export const defaultsCommand = buildCommand({ if (canonical === "telemetry") { const effective = computeTelemetryEffective(); if ( - effective?.source.startsWith("env:") && + effective.source.startsWith("env:") && effective.enabled !== (newValue === "on") ) { log.warn( diff --git a/packages/cli/src/commands/cli/upgrade.ts b/packages/cli/src/commands/cli/upgrade.ts index 4b4ebfc2a5..c40c027c35 100644 --- a/packages/cli/src/commands/cli/upgrade.ts +++ b/packages/cli/src/commands/cli/upgrade.ts @@ -1360,13 +1360,15 @@ export const upgradeCommand = buildCommand({ database, }); } else { + // Library mode's process stand-in has no argv. + const argv = this.process.argv as readonly string[] | undefined; await executeStandardUpgrade({ method, channel, versionArg, target, execPath: this.process.execPath, - entryPath: this.process.argv?.[1], + entryPath: argv?.[1], pathEnv: this.process.env.PATH, offline, json: flags.json, diff --git a/packages/cli/src/commands/dashboard/resolve.ts b/packages/cli/src/commands/dashboard/resolve.ts index 4f78a798a9..4154efda2a 100644 --- a/packages/cli/src/commands/dashboard/resolve.ts +++ b/packages/cli/src/commands/dashboard/resolve.ts @@ -184,7 +184,7 @@ export async function resolveDashboardId( * @returns Resolved widget index */ export function resolveWidgetIndex( - widgets: DashboardWidget[], + widgets: readonly { title?: string }[], index: number | undefined, title: string | undefined, ): number { diff --git a/packages/cli/src/commands/dashboard/view.ts b/packages/cli/src/commands/dashboard/view.ts index 514f68951f..c770e47ecc 100644 --- a/packages/cli/src/commands/dashboard/view.ts +++ b/packages/cli/src/commands/dashboard/view.ts @@ -313,7 +313,7 @@ export const viewCommand = buildCommand({ // Library mode: honor external abort signal (e.g., consumer break) const externalSignal = (this.process as { abortSignal?: AbortSignal }) - ?.abortSignal; + .abortSignal; if (externalSignal) { externalSignal.addEventListener("abort", stop, { once: true }); } diff --git a/packages/cli/src/commands/event/send.ts b/packages/cli/src/commands/event/send.ts index 13cf5548b5..a77b0f70df 100644 --- a/packages/cli/src/commands/event/send.ts +++ b/packages/cli/src/commands/event/send.ts @@ -75,7 +75,7 @@ async function buildFilePayload( try { const firstLine = new TextDecoder().decode(bytes).split("\n")[0] ?? "{}"; const header = JSON.parse(firstLine) as Record; - eventId = (header.event_id as string) ?? ""; + eventId = typeof header.event_id === "string" ? header.event_id : ""; } catch (err) { log.debug("Could not extract event_id from envelope header", err); } diff --git a/packages/cli/src/commands/feedback/view.ts b/packages/cli/src/commands/feedback/view.ts index f5a638de96..cc9e3ad0ba 100644 --- a/packages/cli/src/commands/feedback/view.ts +++ b/packages/cli/src/commands/feedback/view.ts @@ -181,7 +181,7 @@ export const viewCommand = buildCommand({ : []; yield new CommandOutput({ - org: org ?? null, + org, feedback, event: event ?? null, replayIds, diff --git a/packages/cli/src/commands/issue/list.ts b/packages/cli/src/commands/issue/list.ts index 970dfa3c38..cc80c96419 100644 --- a/packages/cli/src/commands/issue/list.ts +++ b/packages/cli/src/commands/issue/list.ts @@ -1617,11 +1617,7 @@ function jsonTransformIssueList( const transformed = jsonTransformListResult(result, fields); // Only inject into empty paginated envelopes — helps agents discover // query syntax when their search returned nothing. - if ( - transformed && - typeof transformed === "object" && - !Array.isArray(transformed) - ) { + if (!Array.isArray(transformed)) { const envelope = transformed as Record; const data = envelope.data; if (Array.isArray(data) && data.length === 0) { @@ -1805,7 +1801,7 @@ export const listCommand = buildListCommand("issue", { const displayRows: IssueTableRow[] = [ { issue, - orgSlug: org ?? "", + orgSlug: org, formatOptions: { projectSlug: issue.project?.slug ?? "", isMultiProject: false, diff --git a/packages/cli/src/commands/issue/utils.ts b/packages/cli/src/commands/issue/utils.ts index 04a5027889..b89d081737 100644 --- a/packages/cli/src/commands/issue/utils.ts +++ b/packages/cli/src/commands/issue/utils.ts @@ -89,7 +89,7 @@ export async function mapIssueArgsConcurrently( const values: T[] = []; for (const result of settled) { - if (result?.status === "fulfilled") { + if (result.status === "fulfilled") { values.push(result.value); } } @@ -308,8 +308,8 @@ async function resolveProjectSearchFallback( // due to a transient error (5xx, timeout); retrying here either succeeds // or propagates the real error to the user. const matchedProject = projects[0]; - const matchedOrg = matchedProject?.orgSlug; - if (matchedOrg && matchedProject) { + if (matchedProject?.orgSlug) { + const matchedOrg = matchedProject.orgSlug; const retryShortId = expandToFullShortId(suffix, matchedProject.slug); const issue = await getIssueByShortId(matchedOrg, retryShortId, { collapse: ISSUE_DETAIL_COLLAPSE, @@ -348,9 +348,7 @@ async function findIssuesByShortId( // Only throw when ALL results are errors — if some orgs returned clean // 404s ({ok: true, value: null}), fall through to the fallback for a // precise error message. - const realErrors = results.filter( - (r): r is AuthGuardFailure => r !== undefined && !r.ok, - ); + const realErrors = results.filter((r): r is AuthGuardFailure => !r.ok); if (realErrors.length === results.length && realErrors.length > 0) { const firstError = realErrors[0]?.error; if (firstError instanceof Error) { diff --git a/packages/cli/src/commands/issue/view.ts b/packages/cli/src/commands/issue/view.ts index a61f4aa596..b724fb700f 100644 --- a/packages/cli/src/commands/issue/view.ts +++ b/packages/cli/src/commands/issue/view.ts @@ -232,7 +232,7 @@ async function buildSingleIssueViewData( : await fetchIssueDetails(orgSlug, issue.id, spans); return { - org: orgSlug ?? null, + org: orgSlug, issue, event: event ?? null, ...details, diff --git a/packages/cli/src/commands/local/control-plane.ts b/packages/cli/src/commands/local/control-plane.ts index 17de5c88e5..d180d14348 100644 --- a/packages/cli/src/commands/local/control-plane.ts +++ b/packages/cli/src/commands/local/control-plane.ts @@ -675,7 +675,7 @@ export function createLocalControlPlane({ contentType: container.getContentType(), itemTypes: parsed?.envelope[1] - .map((item) => + .map((item: unknown) => Array.isArray(item) && typeof item[0] === "object" && item[0] ? stringifyUnknown( (item[0] as { type?: unknown }).type ?? "unknown", diff --git a/packages/cli/src/commands/local/daemon.ts b/packages/cli/src/commands/local/daemon.ts index 1936ba23ab..76ccc65230 100644 --- a/packages/cli/src/commands/local/daemon.ts +++ b/packages/cli/src/commands/local/daemon.ts @@ -89,7 +89,7 @@ function startupLockPath(directory: string): string { function shutdownServer(server: Server): Promise { return new Promise((resolve) => { server.close(() => resolve()); - server.closeAllConnections?.(); + server.closeAllConnections(); }); } diff --git a/packages/cli/src/commands/local/run.ts b/packages/cli/src/commands/local/run.ts index 18e18c9a9f..0a5ab0d586 100644 --- a/packages/cli/src/commands/local/run.ts +++ b/packages/cli/src/commands/local/run.ts @@ -856,6 +856,7 @@ async function gracefulKill(child: ChildProcess): Promise { }), ]); clearTimeout(graceTimer); + // oxlint-disable-next-line typescript/no-unnecessary-condition -- exitCode changes while awaiting; TS keeps the earlier narrowing if (!exited && child.exitCode === null) { try { child.kill("SIGKILL"); @@ -865,6 +866,7 @@ async function gracefulKill(child: ChildProcess): Promise { } // Only await close if the child hasn't exited yet — avoids hanging // if close fired between SIGKILL and listener attachment. + // oxlint-disable-next-line typescript/no-unnecessary-condition -- exitCode changes while awaiting; TS keeps the earlier narrowing if (child.exitCode === null) { await new Promise((r) => child.on("close", () => r())); } diff --git a/packages/cli/src/commands/local/server.ts b/packages/cli/src/commands/local/server.ts index e35d5a607a..bd34ec51aa 100644 --- a/packages/cli/src/commands/local/server.ts +++ b/packages/cli/src/commands/local/server.ts @@ -923,6 +923,7 @@ async function consumeSSEWithWarning( onOversized: warnOversized, }); + // oxlint-disable-next-line typescript/no-unnecessary-condition -- the signal can abort during the await; TS keeps the loop condition's narrowing if (signal.aborted || result === "retained") { return; } @@ -1077,7 +1078,7 @@ async function consumeSSEOnce( const decoder = new TextDecoder(); const state: SSEParserState = { eventType: "", dataLines: [], id: "" }; - let retained = false; + let retained = false as boolean; const onEvent = (type: string, data: string, id: string) => { if (id) { onId(id); diff --git a/packages/cli/src/commands/log/list.ts b/packages/cli/src/commands/log/list.ts index 1512fa417f..31709115c2 100644 --- a/packages/cli/src/commands/log/list.ts +++ b/packages/cli/src/commands/log/list.ts @@ -463,7 +463,7 @@ async function* generateFollowLogs( config.onInitialLogs?.(initialLogs); // Poll loop — exits when SIGINT fires - while (!controller.signal.aborted) { + for (;;) { await abortableSleep(pollIntervalMs, controller.signal); if (controller.signal.aborted) { break; @@ -928,7 +928,7 @@ export const listCommand = buildListCommand( flags, onDiagnostic: (msg) => logger.warn(msg), abortSignal: (this.process as { abortSignal?: AbortSignal }) - ?.abortSignal, + .abortSignal, fetch: (statsPeriod) => listTraceLogs(org, traceId, { query: traceQuery, @@ -1001,7 +1001,7 @@ export const listCommand = buildListCommand( flags, onDiagnostic: (msg) => logger.warn(msg), abortSignal: (this.process as { abortSignal?: AbortSignal }) - ?.abortSignal, + .abortSignal, fetch: (statsPeriod, afterTimestamp) => listLogs(org, project, { query: flags.query, diff --git a/packages/cli/src/commands/monitor/run.ts b/packages/cli/src/commands/monitor/run.ts index 8b81a11a82..c999401454 100644 --- a/packages/cli/src/commands/monitor/run.ts +++ b/packages/cli/src/commands/monitor/run.ts @@ -368,7 +368,9 @@ The wrapped command receives the \`SENTRY_MONITOR_SLUG\` environment variable.`, // Map signal kills to 128+N (Unix convention: e.g. 130 for // SIGINT, 137 for SIGKILL, 143 for SIGTERM) so CI pipelines // and shell scripts inspecting $? see the correct exit code. - const sigNum = osConstants.signals[signal]; + const signals: Partial> = + osConstants.signals; + const sigNum = signals[signal]; resolve(128 + (sigNum ?? 1)); } else { resolve(1); diff --git a/packages/cli/src/commands/proguard/uuid.ts b/packages/cli/src/commands/proguard/uuid.ts index c14a010007..7ca48aafeb 100644 --- a/packages/cli/src/commands/proguard/uuid.ts +++ b/packages/cli/src/commands/proguard/uuid.ts @@ -67,7 +67,7 @@ export const uuidCommand = buildCommand({ _flags: Record, path: string, ) { - if (!path?.trim()) { + if (!path.trim()) { throw new ContextError( "Mapping file path", sentry`proguard uuid `, diff --git a/packages/cli/src/commands/release/list.ts b/packages/cli/src/commands/release/list.ts index 57e3dd9505..e48093e5b5 100644 --- a/packages/cli/src/commands/release/list.ts +++ b/packages/cli/src/commands/release/list.ts @@ -185,7 +185,7 @@ function formatSessionSparkline(r: SentryRelease): string { function formatCrashes(r: ReleaseWithOrg): string { const h = getHealthData(r); const v = h?.sessionsCrashed; - if (v === undefined || v === null) { + if (v === undefined) { return colorTag("muted", "—"); } return v > 0 ? colorTag("red", String(v)) : colorTag("green", "0"); @@ -519,7 +519,7 @@ async function handleAutoDetectWithProject( // Client-side sort matching the --sort flag, then trim with project guarantee const comparator = buildMergeSorter( - (effectiveExtra.sort as ReleaseSortValue) ?? "date", + (effectiveExtra.sort ?? "date") as ReleaseSortValue, ); merged.sort(comparator); const limited = isMultiProject diff --git a/packages/cli/src/commands/replay/list.ts b/packages/cli/src/commands/replay/list.ts index 462498f54b..f31993e061 100644 --- a/packages/cli/src/commands/replay/list.ts +++ b/packages/cli/src/commands/replay/list.ts @@ -107,8 +107,8 @@ function parseLimit(value: string): number { */ export function parseSort(value: string): ReplaySortValue { const trimmed = value.trim(); - const normalized = trimmed.toLowerCase() as ReplaySortKey; - const mapped = SORT_MAP[normalized]; + const sortMap: Partial> = SORT_MAP; + const mapped = sortMap[trimmed.toLowerCase()]; if (mapped) { return mapped; } diff --git a/packages/cli/src/commands/trace/view.ts b/packages/cli/src/commands/trace/view.ts index d02b4e4e00..acca226a37 100644 --- a/packages/cli/src/commands/trace/view.ts +++ b/packages/cli/src/commands/trace/view.ts @@ -420,7 +420,7 @@ async function resolveTraceFromIssue( } const event = await getLatestEvent(org, issue.id); - const traceId = event?.contexts?.trace?.trace_id; + const traceId = event.contexts?.trace?.trace_id; if (!traceId) { throw new ValidationError( `Could not find a trace for issue '${issueShortId}'. The latest event has no trace context.\n\n` + diff --git a/packages/cli/src/commands/trial/list.ts b/packages/cli/src/commands/trial/list.ts index d6df141968..87668dea26 100644 --- a/packages/cli/src/commands/trial/list.ts +++ b/packages/cli/src/commands/trial/list.ts @@ -154,7 +154,7 @@ function formatTrialListHuman(entries: TrialListEntry[]): string { ? `${t.displayName} ${colorTag("muted", `(${t.name})`)}` : t.displayName, }, - { header: "STATUS", value: (t) => STATUS_LABELS[t.status] ?? t.status }, + { header: "STATUS", value: (t) => STATUS_LABELS[t.status] }, { header: "DAYS LEFT", value: (t) => { diff --git a/packages/cli/src/commands/wasm-split.ts b/packages/cli/src/commands/wasm-split.ts index 78a2927cc5..0a9c21ced2 100644 --- a/packages/cli/src/commands/wasm-split.ts +++ b/packages/cli/src/commands/wasm-split.ts @@ -169,7 +169,7 @@ export const wasmSplitCommand = buildCommand({ }, }, async *func(this: SentryContext, flags: WasmSplitFlags, input: string) { - if (!input?.trim()) { + if (!input.trim()) { throw new ValidationError( `Wasm file path is required: ${sentry`wasm-split `}`, "input", diff --git a/packages/cli/src/lib/api/chunk-upload.ts b/packages/cli/src/lib/api/chunk-upload.ts index c5f1c9e90b..99629b5ca8 100644 --- a/packages/cli/src/lib/api/chunk-upload.ts +++ b/packages/cli/src/lib/api/chunk-upload.ts @@ -693,7 +693,7 @@ export async function assembleArtifactBundle( `organizations/${org}/artifactbundle/assemble/`, ); } catch (error) { - const projects = body.projects ?? []; + const { projects } = body; if (projects.length > 0 && isInvalidProjectsError(error)) { throw projectsNotFoundError(org, projects); } diff --git a/packages/cli/src/lib/api/infrastructure.ts b/packages/cli/src/lib/api/infrastructure.ts index 02ac581c31..fda180de08 100644 --- a/packages/cli/src/lib/api/infrastructure.ts +++ b/packages/cli/src/lib/api/infrastructure.ts @@ -597,7 +597,7 @@ export function throwApiError( const enriched = enrichDetail(response, detail, hasUsableDetail); throw new ApiError( - `${context}: ${status} ${response.statusText ?? "Unknown"}`, + `${context}: ${status} ${response.statusText}`, status, enriched.detail, undefined, diff --git a/packages/cli/src/lib/api/issues.ts b/packages/cli/src/lib/api/issues.ts index 78986c5ba3..dcc95978ca 100644 --- a/packages/cli/src/lib/api/issues.ts +++ b/packages/cli/src/lib/api/issues.ts @@ -359,7 +359,7 @@ export async function findIssueInOrgs( options?: { collapse?: IssueCollapseField[] }, ): Promise<{ org: string; issue: SentryIssue } | null> { const limit = pLimit(ORG_FANOUT_CONCURRENCY); - let found: { org: string; issue: SentryIssue } | null = null; + let found = null as { org: string; issue: SentryIssue } | null; let failure: unknown; await Promise.all( orgSlugs.map((org) => @@ -813,7 +813,7 @@ export async function getSharedIssue( ) { throw new ApiError( "Share link response missing a valid issue ID", - result.response?.status ?? 0, + result.response.status, undefined, path, ); diff --git a/packages/cli/src/lib/api/projects.ts b/packages/cli/src/lib/api/projects.ts index 66e073865c..61e2dd83a0 100644 --- a/packages/cli/src/lib/api/projects.ts +++ b/packages/cli/src/lib/api/projects.ts @@ -640,8 +640,8 @@ export async function findProjectByDsn( ): Promise { const orgs = await listOrganizations(); const limit = pLimit(ORG_FANOUT_CONCURRENCY); - let project: SentryProject | null = null; - let unsupported = false; + let project = null as SentryProject | null; + let unsupported = false as boolean; await Promise.all( orgs.map((org) => limit(async () => { diff --git a/packages/cli/src/lib/api/status-page.ts b/packages/cli/src/lib/api/status-page.ts index 3b273f8cbe..d01ecdcb6b 100644 --- a/packages/cli/src/lib/api/status-page.ts +++ b/packages/cli/src/lib/api/status-page.ts @@ -133,9 +133,9 @@ async function tryFetchStatuspageSummary( return; } - let summary: SummaryResponse; + let summary: SummaryResponse | null; try { - summary = (await response.json()) as SummaryResponse; + summary = (await response.json()) as SummaryResponse | null; } catch (err) { log.debug(`Statuspage summary parse failed for ${endpoint}`, err); return; @@ -152,7 +152,7 @@ async function tryFetchStatuspageSummary( .filter((c) => !c.group && typeof c.name === "string") .map((c) => ({ name: c.name as string, - status: (c.status as ComponentStatus) ?? "operational", + status: (c.status ?? "operational") as ComponentStatus, })); const incidents: StatusIncident[] = (summary.incidents ?? []).map((i) => ({ @@ -163,8 +163,8 @@ async function tryFetchStatuspageSummary( })); return { - indicator: (summary.status?.indicator as StatusIndicator) ?? "none", - description: summary.status?.description ?? "Unknown", + indicator: summary.status.indicator as StatusIndicator, + description: summary.status.description ?? "Unknown", url: summary.page?.url ?? normalized, components, incidents, diff --git a/packages/cli/src/lib/banner.ts b/packages/cli/src/lib/banner.ts index 7882bd0779..e20124b051 100644 --- a/packages/cli/src/lib/banner.ts +++ b/packages/cli/src/lib/banner.ts @@ -112,7 +112,7 @@ export function bannerLinesForWidth(columns: number): BannerLine[] { * string when the terminal is too narrow for even the text mark. */ export function formatBanner( - columns: number = process.stdout.columns ?? 80, + columns: number = process.stdout.columns || 80, ): string { return bannerLinesForWidth(columns) .map(({ content, color }) => chalk.hex(color)(content)) diff --git a/packages/cli/src/lib/chunk-loader.ts b/packages/cli/src/lib/chunk-loader.ts index 6c7ec0f3d4..0af301339e 100644 --- a/packages/cli/src/lib/chunk-loader.ts +++ b/packages/cli/src/lib/chunk-loader.ts @@ -110,10 +110,11 @@ const MIN_NODE_MAJOR = 22; export function canLoadChunks( versions: NodeJS.ProcessVersions = process.versions, ): boolean { + const vmConstants = constants as Partial | undefined; return ( versions.bun === undefined && Number.parseInt(versions.node, 10) >= MIN_NODE_MAJOR && - constants?.USE_MAIN_CONTEXT_DEFAULT_LOADER !== undefined + vmConstants?.USE_MAIN_CONTEXT_DEFAULT_LOADER !== undefined ); } diff --git a/packages/cli/src/lib/clipboard.ts b/packages/cli/src/lib/clipboard.ts index 27916ddac4..b7ef9afda8 100644 --- a/packages/cli/src/lib/clipboard.ts +++ b/packages/cli/src/lib/clipboard.ts @@ -59,11 +59,8 @@ export async function copyToClipboard(text: string): Promise { stdio: ["pipe", "ignore", "ignore"], }); - const { stdin } = proc; - if (stdin) { - stdin.write(text); - stdin.end(); - } + proc.stdin.write(text); + proc.stdin.end(); const exitCode = await new Promise((resolve) => { proc.on("close", (code) => resolve(code ?? 1)); diff --git a/packages/cli/src/lib/datasets.ts b/packages/cli/src/lib/datasets.ts index 96e9a7cd50..1703e54416 100644 --- a/packages/cli/src/lib/datasets.ts +++ b/packages/cli/src/lib/datasets.ts @@ -32,7 +32,8 @@ export type ExploreDataset = | "replays"; /** Canonical user-facing name for each API dataset */ -const DISPLAY_NAMES: Record = { +const DISPLAY_NAMES: Partial> & + Record = { errors: "errors", spans: "spans", logs: "logs", @@ -59,7 +60,7 @@ const ALIASES: Record = { * User-facing name for an API dataset, e.g. `tracemetrics` to `metrics`. */ export function datasetDisplayName(dataset: string): string { - return DISPLAY_NAMES[dataset as ExploreDataset] ?? dataset; + return DISPLAY_NAMES[dataset] ?? dataset; } /** diff --git a/packages/cli/src/lib/db/auth.ts b/packages/cli/src/lib/db/auth.ts index 6ba7990354..3b1b71c49e 100644 --- a/packages/cli/src/lib/db/auth.ts +++ b/packages/cli/src/lib/db/auth.ts @@ -419,7 +419,7 @@ export function getAuthConfig(): AuthConfig | undefined { } return { - token: row.token ?? undefined, + token: row.token, refreshToken: row.refresh_token ?? undefined, expiresAt: row.expires_at ?? undefined, issuedAt: row.issued_at ?? undefined, @@ -711,7 +711,7 @@ export function setAuthToken( // SENTRY_HOST or `.sentryclirc` says. With none there, a new account. // Re-authorizing a specific account targets exactly that account. const existing = reauthorizeId - ? findAccountToReauthorize(reauthorizeId, options?.host) + ? findAccountToReauthorize(reauthorizeId, options.host) : options?.newAccount ? undefined : findAccountToReplace(options?.host); diff --git a/packages/cli/src/lib/db/migration.ts b/packages/cli/src/lib/db/migration.ts index 941cb2aa28..93c23dc6c7 100644 --- a/packages/cli/src/lib/db/migration.ts +++ b/packages/cli/src/lib/db/migration.ts @@ -92,20 +92,20 @@ type OldConfig = { projectCache?: Record< string, { - orgSlug: string; - orgName: string; - projectSlug: string; - projectName: string; - cachedAt: number; - } + orgSlug?: string; + orgName?: string; + projectSlug?: string; + projectName?: string; + cachedAt?: number | null; + } | null >; dsnCache?: Record< string, { - dsn: string; - projectId: string; + dsn?: string; + projectId?: string; orgId?: string; - source: string; + source?: string; sourcePath?: string; resolved?: { orgSlug: string; @@ -113,12 +113,12 @@ type OldConfig = { projectSlug: string; projectName: string; }; - cachedAt: number; - } + cachedAt?: number | null; + } | null >; projectAliases?: { - aliases: Record; - cachedAt: number; + aliases?: Record; + cachedAt?: number | null; dsnFingerprint?: string; }; }; @@ -211,12 +211,12 @@ export function migrateFromJson(db: Database): void { if ( !( entry?.orgSlug && - entry?.orgName && - entry?.projectSlug && - entry?.projectName + entry.orgName && + entry.projectSlug && + entry.projectName ) || - entry?.cachedAt === null || - entry?.cachedAt === undefined + entry.cachedAt === null || + entry.cachedAt === undefined ) { continue; } @@ -244,9 +244,9 @@ export function migrateFromJson(db: Database): void { for (const [directory, entry] of Object.entries(oldConfig.dsnCache)) { // Skip malformed entries missing required fields if ( - !(entry?.dsn && entry?.projectId && entry?.source) || - entry?.cachedAt === null || - entry?.cachedAt === undefined + !(entry?.dsn && entry.projectId && entry.source) || + entry.cachedAt === null || + entry.cachedAt === undefined ) { continue; } @@ -283,7 +283,7 @@ export function migrateFromJson(db: Database): void { oldConfig.projectAliases.aliases, )) { // Skip malformed entries missing required fields - if (!(entry?.orgSlug && entry?.projectSlug)) { + if (!(entry?.orgSlug && entry.projectSlug)) { continue; } insertStmt.run( diff --git a/packages/cli/src/lib/db/sqlite.ts b/packages/cli/src/lib/db/sqlite.ts index a3000c6bfe..a84d2c87a5 100644 --- a/packages/cli/src/lib/db/sqlite.ts +++ b/packages/cli/src/lib/db/sqlite.ts @@ -144,11 +144,13 @@ function wrapStatement(stmt: any, kind: DriverKind): StatementWrapper { if (!target.isFinalized) { target.finalize(); } - return (row as Record) ?? null; + return ( + (row as Record | undefined) ?? null + ); } const row = target.get(...toNodeParams(params)); // Normalise no-row result to null (node:sqlite returns undefined). - return (row as Record) ?? null; + return (row as Record | undefined) ?? null; }; } if (prop === "all") { diff --git a/packages/cli/src/lib/delta-upgrade.ts b/packages/cli/src/lib/delta-upgrade.ts index d2dbc53741..4f53fd0000 100644 --- a/packages/cli/src/lib/delta-upgrade.ts +++ b/packages/cli/src/lib/delta-upgrade.ts @@ -122,13 +122,6 @@ export function normalizeStableReleases( return normalized; } -function getPrimaryUpgradeSource(): UpgradeSource { - if (!PRIMARY_UPGRADE_SOURCE) { - throw new Error("No primary upgrade source is configured"); - } - return PRIMARY_UPGRADE_SOURCE; -} - const instrument: InstrumentHook = (name, fn) => withTracing(name, "http.client", fn); @@ -240,7 +233,7 @@ export function canAttemptDelta(targetVersion: string): boolean { export async function fetchRecentReleases( signal?: AbortSignal, - source: UpgradeSource = getPrimaryUpgradeSource(), + source: UpgradeSource = PRIMARY_UPGRADE_SOURCE, ): Promise { try { const response = await customFetch( @@ -361,7 +354,7 @@ export function resolveStableChain( currentVersion: string, targetVersion: string, signal?: AbortSignal, - source: UpgradeSource = getPrimaryUpgradeSource(), + source: UpgradeSource = PRIMARY_UPGRADE_SOURCE, ): Promise { return stableSource(source).resolveChain( currentVersion, @@ -379,7 +372,7 @@ export async function resolveNightlyChain(opts: { signal?: AbortSignal; source?: UpgradeSource; }): Promise { - const { source = getPrimaryUpgradeSource() } = opts; + const { source = PRIMARY_UPGRADE_SOURCE } = opts; const client = new OciClient({ registry: "https://ghcr.io", repo: source.ghcrRepo, @@ -419,7 +412,7 @@ export async function resolveNightlyChain(opts: { for (const [index, manifest] of manifests.entries()) { const tag = chainTags[index]; - if (!(manifest && tag)) { + if (!tag) { return null; } // Use the local validateChainStep (not binpatch's) so the rich 3-reason @@ -589,7 +582,7 @@ export function resolveStableDelta( destPath: string, offline?: boolean, setMessage?: SetMessage, - source: UpgradeSource = getPrimaryUpgradeSource(), + source: UpgradeSource = PRIMARY_UPGRADE_SOURCE, ): Promise { return resolveDelta( stableSource(source), @@ -608,7 +601,7 @@ export function resolveNightlyDelta( destPath: string, offline?: boolean, setMessage?: SetMessage, - source: UpgradeSource = getPrimaryUpgradeSource(), + source: UpgradeSource = PRIMARY_UPGRADE_SOURCE, ): Promise { return resolveDelta( nightlySource(source), @@ -627,7 +620,7 @@ export function attemptDeltaUpgrade( destPath: string, offline?: boolean, setMessage?: SetMessage, - source: UpgradeSource = getPrimaryUpgradeSource(), + source: UpgradeSource = PRIMARY_UPGRADE_SOURCE, ): Promise { if (!canAttemptDelta(targetVersion)) { return Promise.resolve(null); @@ -717,7 +710,7 @@ async function prefetch( export function prefetchNightlyPatches( targetVersion: string, signal?: AbortSignal, - source: UpgradeSource = getPrimaryUpgradeSource(), + source: UpgradeSource = PRIMARY_UPGRADE_SOURCE, ): Promise { return prefetch(nightlySource(source), targetVersion, signal); } @@ -725,7 +718,7 @@ export function prefetchNightlyPatches( export function prefetchStablePatches( targetVersion: string, signal?: AbortSignal, - source: UpgradeSource = getPrimaryUpgradeSource(), + source: UpgradeSource = PRIMARY_UPGRADE_SOURCE, ): Promise { return prefetch(stableSource(source), targetVersion, signal); } diff --git a/packages/cli/src/lib/detect-agent.ts b/packages/cli/src/lib/detect-agent.ts index d5c5ecd6b2..ce9c0534f2 100644 --- a/packages/cli/src/lib/detect-agent.ts +++ b/packages/cli/src/lib/detect-agent.ts @@ -373,7 +373,7 @@ export async function getProcessInfoFromOS( { timeout: 500 }, ); const match = result.trim().match(PS_PPID_COMM_RE); - if (match?.[1] && match?.[2]) { + if (match?.[1] && match[2]) { return { name: basename(match[2].trim()), ppid: Number(match[1]) }; } } catch (error) { diff --git a/packages/cli/src/lib/formatters/colors.ts b/packages/cli/src/lib/formatters/colors.ts index f364d054f7..333abb5be6 100644 --- a/packages/cli/src/lib/formatters/colors.ts +++ b/packages/cli/src/lib/formatters/colors.ts @@ -86,7 +86,8 @@ export const header = (text: string): string => muted(text); // Status-based Coloring -const STATUS_COLORS: Record string> = { +const STATUS_COLORS: Partial string>> & + Record string> = { resolved: green, resolvedInNextRelease: green, unresolved: yellow, @@ -101,15 +102,16 @@ export function statusColor(text: string, status: string | undefined): string { // Try exact match first (handles camelCase like resolvedInNextRelease), // then fall back to lowercase (handles unexpected uppercase from older instances). const colorFn = - STATUS_COLORS[status as IssueStatus] ?? - STATUS_COLORS[status?.toLowerCase() as IssueStatus] ?? + STATUS_COLORS[status ?? ""] ?? + STATUS_COLORS[status?.toLowerCase() ?? ""] ?? STATUS_COLORS.unresolved; return colorFn(text); } // Level-based Coloring -const LEVEL_COLORS: Record string> = { +const LEVEL_COLORS: Partial string>> & + Record string> = { fatal: red, error: red, warning: yellow, @@ -121,8 +123,7 @@ const LEVEL_COLORS: Record string> = { * Color text based on issue level (case-insensitive) */ export function levelColor(text: string, level: string | undefined): string { - const normalizedLevel = level?.toLowerCase() as IssueLevel; - const colorFn = LEVEL_COLORS[normalizedLevel]; + const colorFn = LEVEL_COLORS[level?.toLowerCase() ?? ""]; return colorFn ? colorFn(text) : text; } diff --git a/packages/cli/src/lib/formatters/event-outcomes.ts b/packages/cli/src/lib/formatters/event-outcomes.ts index cfcbd3782b..869c165a1b 100644 --- a/packages/cli/src/lib/formatters/event-outcomes.ts +++ b/packages/cli/src/lib/formatters/event-outcomes.ts @@ -35,7 +35,9 @@ function shareRatio(events: number, total: number): number { return total === 0 ? 0 : events / total; } -type Buckets = ListOrganizationEventsDroppedResponse["droppedEvents"]; +type Bucket = ListOrganizationEventsDroppedResponse["droppedEvents"][number]; + +type Buckets = Array & Partial>>; function sumCounts(buckets: Buckets): number { return buckets.reduce((sum, bucket) => sum + bucket.count, 0); diff --git a/packages/cli/src/lib/formatters/explore-timeseries.ts b/packages/cli/src/lib/formatters/explore-timeseries.ts index 7e16bf877d..7cca6ca0bc 100644 --- a/packages/cli/src/lib/formatters/explore-timeseries.ts +++ b/packages/cli/src/lib/formatters/explore-timeseries.ts @@ -142,7 +142,7 @@ export function formatExploreTimeSeriesHuman( ): string { const scope = data.project ? `${data.org}/${data.project}` : data.org; const details = [`Querying ${text(data.dataset)} in ${text(scope)}`]; - if (data.meta?.start !== undefined && data.meta.end !== undefined) { + if (data.meta) { details.push( `Range (UTC): ${formatUtcTimestamp(data.meta.start)} to ${formatUtcTimestamp(data.meta.end)}`, ); diff --git a/packages/cli/src/lib/formatters/feedback.ts b/packages/cli/src/lib/formatters/feedback.ts index 9d1a7d0909..72d1713085 100644 --- a/packages/cli/src/lib/formatters/feedback.ts +++ b/packages/cli/src/lib/formatters/feedback.ts @@ -289,7 +289,7 @@ function formatFeedbackOverview(data: FeedbackViewResult): string { if (feedback.project) { rows.push([ "Project", - `${escapeFeedbackInline(feedback.project.name ?? feedback.project.slug)} (${feedbackCodeSpan(feedback.project.slug)})`, + `${escapeFeedbackInline(feedback.project.name)} (${feedbackCodeSpan(feedback.project.slug)})`, ]); } if (feedback.assignedTo?.name) { diff --git a/packages/cli/src/lib/formatters/human.ts b/packages/cli/src/lib/formatters/human.ts index 5696376588..ce337d7c56 100644 --- a/packages/cli/src/lib/formatters/human.ts +++ b/packages/cli/src/lib/formatters/human.ts @@ -76,7 +76,8 @@ const FIXABILITY_TAGS: Record[0]> = // Status Formatting -const STATUS_ICONS: Record = { +const STATUS_ICONS: Partial> & + Record = { resolved: colorTag("green", "✓"), resolvedInNextRelease: colorTag("green", "✓"), unresolved: colorTag("yellow", "●"), @@ -84,7 +85,8 @@ const STATUS_ICONS: Record = { muted: colorTag("muted", "−"), }; -const STATUS_LABELS: Record = { +const STATUS_LABELS: Partial> & + Record = { resolved: `${colorTag("green", "✓")} Resolved`, resolvedInNextRelease: `${colorTag("green", "✓")} Resolved in Next Release`, unresolved: `${colorTag("yellow", "●")} Unresolved`, @@ -215,16 +217,14 @@ function formatFeaturesMarkdown(features: string[] | undefined): string { * Get status icon for an issue status */ export function formatStatusIcon(status: string | undefined): string { - return STATUS_ICONS[status as IssueStatus] ?? colorTag("yellow", "●"); + return STATUS_ICONS[status ?? ""] ?? colorTag("yellow", "●"); } /** * Get full status label for an issue status */ export function formatStatusLabel(status: string | undefined): string { - return ( - STATUS_LABELS[status as IssueStatus] ?? `${colorTag("yellow", "●")} Unknown` - ); + return STATUS_LABELS[status ?? ""] ?? `${colorTag("yellow", "●")} Unknown`; } // Issue Formatting @@ -830,7 +830,7 @@ function releaseVersion( export function formatIssueDetails(issue: SentryIssue): string { const lines: string[] = []; - lines.push(`## ${issue.shortId}: ${text(issue.title ?? "")}`); + lines.push(`## ${issue.shortId}: ${text(issue.title)}`); lines.push(""); // Key-value details as a table @@ -869,7 +869,7 @@ export function formatIssueDetails(issue: SentryIssue): string { if (issue.project) { kvRows.push([ "Project", - `${text(issue.project.name ?? "(unknown)")} (${inlineCode(issue.project.slug ?? "")})`, + `${text(issue.project.name)} (${inlineCode(issue.project.slug)})`, ]); } @@ -1279,7 +1279,7 @@ function formatSpanSimple(span: TraceSpan, opts: FormatSpanOptions): void { line += ` ${plainSafeMuted(`(${prettyMs(durationMs)})`)}`; } - line += ` ${plainSafeMuted(span.span_id ?? "")}`; + line += ` ${plainSafeMuted(span.span_id)}`; lines.push(line); @@ -2573,7 +2573,7 @@ export function formatUpgradeResult(data: UpgradeResult): string { default: { // Exhaustive check — all action types should be handled above const _: never = data.action; - lines.push(ACTION_DESCRIPTIONS[_ as UpgradeResult["action"]] ?? "Done"); + lines.push("Done"); } } diff --git a/packages/cli/src/lib/formatters/local.ts b/packages/cli/src/lib/formatters/local.ts index 1039d816a7..7673998c32 100644 --- a/packages/cli/src/lib/formatters/local.ts +++ b/packages/cli/src/lib/formatters/local.ts @@ -775,7 +775,7 @@ export type StreamedSpan = { * `Record` compatible with the semantic display pipeline. */ function flattenSpanAttributes( - attrs: Record | undefined, + attrs: Record | undefined, ): Record { if (!attrs) { return {}; @@ -1301,7 +1301,7 @@ function formatLogJson( ) .map(([k, v]) => [ stripBidi(k), - typeof v.value === "string" ? stripBidi(v.value) : v.value, + typeof v?.value === "string" ? stripBidi(v.value) : v?.value, ]), ) : undefined, diff --git a/packages/cli/src/lib/formatters/markdown.ts b/packages/cli/src/lib/formatters/markdown.ts index 1ea80cfdbf..adbb2a3257 100644 --- a/packages/cli/src/lib/formatters/markdown.ts +++ b/packages/cli/src/lib/formatters/markdown.ts @@ -270,10 +270,10 @@ function renderOneInline(token: Token): string { case "link": { const link = token as Tokens.Link; let linkText = renderInline(link.tokens); - let href = link.href ?? ""; + let href = link.href; // GFM autolinks absorb backslash-escapes literally (\_astro → \_astro). // Detect autolinks via link.raw (starts with URL, not "[") and strip artifacts. - const raw = link.raw ?? ""; + const raw = link.raw; if (raw.startsWith("http://") || raw.startsWith("https://")) { const stripEscapes = (s: string) => s.replace(/\\([_*`[\]<>\\])/g, "$1"); @@ -297,7 +297,7 @@ function renderOneInline(token: Token): string { } return (token as Tokens.Text).text; case "html": { - const raw = (token as Tokens.HTML).raw ?? (token as Tokens.HTML).text; + const raw = (token as Tokens.HTML).raw; return renderHtmlToken(raw); } default: @@ -324,9 +324,7 @@ function renderInline(tokens: Token[]): string { // Check for color tag open: , , etc. if (token.type === "html") { - const raw = ( - (token as Tokens.HTML).raw ?? (token as Tokens.HTML).text - ).trim(); + const raw = (token as Tokens.HTML).raw.trim(); const openMatch = RE_OPEN_TAG.exec(raw); if (openMatch) { const tagName = (openMatch[1] ?? "").toLowerCase(); @@ -340,9 +338,8 @@ function renderInline(tokens: Token[]): string { const t = tokens[i] as Token; if ( t.type === "html" && - ((t as Tokens.HTML).raw ?? (t as Tokens.HTML).text) - .trim() - .toLowerCase() === closeTag.toLowerCase() + (t as Tokens.HTML).raw.trim().toLowerCase() === + closeTag.toLowerCase() ) { i += 1; // consume close tag break; @@ -528,7 +525,7 @@ function renderList(list: Tokens.List, depth = 0): string { if (!item) { continue; } - const start = Number(list.start ?? 1); + const start = Number(list.start); const bullet = list.ordered ? `${start + i}.` : "•"; const body = item.tokens .map((t) => { @@ -539,7 +536,7 @@ function renderList(list: Tokens.List, depth = 0): string { return renderInline((t as Tokens.Text).tokens ?? []); } if ("tokens" in t && (t as Tokens.Generic).tokens) { - return renderInline(((t as Tokens.Generic).tokens as Token[]) ?? []); + return renderInline((t as Tokens.Generic).tokens as Token[]); } return (t as { raw?: string }).raw ?? ""; }) @@ -598,10 +595,10 @@ export function renderMarkdown(md: string): string { // Parse and render to get structural formatting (headings, tables, lists), // then strip ANSI codes. This produces human-readable output with aligned // tables and proper heading emphasis, without ANSI escape sequences. - const tokens = marked.lexer(md ?? ""); + const tokens = marked.lexer(md); return stripAnsi(renderBlocks(tokens)).trimEnd(); } - const tokens = marked.lexer(md ?? ""); + const tokens = marked.lexer(md); return renderBlocks(tokens).trimEnd(); } @@ -618,7 +615,7 @@ export function renderMarkdown(md: string): string { * @returns Styled string (TTY) or plain text (non-TTY / plain mode) */ export function renderInlineMarkdown(md: string): string { - const tokens = marked.lexer(md ?? ""); + const tokens = marked.lexer(md); const rendered = renderInline(tokens.flatMap(flattenInline)); return isPlainOutput() ? stripAnsi(rendered) : rendered; } diff --git a/packages/cli/src/lib/formatters/replay.ts b/packages/cli/src/lib/formatters/replay.ts index 591093eaf3..36571c1905 100644 --- a/packages/cli/src/lib/formatters/replay.ts +++ b/packages/cli/src/lib/formatters/replay.ts @@ -590,7 +590,7 @@ export function formatReplayDetails(data: ReplayViewData): string { /** Build a contextual hint pointing the user to a related trace or issue. */ export function replayHint(data: ReplayViewData): string | undefined { - const traceId = data.replay.trace_ids?.[0]; + const traceId = data.replay.trace_ids[0]; if (traceId) { return `Related trace: ${sentry`trace view ${data.org}/${traceId}`}`; } diff --git a/packages/cli/src/lib/formatters/seer.ts b/packages/cli/src/lib/formatters/seer.ts index 5f82410d5d..ca7e1958a2 100644 --- a/packages/cli/src/lib/formatters/seer.ts +++ b/packages/cli/src/lib/formatters/seer.ts @@ -428,7 +428,7 @@ export function formatSolution(solution: SolutionArtifact): string { lines.push("## Solution"); lines.push(""); - lines.push(`**Summary:** ${text(solution.data.one_line_summary ?? "")}`); + lines.push(`**Summary:** ${text(solution.data.one_line_summary)}`); lines.push(""); if (solution.data.steps.length > 0) { diff --git a/packages/cli/src/lib/formatters/sql.ts b/packages/cli/src/lib/formatters/sql.ts index 2b73157da4..3e190487c4 100644 --- a/packages/cli/src/lib/formatters/sql.ts +++ b/packages/cli/src/lib/formatters/sql.ts @@ -52,7 +52,7 @@ function colorizeToken(token: Token): string { } // Token content is another token (shouldn't happen per spec but handle gracefully) - if (typeof token.content === "object" && token.content !== null) { + if (typeof token.content === "object") { return colorizeToken(token.content); } diff --git a/packages/cli/src/lib/formatters/trace.ts b/packages/cli/src/lib/formatters/trace.ts index 91e2e9ff23..44cef3096b 100644 --- a/packages/cli/src/lib/formatters/trace.ts +++ b/packages/cli/src/lib/formatters/trace.ts @@ -425,7 +425,7 @@ export function findSpanById( depth: number, ancestors: TraceSpan[], ): FoundSpan | null { - if (span.span_id?.toLowerCase() === spanId) { + if (span.span_id.toLowerCase() === spanId) { return { span, depth, ancestors }; } for (const child of span.children ?? []) { @@ -752,7 +752,7 @@ function appendAttributeRows( const shown = attrs.slice(0, MAX_DISPLAY_ATTRS); for (const attr of shown) { - if (attr.value !== undefined && attr.value !== null && attr.value !== "") { + if (attr.value !== "") { kvRows.push([attr.name, tableCell(String(attr.value))]); } } diff --git a/packages/cli/src/lib/games/snake-terminal.ts b/packages/cli/src/lib/games/snake-terminal.ts index a68f6dfab7..0fc85bb9f5 100644 --- a/packages/cli/src/lib/games/snake-terminal.ts +++ b/packages/cli/src/lib/games/snake-terminal.ts @@ -204,8 +204,8 @@ export function playSnake( { input, output }: SnakeTerminal, { color, onGameOver }: SnakeOptions, ): Promise { - const columns = () => output.columns ?? DEFAULT_COLUMNS; - const rows = () => output.rows ?? DEFAULT_ROWS; + const columns = () => output.columns || DEFAULT_COLUMNS; + const rows = () => output.rows || DEFAULT_ROWS; const boardSize = () => snakeBoardSize(columns(), rows()); const fits = () => snakeFrameFits(state, columns(), rows()); const start = boardSize(); diff --git a/packages/cli/src/lib/ghcr.ts b/packages/cli/src/lib/ghcr.ts index 0b00adeb73..8e7158a6a1 100644 --- a/packages/cli/src/lib/ghcr.ts +++ b/packages/cli/src/lib/ghcr.ts @@ -81,7 +81,7 @@ function rethrowExternalAbort( externalSignal?: AbortSignal, ): void { if (externalSignal?.aborted) { - throw externalSignal?.reason; + throw externalSignal.reason; } } diff --git a/packages/cli/src/lib/help.ts b/packages/cli/src/lib/help.ts index a79754dc80..d42a1c15e3 100644 --- a/packages/cli/src/lib/help.ts +++ b/packages/cli/src/lib/help.ts @@ -326,7 +326,7 @@ export function printCustomHelp(options: CustomHelpOptions = {}): string { // Skip banner for non-TTY to avoid wasting tokens in agent loops if (process.stdout.isTTY) { - const cols = process.stdout.columns ?? 80; + const cols = process.stdout.columns || 80; // Prefer a real kitty/sixel image on capable terminals; otherwise fall back // to the block-art banner sized to the terminal width (returns "" only when // the terminal is too narrow for even the compact mark). diff --git a/packages/cli/src/lib/interactive-login.ts b/packages/cli/src/lib/interactive-login.ts index acc378773c..9f5ddd243c 100644 --- a/packages/cli/src/lib/interactive-login.ts +++ b/packages/cli/src/lib/interactive-login.ts @@ -243,7 +243,7 @@ export async function runInteractiveLogin( userCode, verificationUriComplete, browserOpened, - process.stdin.isTTY ?? false, + process.stdin.isTTY, ); for (const line of displayLines) { log.log(line); diff --git a/packages/cli/src/lib/introspect.ts b/packages/cli/src/lib/introspect.ts index 7bb411cf60..b16c5b708e 100644 --- a/packages/cli/src/lib/introspect.ts +++ b/packages/cli/src/lib/introspect.ts @@ -228,12 +228,8 @@ export function getPositionalString(params?: PositionalParams): string { .join(" "); } - if (params.kind === "array") { - const placeholder = params.parameter.placeholder ?? "args"; - return `<${placeholder}...>`; - } - - return ""; + const placeholder = params.parameter.placeholder ?? "args"; + return `<${placeholder}...>`; } /** @@ -262,18 +258,14 @@ export function extractPositionals( })); } - if (params.kind === "array") { - return [ - { - placeholder: params.parameter.placeholder ?? "args", - brief: params.parameter.brief ?? "", - optional: false, - variadic: true, - }, - ]; - } - - return []; + return [ + { + placeholder: params.parameter.placeholder ?? "args", + brief: params.parameter.brief ?? "", + optional: false, + variadic: true, + }, + ]; } /** diff --git a/packages/cli/src/lib/list-command.ts b/packages/cli/src/lib/list-command.ts index fc9a5c1132..4fa8346214 100644 --- a/packages/cli/src/lib/list-command.ts +++ b/packages/cli/src/lib/list-command.ts @@ -437,7 +437,7 @@ function getSubcommandsForRoute(routeName: string): Set { byRoute = new Map(); for (const entry of routes.getAllEntries()) { const target = entry.target as unknown as Record; - if (typeof target?.getAllEntries === "function") { + if (typeof target.getAllEntries === "function") { byRoute.set( entry.name.original, collectChildNames( diff --git a/packages/cli/src/lib/region.ts b/packages/cli/src/lib/region.ts index 2f9e2a98aa..c27261e4eb 100644 --- a/packages/cli/src/lib/region.ts +++ b/packages/cli/src/lib/region.ts @@ -171,7 +171,9 @@ async function resolveOrgRegionUncached( const responseIdentity = rawResponse ? getResponseCredentialIdentity(rawResponse) : undefined; - const rawRegionUrl = response.data?.links?.regionUrl; + // Sentry before 22.9 sends no `links`. + const links = response.data?.links as { regionUrl?: string } | undefined; + const rawRegionUrl = links?.regionUrl; const regionUrl = getResolvedRegionUrl( rawRegionUrl, responseOrigin, diff --git a/packages/cli/src/lib/release-notes.ts b/packages/cli/src/lib/release-notes.ts index 28cd6deb78..338df0db11 100644 --- a/packages/cli/src/lib/release-notes.ts +++ b/packages/cli/src/lib/release-notes.ts @@ -135,7 +135,7 @@ function normalizeHeading(text: string): string { * @returns Array of sections with category and markdown content */ export function extractSections(body: string): ChangeSection[] { - if (!body?.trim()) { + if (!body.trim()) { return []; } diff --git a/packages/cli/src/lib/replay-search.ts b/packages/cli/src/lib/replay-search.ts index 15fd9c8c83..05a14651a4 100644 --- a/packages/cli/src/lib/replay-search.ts +++ b/packages/cli/src/lib/replay-search.ts @@ -127,7 +127,7 @@ const DERIVED_REPLAY_FIELDS: Record = { count_screens: { root: "count_urls", resolve: (replay) => replay.count_urls }, count_traces: { root: "trace_ids", - resolve: (replay) => replay.trace_ids?.length, + resolve: (replay) => replay.trace_ids.length, }, device: { root: "device", resolve: (replay) => replay.device?.name }, error_id: { diff --git a/packages/cli/src/lib/resolve-target.ts b/packages/cli/src/lib/resolve-target.ts index bedaa0fcb0..4d66ce460f 100644 --- a/packages/cli/src/lib/resolve-target.ts +++ b/packages/cli/src/lib/resolve-target.ts @@ -862,7 +862,7 @@ async function findSimilarProjectsAcrossOrgs( }); nameMatchedSlugs = matchedNames .map((n) => nameToSlug.get(n)) - .filter((s): s is string => s !== null && s !== undefined); + .filter((s): s is string => s !== undefined); } // Merge slug matches and name matches, preferring slug matches. diff --git a/packages/cli/src/lib/response-cache-store.ts b/packages/cli/src/lib/response-cache-store.ts index e1ab800b0c..b4aa74bcde 100644 --- a/packages/cli/src/lib/response-cache-store.ts +++ b/packages/cli/src/lib/response-cache-store.ts @@ -189,7 +189,7 @@ function fromStored(stored: StoredEntry): ParsedEntry { function legacyExpiresAt(legacy: LegacyEntry): number { return ( legacy.expiresAt ?? - legacy.createdAt + FALLBACK_TTL_MS[classifyUrl(legacy.url ?? "")] + legacy.createdAt + FALLBACK_TTL_MS[classifyUrl(legacy.url)] ); } @@ -211,6 +211,7 @@ function fromLegacy(legacy: LegacyEntry): ParsedEntry { } function isStored(parsed: StoredEntry | LegacyEntry): parsed is StoredEntry { + // oxlint-disable-next-line typescript/no-unnecessary-condition -- a newer CLI may have written another version return "v" in parsed && parsed.v === 2; } diff --git a/packages/cli/src/lib/scan/concurrent.ts b/packages/cli/src/lib/scan/concurrent.ts index 47dbc00ad7..f0cb1f36dc 100644 --- a/packages/cli/src/lib/scan/concurrent.ts +++ b/packages/cli/src/lib/scan/concurrent.ts @@ -76,6 +76,7 @@ export async function mapFilesConcurrent( return; } const out = await fn(item); + // oxlint-disable-next-line typescript/no-unnecessary-condition -- another task can set earlyExit while fn is awaited if (state.earlyExit || out === null) { return; } @@ -134,7 +135,7 @@ export async function* mapFilesConcurrentStream( }); }; - let producerDone = false; + let producerDone = false as boolean; let producerError: unknown = null; const tasks: Promise[] = []; @@ -151,6 +152,7 @@ export async function* mapFilesConcurrentStream( return; } const out = await fn(item); + // oxlint-disable-next-line typescript/no-unnecessary-condition -- another task can set earlyExit while fn is awaited if (state.earlyExit || out === null || out.length === 0) { return; } @@ -171,7 +173,7 @@ export async function* mapFilesConcurrentStream( })(); try { - while (true) { + for (;;) { if (queue.length > 0) { // Drain everything already queued before we yield control, // so fast consumers don't spin one microtask per result. diff --git a/packages/cli/src/lib/scan/grep.ts b/packages/cli/src/lib/scan/grep.ts index a86da7eb0d..6c953d9dd4 100644 --- a/packages/cli/src/lib/scan/grep.ts +++ b/packages/cli/src/lib/scan/grep.ts @@ -360,7 +360,7 @@ async function* grepViaWorkers( // fires before the consumer is waiting, so the consumer picks it // up on the next loop iteration instead of missing the wakeup. let pendingNotify: (() => void) | null = null; - let notifyPending = false; + let notifyPending = false as boolean; const wakeConsumer = () => { if (pendingNotify) { const fn = pendingNotify; @@ -371,8 +371,8 @@ async function* grepViaWorkers( } }; - let earlyExit = false; - let walkerDone = false; + let earlyExit = false as boolean; + let walkerDone = false as boolean; let inflightCount = 0; // Track dispatch outcomes so the consumer's `finally` can detect diff --git a/packages/cli/src/lib/scan/walker.ts b/packages/cli/src/lib/scan/walker.ts index cc943c364f..640cc840f8 100644 --- a/packages/cli/src/lib/scan/walker.ts +++ b/packages/cli/src/lib/scan/walker.ts @@ -427,7 +427,7 @@ async function* walkParallel(ctx: WalkContext): AsyncGenerator { // worker lifecycle (cancelled, abort, idle-wait, error path, wake coordination) is inherently branchy const runWorker = async (): Promise => { - while (true) { + for (;;) { // Outer try catches: // - AbortError from `checkAborted` (crucially including the // first iteration when the signal was pre-fired); @@ -507,7 +507,7 @@ async function* walkParallel(ctx: WalkContext): AsyncGenerator { }); try { - while (true) { + for (;;) { if (pending.length > 0) { while (pending.length > 0) { yield pending.shift() as WalkEntry; diff --git a/packages/cli/src/lib/sentryclirc-import.ts b/packages/cli/src/lib/sentryclirc-import.ts index 88f738e963..d5e5610fbb 100644 --- a/packages/cli/src/lib/sentryclirc-import.ts +++ b/packages/cli/src/lib/sentryclirc-import.ts @@ -696,7 +696,7 @@ export async function executeImport( /** Parse a stored import record from JSON. Returns null on parse failure. */ function parseImportRecord(raw: string): ImportRecord | null { try { - const parsed = JSON.parse(raw) as ImportRecord; + const parsed = JSON.parse(raw) as ImportRecord | null; if (!Array.isArray(parsed?.sources)) { log.debug("Import record has invalid sources field"); return null; diff --git a/packages/cli/src/lib/sixel.ts b/packages/cli/src/lib/sixel.ts index 0d4b40571a..34510229d7 100644 --- a/packages/cli/src/lib/sixel.ts +++ b/packages/cli/src/lib/sixel.ts @@ -575,7 +575,7 @@ export function canRenderKitty(): boolean { * session, mirroring the fit check {@link sixelFits} does for the banner. */ export function terminalPixelWidth( - columns: number = process.stdout.columns ?? 80, + columns: number = process.stdout.columns || 80, ): number | undefined { const caps = detectSixelCaps(); if ( @@ -594,7 +594,7 @@ export function terminalPixelWidth( * guessing, because a guessed row height corrupts the dashboard grid. */ export function terminalPixelHeight( - rows: number = process.stdout.rows ?? 24, + rows: number = process.stdout.rows || 24, ): number | undefined { const caps = detectSixelCaps(); if ( @@ -613,7 +613,7 @@ export function terminalPixelHeight( * affects sharpness, never layout. */ export function tmuxKittyPlacement( - columns: number = process.stdout.columns ?? 80, + columns: number = process.stdout.columns || 80, ): TmuxKittyPlacement | undefined { if (!detectSixelCaps().tmux) { return; @@ -659,7 +659,7 @@ function sixelBanner(): string | undefined { * caller falls back to the block-art banner. */ export function graphicsBanner( - columns: number = process.stdout.columns ?? 80, + columns: number = process.stdout.columns || 80, ): string | undefined { // Re-evaluate the cheap, I/O-free gates on every call. detectSixelCaps caches // the probe result, so this ensures a later opt-out (NO_COLOR, diff --git a/packages/cli/src/lib/snapshots/archive.ts b/packages/cli/src/lib/snapshots/archive.ts index 01fd1671e9..7bab6287c1 100644 --- a/packages/cli/src/lib/snapshots/archive.ts +++ b/packages/cli/src/lib/snapshots/archive.ts @@ -56,7 +56,7 @@ export async function extractZipStream( mkdirSync(root, { recursive: true }); let written = 0; - let failure: Error | null = null; + let failure = null as Error | null; let completed = false; const writes: Promise[] = []; const openStreams: ReturnType[] = []; diff --git a/packages/cli/src/lib/telemetry.ts b/packages/cli/src/lib/telemetry.ts index e6bddca033..f548611dcb 100644 --- a/packages/cli/src/lib/telemetry.ts +++ b/packages/cli/src/lib/telemetry.ts @@ -1161,7 +1161,7 @@ export function withTracingSpan( { name, op, attributes, onlyIfParent: true }, async (span) => { // Track if callback sets status, so we don't override it - let statusWasSet = false; + let statusWasSet = false as boolean; const originalSetStatus = span.setStatus.bind(span); span.setStatus = (...args) => { statusWasSet = true; diff --git a/packages/cli/src/lib/telemetry/credential-redaction.ts b/packages/cli/src/lib/telemetry/credential-redaction.ts index 63aefe36c5..59e9ee223b 100644 --- a/packages/cli/src/lib/telemetry/credential-redaction.ts +++ b/packages/cli/src/lib/telemetry/credential-redaction.ts @@ -7,7 +7,7 @@ import { redactCredentialText } from "../credential-redaction.js"; function redactJson(value: T): T { let serialized: string | undefined; try { - serialized = JSON.stringify(value); + serialized = JSON.stringify(value) as string | undefined; } catch { // This is the SDK's envelope serialization fallback for cycles and BigInt. serialized = JSON.stringify(normalize(value)); diff --git a/packages/cli/src/lib/upgrade.ts b/packages/cli/src/lib/upgrade.ts index 2f110912cf..d57f5389f4 100644 --- a/packages/cli/src/lib/upgrade.ts +++ b/packages/cli/src/lib/upgrade.ts @@ -486,7 +486,7 @@ export async function fetchLatestFromGitHubWithSource( let response = resolved.response; const visitedPages = new Set([getGitHubLatestReleaseUrl(resolved.source)]); const versions: string[] = []; - while (true) { + for (;;) { const data = await parseUpgradeJson( response, signal, diff --git a/packages/cli/src/lib/walk-up.ts b/packages/cli/src/lib/walk-up.ts index d28054f7cc..2516ff2d38 100644 --- a/packages/cli/src/lib/walk-up.ts +++ b/packages/cli/src/lib/walk-up.ts @@ -26,7 +26,7 @@ export async function* walkUpFrom(startDir: string): AsyncGenerator { const seen = new Set(); let current = resolve(startDir); - while (true) { + for (;;) { let real: string; try { real = await realpath(current); diff --git a/packages/cli/src/output-schemas/dashboard.ts b/packages/cli/src/output-schemas/dashboard.ts index 94d9756273..736a9052bc 100644 --- a/packages/cli/src/output-schemas/dashboard.ts +++ b/packages/cli/src/output-schemas/dashboard.ts @@ -31,7 +31,7 @@ export { DashboardRevisionSchema } from "../types/dashboard.js"; /** Schema for dashboard list items (lightweight, from GET /dashboards/) */ export const DashboardListItemSchema = looseObject({ id: string(), - title: string(), + title: optional(string()), dateCreated: optional(string()), createdBy: optional( object({ diff --git a/packages/cli/test/commands/api.test.ts b/packages/cli/test/commands/api.test.ts index d7ef4f49cc..56fdab4d1d 100644 --- a/packages/cli/test/commands/api.test.ts +++ b/packages/cli/test/commands/api.test.ts @@ -1807,21 +1807,15 @@ describe("dataToQueryParams", () => { }); test("throws on null", () => { - expect(() => - dataToQueryParams(null as unknown as Record), - ).toThrow(ValidationError); + expect(() => dataToQueryParams(null)).toThrow(ValidationError); }); test("throws on boolean", () => { - expect(() => - dataToQueryParams(true as unknown as Record), - ).toThrow(ValidationError); + expect(() => dataToQueryParams(true)).toThrow(ValidationError); }); test("throws on number", () => { - expect(() => - dataToQueryParams(42 as unknown as Record), - ).toThrow(ValidationError); + expect(() => dataToQueryParams(42)).toThrow(ValidationError); }); }); diff --git a/packages/cli/test/commands/dashboard/list.test.ts b/packages/cli/test/commands/dashboard/list.test.ts index 75b2b45280..3a860d1bd5 100644 --- a/packages/cli/test/commands/dashboard/list.test.ts +++ b/packages/cli/test/commands/dashboard/list.test.ts @@ -547,10 +547,7 @@ describe("dashboard list command", () => { test("handles dashboards with undefined title in human output", async () => { resolveOrgSpy.mockResolvedValue("test-org"); listDashboardsPaginatedSpy.mockResolvedValue({ - data: [ - { id: "1", title: undefined as unknown as string, widgetDisplay: [] }, - DASHBOARD_B, - ], + data: [{ id: "1", title: undefined, widgetDisplay: [] }, DASHBOARD_B], nextCursor: undefined, }); @@ -566,9 +563,7 @@ describe("dashboard list command", () => { test("handles dashboards with undefined title in JSON output", async () => { resolveOrgSpy.mockResolvedValue("test-org"); listDashboardsPaginatedSpy.mockResolvedValue({ - data: [ - { id: "1", title: undefined as unknown as string, widgetDisplay: [] }, - ], + data: [{ id: "1", title: undefined, widgetDisplay: [] }], nextCursor: undefined, }); @@ -584,10 +579,7 @@ describe("dashboard list command", () => { test("glob filter does not crash on dashboards with undefined title", async () => { resolveOrgSpy.mockResolvedValue("test-org"); listDashboardsPaginatedSpy.mockResolvedValue({ - data: [ - { id: "1", title: undefined as unknown as string, widgetDisplay: [] }, - DASHBOARD_B, - ], + data: [{ id: "1", title: undefined, widgetDisplay: [] }, DASHBOARD_B], nextCursor: undefined, }); diff --git a/packages/cli/test/commands/log/list.test.ts b/packages/cli/test/commands/log/list.test.ts index 693948881e..7cdc01e23e 100644 --- a/packages/cli/test/commands/log/list.test.ts +++ b/packages/cli/test/commands/log/list.test.ts @@ -199,6 +199,7 @@ function createMockContext() { stdout: { write: stdoutWrite }, stderr: { write: stderrWrite }, cwd: "/tmp", + process: {}, }, stdoutWrite, stderrWrite, diff --git a/packages/cli/test/lib/api/chunk-upload.test.ts b/packages/cli/test/lib/api/chunk-upload.test.ts index 0ed9f21f0c..0ec80e7d8c 100644 --- a/packages/cli/test/lib/api/chunk-upload.test.ts +++ b/packages/cli/test/lib/api/chunk-upload.test.ts @@ -191,7 +191,11 @@ describe("assemble requests", () => { respondWith({ state: "bogus", missingChunks: [] }); await expect( - assembleArtifactBundle("my-org", { checksum: "abc", chunks: [] }), + assembleArtifactBundle("my-org", { + checksum: "abc", + chunks: [], + projects: [], + }), ).rejects.toThrow("Unexpected response format"); }); }); diff --git a/packages/cli/test/lib/completions.property.test.ts b/packages/cli/test/lib/completions.property.test.ts index f875ecd864..024c0999c0 100644 --- a/packages/cli/test/lib/completions.property.test.ts +++ b/packages/cli/test/lib/completions.property.test.ts @@ -32,12 +32,15 @@ import { generateZshCompletion, } from "../../src/lib/completions.js"; import { + type CommandCompletions, extractCommandCompletions, extractRouteGroups, type RouteMap, } from "../../src/lib/introspect.js"; import { DEFAULT_NUM_RUNS } from "../model-based/helpers.js"; +const generatedCommands: CommandCompletions = generatedTargets.commands; + // -- Arbitraries -- /** Generate valid binary names (lowercase alphanumeric + hyphens) */ @@ -275,7 +278,7 @@ describe("proposeCompletions: Stricli integration", () => { describe("property: flag names", () => { test("hidden flags are excluded", () => { - for (const command of Object.values(generatedTargets.commands)) { + for (const command of Object.values(generatedCommands)) { // The global --log-level is hidden; the parser still accepts it expect(command.flagNames).not.toHaveProperty("--log-level"); } diff --git a/packages/cli/test/lib/formatters/trace.test.ts b/packages/cli/test/lib/formatters/trace.test.ts index 5c91261d56..c0a3e6871a 100644 --- a/packages/cli/test/lib/formatters/trace.test.ts +++ b/packages/cli/test/lib/formatters/trace.test.ts @@ -603,14 +603,6 @@ describe("findSpanById", () => { const result = findSpanById(spans, "0000000000000000"); expect(result).toBeNull(); }); - - test("handles span with undefined span_id gracefully", () => { - const spans = [ - { start_timestamp: 1000, children: [] } as unknown as TraceSpan, - ]; - const result = findSpanById(spans, "a1b2c3d4e5f67890"); - expect(result).toBeNull(); - }); }); // --------------------------------------------------------------------------- From 5eec535646ca1af4c6e66fb8a413e3eff10f495c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josh=20Goldberg=20=E2=9C=A8?= Date: Fri, 13 Nov 2026 09:43:00 -0500 Subject: [PATCH 02/18] ref(lint): Fix no-unnecessary-condition in cli code from main Co-Authored-By: Claude Opus 5.5 --- packages/cli/src/commands/local/receiver-ingest.ts | 2 +- packages/cli/src/lib/formatters/seer.ts | 2 +- packages/cli/src/lib/select-ui/terminal.ts | 6 +++--- packages/cli/src/lib/sourcemap/debug-id.ts | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/cli/src/commands/local/receiver-ingest.ts b/packages/cli/src/commands/local/receiver-ingest.ts index f4bae4ba51..9f6e570b2e 100644 --- a/packages/cli/src/commands/local/receiver-ingest.ts +++ b/packages/cli/src/commands/local/receiver-ingest.ts @@ -59,7 +59,7 @@ export async function readReceiverBody( const chunks: Uint8Array[] = []; let size = 0; try { - while (true) { + for (;;) { const { done, value } = await reader.read(); if (done) return Buffer.concat(chunks, size); size += value.byteLength; diff --git a/packages/cli/src/lib/formatters/seer.ts b/packages/cli/src/lib/formatters/seer.ts index ca7e1958a2..5ca99173cc 100644 --- a/packages/cli/src/lib/formatters/seer.ts +++ b/packages/cli/src/lib/formatters/seer.ts @@ -164,7 +164,7 @@ export type IssueExplainData = { function buildRootCauseMarkdown(rootCause: RootCause, index: number): string { const lines: string[] = []; - lines.push(`### Cause #${index}: ${text(rootCause.description ?? "")}`); + lines.push(`### Cause #${index}: ${text(rootCause.description)}`); lines.push(""); if (rootCause.cause) { diff --git a/packages/cli/src/lib/select-ui/terminal.ts b/packages/cli/src/lib/select-ui/terminal.ts index a966532eb0..174f2369c7 100644 --- a/packages/cli/src/lib/select-ui/terminal.ts +++ b/packages/cli/src/lib/select-ui/terminal.ts @@ -67,7 +67,7 @@ export async function selectWithFilter( ): Promise { const freshStdin = openFreshTty(); const stdin = freshStdin ?? process.stdin; - const wasRaw = stdin.isRaw ?? false; + const wasRaw = stdin.isRaw; let picker: MountedPicker | undefined; let resolveSelection!: (value: string | null) => void; let rejectSelection!: (error: unknown) => void; @@ -80,7 +80,7 @@ export async function selectWithFilter( // Surface terminal read failures instead of waiting forever for a key. stdin.once("error", rejectSelection); try { - stdin.setRawMode?.(true); + stdin.setRawMode(true); stdin.resume(); picker = mountSelectPrompt(createSelectPrompt(opts, resolveSelection), { input: stdin, @@ -95,7 +95,7 @@ export async function selectWithFilter( picker?.close(); } finally { try { - stdin.setRawMode?.(wasRaw); + stdin.setRawMode(wasRaw); } finally { stdin.pause(); freshStdin?.destroy(); diff --git a/packages/cli/src/lib/sourcemap/debug-id.ts b/packages/cli/src/lib/sourcemap/debug-id.ts index e90301bd6e..1ddb278edf 100644 --- a/packages/cli/src/lib/sourcemap/debug-id.ts +++ b/packages/cli/src/lib/sourcemap/debug-id.ts @@ -348,7 +348,7 @@ export async function injectDebugId( type SourcemapJson = { mappings?: string; sources?: (string | null)[]; - sections?: IndexMapSection[]; + sections?: (IndexMapSection | null)[]; debug_id?: string; debugId?: string; }; @@ -356,7 +356,7 @@ type SourcemapJson = { /** A section of an ECMA-426 index map, which Turbopack emits. */ type IndexMapSection = { offset?: { line?: unknown }; - map?: SourcemapJson; + map?: SourcemapJson | null; }; /** @@ -398,7 +398,7 @@ function insertGeneratedLine(map: SourcemapJson, line: number): void { let spanning: { map: SourcemapJson; start: number } | undefined; for (const section of map.sections) { const start = section?.offset?.line; - if (typeof start !== "number") { + if (!section || typeof start !== "number") { continue; } if (start >= line) { From af9b4cc84c3a826ada2489d07fdc3dc6c6da4ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josh=20Goldberg=20=E2=9C=A8?= Date: Fri, 13 Nov 2026 10:14:43 -0500 Subject: [PATCH 03/18] ref(tsconfig): Extend one shared base tsconfig from every package Co-Authored-By: Claude Opus 5.5 --- .github/workflows/smoke-tests.yml | 2 +- apps/cli-docs/tsconfig.json | 5 +-- apps/docs-mcp/tsconfig.json | 6 +-- apps/games-api/package.json | 1 - apps/games-api/tsconfig.json | 9 ++++- apps/local/tsconfig.app.json | 5 +-- apps/local/tsconfig.node.json | 4 +- packages/cli/tsconfig.json | 16 ++------ packages/codemod-cli3to4/tsconfig.json | 6 +-- packages/logger/tsconfig.json | 10 ++--- packages/mcp-cloudflare/package.json | 1 - packages/mcp-cloudflare/tsconfig.client.json | 19 ++++++++-- packages/mcp-cloudflare/tsconfig.node.json | 11 +++++- packages/mcp-core/package.json | 1 - packages/mcp-core/tsconfig.json | 11 +++++- packages/mcp-server-evals/package.json | 1 - packages/mcp-server-evals/tsconfig.json | 11 +++++- packages/mcp-server-mocks/package.json | 1 - packages/mcp-server-mocks/tsconfig.json | 11 +++++- packages/mcp-server-tsconfig/package.json | 9 ----- .../mcp-server-tsconfig/tsconfig.base.json | 38 ------------------- .../mcp-server-tsconfig/tsconfig.vite.json | 13 ------- packages/mcp-test-client/tsconfig.json | 13 ++++++- packages/toolkit-core/tsconfig.json | 7 +--- pnpm-lock.yaml | 16 -------- tsconfig.base.json | 14 +++++++ 26 files changed, 105 insertions(+), 136 deletions(-) delete mode 100644 packages/mcp-server-tsconfig/package.json delete mode 100644 packages/mcp-server-tsconfig/tsconfig.base.json delete mode 100644 packages/mcp-server-tsconfig/tsconfig.vite.json create mode 100644 tsconfig.base.json diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 84147a204a..d97c741f01 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -13,7 +13,7 @@ on: - "packages/mcp-cloudflare/**" - "packages/mcp-core/**" - "packages/mcp-server-mocks/**" - - "packages/mcp-server-tsconfig/**" + - "tsconfig.base.json" - "packages/smoke-tests/**" - "package.json" - "pnpm-lock.yaml" diff --git a/apps/cli-docs/tsconfig.json b/apps/cli-docs/tsconfig.json index 0fc51d71b1..26491b02de 100644 --- a/apps/cli-docs/tsconfig.json +++ b/apps/cli-docs/tsconfig.json @@ -1,6 +1,3 @@ { - "extends": "astro/tsconfigs/strict", - "compilerOptions": { - "strictNullChecks": true - } + "extends": ["../../tsconfig.base.json", "astro/tsconfigs/strict"] } diff --git a/apps/docs-mcp/tsconfig.json b/apps/docs-mcp/tsconfig.json index d349c64f70..d915be489c 100644 --- a/apps/docs-mcp/tsconfig.json +++ b/apps/docs-mcp/tsconfig.json @@ -1,10 +1,8 @@ { + "extends": "../../tsconfig.base.json", "compilerOptions": { - "target": "ESNext", - "module": "ESNext", - "moduleResolution": "Bundler", "strict": true, - "skipLibCheck": true, + "target": "ESNext", "lib": ["ESNext", "WebWorker"], "jsx": "react-jsx", "jsxImportSource": "hono/jsx" diff --git a/apps/games-api/package.json b/apps/games-api/package.json index be6671beef..946e885fd2 100644 --- a/apps/games-api/package.json +++ b/apps/games-api/package.json @@ -21,7 +21,6 @@ }, "devDependencies": { "@cloudflare/workers-types": "catalog:", - "@sentry/mcp-server-tsconfig": "workspace:*", "typescript": "catalog:", "vitest": "catalog:", "wrangler": "catalog:" diff --git a/apps/games-api/tsconfig.json b/apps/games-api/tsconfig.json index 4e0793b59c..50fe6f5ba4 100644 --- a/apps/games-api/tsconfig.json +++ b/apps/games-api/tsconfig.json @@ -1,7 +1,12 @@ { - "extends": "@sentry/mcp-server-tsconfig/tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { - "types": ["@cloudflare/workers-types"] + "strict": true, + "lib": ["ES2023", "ES2024.String"], + "types": ["@cloudflare/workers-types"], + "allowJs": true, + "noFallthroughCasesInSwitch": true, + "noUncheckedSideEffectImports": true }, "include": ["src"] } diff --git a/apps/local/tsconfig.app.json b/apps/local/tsconfig.app.json index 3a104a4a3c..9611e02d40 100644 --- a/apps/local/tsconfig.app.json +++ b/apps/local/tsconfig.app.json @@ -1,21 +1,18 @@ { + "extends": "../../tsconfig.base.json", "compilerOptions": { "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo", "target": "es2023", "lib": ["ES2023", "DOM"], - "module": "esnext", "types": ["vite/client"], "allowArbitraryExtensions": true, - "skipLibCheck": true, /* Bundler mode */ - "moduleResolution": "bundler", "paths": { "@/*": ["./src/*"] }, "allowImportingTsExtensions": true, "verbatimModuleSyntax": true, - "moduleDetection": "force", "noEmit": true, "jsx": "react-jsx", diff --git a/apps/local/tsconfig.node.json b/apps/local/tsconfig.node.json index 8d2b2b02f1..a2e3655d00 100644 --- a/apps/local/tsconfig.node.json +++ b/apps/local/tsconfig.node.json @@ -1,16 +1,16 @@ { + "extends": "../../tsconfig.base.json", "compilerOptions": { "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo", "target": "es2023", "lib": ["ES2023"], "types": ["node"], - "skipLibCheck": true, /* Bundler mode */ "module": "nodenext", + "moduleResolution": "nodenext", "allowImportingTsExtensions": true, "verbatimModuleSyntax": true, - "moduleDetection": "force", "noEmit": true, /* Linting */ diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index aaa42765ef..a03877f246 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -1,27 +1,17 @@ { + "extends": "../../tsconfig.base.json", "compilerOptions": { + "strict": true, "lib": ["ESNext"], "target": "ESNext", - "module": "ESNext", - "moduleDetection": "force", "allowJs": true, - "moduleResolution": "bundler", "allowImportingTsExtensions": true, "verbatimModuleSyntax": true, "erasableSyntaxOnly": true, "noEmit": true, - "resolveJsonModule": true, - "strict": true, - "skipLibCheck": true, "noFallthroughCasesInSwitch": true, "noUncheckedIndexedAccess": true, - "noImplicitOverride": true, - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "noUnusedLocals": false, - "noUnusedParameters": false, - "noPropertyAccessFromIndexSignature": false, - "strictNullChecks": true + "noImplicitOverride": true }, "include": ["src/**/*.ts"], "exclude": ["node_modules", "dist"] diff --git a/packages/codemod-cli3to4/tsconfig.json b/packages/codemod-cli3to4/tsconfig.json index 9c066b590b..123ee59216 100644 --- a/packages/codemod-cli3to4/tsconfig.json +++ b/packages/codemod-cli3to4/tsconfig.json @@ -1,6 +1,8 @@ { + "extends": "../../tsconfig.base.json", "compilerOptions": { - "skipLibCheck": true, + "strict": true, + "target": "ESNext", "module": "NodeNext", "moduleResolution": "NodeNext", "types": ["@codemod.com/jssg-types"], @@ -8,8 +10,6 @@ "noEmit": true, "verbatimModuleSyntax": true, "erasableSyntaxOnly": true, - "strict": true, - "strictNullChecks": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, "noUncheckedIndexedAccess": true diff --git a/packages/logger/tsconfig.json b/packages/logger/tsconfig.json index 7df4fae8af..c3f8e5906c 100644 --- a/packages/logger/tsconfig.json +++ b/packages/logger/tsconfig.json @@ -1,15 +1,11 @@ { + "extends": "../../tsconfig.base.json", "compilerOptions": { - "target": "ES2022", + "strict": true, "lib": ["ES2023"], - "module": "ESNext", - "moduleResolution": "Bundler", "types": ["node"], - "strict": true, "noUncheckedIndexedAccess": true, - "noEmit": true, - "skipLibCheck": true, - "isolatedModules": true + "noEmit": true }, "include": ["src/**/*.ts", "test/*.ts"] } diff --git a/packages/mcp-cloudflare/package.json b/packages/mcp-cloudflare/package.json index c74461e930..1357edddcd 100644 --- a/packages/mcp-cloudflare/package.json +++ b/packages/mcp-cloudflare/package.json @@ -35,7 +35,6 @@ "@cloudflare/workers-types": "catalog:", "@sentry/mcp-core": "workspace:*", "@sentry/mcp-server-mocks": "workspace:*", - "@sentry/mcp-server-tsconfig": "workspace:*", "@sentry/toolkit-core": "workspace:*", "@sentry/vite-plugin": "catalog:", "@tailwindcss/typography": "catalog:", diff --git a/packages/mcp-cloudflare/tsconfig.client.json b/packages/mcp-cloudflare/tsconfig.client.json index 0bfc9a086a..5e76fc37f9 100644 --- a/packages/mcp-cloudflare/tsconfig.client.json +++ b/packages/mcp-cloudflare/tsconfig.client.json @@ -1,11 +1,22 @@ { - "extends": "@sentry/mcp-server-tsconfig/tsconfig.vite.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { + "strict": true, + "target": "ES2020", + "lib": ["ES2020", "DOM", "DOM.Iterable"], + "types": ["vite/client"], + "jsx": "react-jsx", + "useDefineForClassFields": true, + "allowJs": true, + "noFallthroughCasesInSwitch": true, + "noUncheckedSideEffectImports": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "incremental": true, "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.client.tsbuildinfo", "paths": { - "@/*": [ - "./src/*" - ] + "@/*": ["./src/*"] }, "outDir": "dist", "rootDir": "src" diff --git a/packages/mcp-cloudflare/tsconfig.node.json b/packages/mcp-cloudflare/tsconfig.node.json index bdadf3ce9a..2a1294c664 100644 --- a/packages/mcp-cloudflare/tsconfig.node.json +++ b/packages/mcp-cloudflare/tsconfig.node.json @@ -1,6 +1,15 @@ { - "extends": "@sentry/mcp-server-tsconfig/tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { + "strict": true, + "lib": ["ES2023", "ES2024.String"], + "allowJs": true, + "noFallthroughCasesInSwitch": true, + "noUncheckedSideEffectImports": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "incremental": true, "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo", "outDir": "dist", "rootDir": "" diff --git a/packages/mcp-core/package.json b/packages/mcp-core/package.json index adbd9a2ff1..0d96006b43 100644 --- a/packages/mcp-core/package.json +++ b/packages/mcp-core/package.json @@ -170,7 +170,6 @@ "@ai-sdk/provider-utils": "^4.0.11", "@modelcontextprotocol/sdk": "catalog:", "@sentry/mcp-server-mocks": "workspace:*", - "@sentry/mcp-server-tsconfig": "workspace:*", "msw": "catalog:", "tiktoken": "^1.0.18", "yaml": "^2.8.3" diff --git a/packages/mcp-core/tsconfig.json b/packages/mcp-core/tsconfig.json index d4fe4fe1ad..522f596576 100644 --- a/packages/mcp-core/tsconfig.json +++ b/packages/mcp-core/tsconfig.json @@ -1,6 +1,15 @@ { - "extends": "@sentry/mcp-server-tsconfig/tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { + "strict": true, + "lib": ["ES2023", "ES2024.String"], + "allowJs": true, + "noFallthroughCasesInSwitch": true, + "noUncheckedSideEffectImports": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "incremental": true, "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.tsbuildinfo", "outDir": "dist", "rootDir": "src" diff --git a/packages/mcp-server-evals/package.json b/packages/mcp-server-evals/package.json index 9950695757..b83253c3d9 100644 --- a/packages/mcp-server-evals/package.json +++ b/packages/mcp-server-evals/package.json @@ -19,7 +19,6 @@ "@ai-sdk/openai": "catalog:", "@sentry/mcp-core": "workspace:*", "@sentry/mcp-server-mocks": "workspace:*", - "@sentry/mcp-server-tsconfig": "workspace:*", "ai": "catalog:", "dotenv": "catalog:", "msw": "catalog:", diff --git a/packages/mcp-server-evals/tsconfig.json b/packages/mcp-server-evals/tsconfig.json index d4fe4fe1ad..522f596576 100644 --- a/packages/mcp-server-evals/tsconfig.json +++ b/packages/mcp-server-evals/tsconfig.json @@ -1,6 +1,15 @@ { - "extends": "@sentry/mcp-server-tsconfig/tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { + "strict": true, + "lib": ["ES2023", "ES2024.String"], + "allowJs": true, + "noFallthroughCasesInSwitch": true, + "noUncheckedSideEffectImports": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "incremental": true, "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.tsbuildinfo", "outDir": "dist", "rootDir": "src" diff --git a/packages/mcp-server-mocks/package.json b/packages/mcp-server-mocks/package.json index f554629833..755ddf7abe 100644 --- a/packages/mcp-server-mocks/package.json +++ b/packages/mcp-server-mocks/package.json @@ -26,7 +26,6 @@ "dev": "tsdown -w" }, "devDependencies": { - "@sentry/mcp-server-tsconfig": "workspace:*", "tsdown": "catalog:" }, "dependencies": { diff --git a/packages/mcp-server-mocks/tsconfig.json b/packages/mcp-server-mocks/tsconfig.json index d4fe4fe1ad..522f596576 100644 --- a/packages/mcp-server-mocks/tsconfig.json +++ b/packages/mcp-server-mocks/tsconfig.json @@ -1,6 +1,15 @@ { - "extends": "@sentry/mcp-server-tsconfig/tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { + "strict": true, + "lib": ["ES2023", "ES2024.String"], + "allowJs": true, + "noFallthroughCasesInSwitch": true, + "noUncheckedSideEffectImports": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "incremental": true, "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.tsbuildinfo", "outDir": "dist", "rootDir": "src" diff --git a/packages/mcp-server-tsconfig/package.json b/packages/mcp-server-tsconfig/package.json deleted file mode 100644 index a69973b488..0000000000 --- a/packages/mcp-server-tsconfig/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "@sentry/mcp-server-tsconfig", - "version": "0.42.0", - "private": true, - "files": [ - "tsconfig.base.json", - "tsconfig.vite.json" - ] -} diff --git a/packages/mcp-server-tsconfig/tsconfig.base.json b/packages/mcp-server-tsconfig/tsconfig.base.json deleted file mode 100644 index 96f1585830..0000000000 --- a/packages/mcp-server-tsconfig/tsconfig.base.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "display": "Default", - "compilerOptions": { - "target": "ES2022", - "lib": ["ES2023", "ES2024.String"], - "module": "ESNext", - "preserveWatchOutput": true, - - /* Bundler mode */ - "moduleResolution": "Bundler", - "esModuleInterop": true, - "skipLibCheck": true, - "allowImportingTsExtensions": false, - "resolveJsonModule": true, - "isolatedModules": true, - "moduleDetection": "force", - "noEmit": false, - - /* Linting */ - "strict": true, - "noUnusedLocals": false, - "noUnusedParameters": false, - "noFallthroughCasesInSwitch": true, - "noUncheckedSideEffectImports": true, - "forceConsistentCasingInFileNames": true, - - /* Basic Options */ - "sourceMap": true, - "composite": false, - "incremental": true, - "declaration": true, - "declarationMap": true, - "allowJs": true - }, - "include": [], - "exclude": ["node_modules"] -} diff --git a/packages/mcp-server-tsconfig/tsconfig.vite.json b/packages/mcp-server-tsconfig/tsconfig.vite.json deleted file mode 100644 index b7a7ff306a..0000000000 --- a/packages/mcp-server-tsconfig/tsconfig.vite.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig", - "display": "Vite (React) Library", - "extends": "./tsconfig.base.json", - "compilerOptions": { - "jsx": "react-jsx", - "target": "ES2020", - "lib": ["ES2020", "DOM", "DOM.Iterable"], - "useDefineForClassFields": true, - "module": "ESNext", - "types": ["vite/client"] - } -} diff --git a/packages/mcp-test-client/tsconfig.json b/packages/mcp-test-client/tsconfig.json index 4c1f2efaf6..9f08251975 100644 --- a/packages/mcp-test-client/tsconfig.json +++ b/packages/mcp-test-client/tsconfig.json @@ -1,9 +1,18 @@ { - "extends": "../mcp-server-tsconfig/tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { + "strict": true, + "lib": ["ES2023", "ES2024.String"], + "allowJs": true, + "noFallthroughCasesInSwitch": true, + "noUncheckedSideEffectImports": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "incremental": true, "outDir": "./dist", "rootDir": "./src" }, "include": ["src/**/*"], "exclude": ["node_modules", "dist", "**/*.test.ts"] -} \ No newline at end of file +} diff --git a/packages/toolkit-core/tsconfig.json b/packages/toolkit-core/tsconfig.json index 9fc6f4c617..7495e3bd8d 100644 --- a/packages/toolkit-core/tsconfig.json +++ b/packages/toolkit-core/tsconfig.json @@ -1,12 +1,9 @@ { + "extends": "../../tsconfig.base.json", "compilerOptions": { - "target": "ES2022", - "module": "ESNext", - "moduleResolution": "Bundler", "strict": true, "noUncheckedIndexedAccess": true, - "noEmit": true, - "skipLibCheck": true + "noEmit": true }, "include": ["src/**/*.ts"] } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ed93e2b19f..71a54645ea 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -366,9 +366,6 @@ importers: '@cloudflare/workers-types': specifier: 'catalog:' version: 4.20260405.1 - '@sentry/mcp-server-tsconfig': - specifier: workspace:* - version: link:../../packages/mcp-server-tsconfig typescript: specifier: 'catalog:' version: 5.9.3 @@ -767,9 +764,6 @@ importers: '@sentry/mcp-server-mocks': specifier: workspace:* version: link:../mcp-server-mocks - '@sentry/mcp-server-tsconfig': - specifier: workspace:* - version: link:../mcp-server-tsconfig '@sentry/toolkit-core': specifier: workspace:* version: link:../toolkit-core @@ -876,9 +870,6 @@ importers: '@sentry/mcp-server-mocks': specifier: workspace:* version: link:../mcp-server-mocks - '@sentry/mcp-server-tsconfig': - specifier: workspace:* - version: link:../mcp-server-tsconfig msw: specifier: 'catalog:' version: 2.10.2(@types/node@24.13.5)(typescript@5.9.3) @@ -909,9 +900,6 @@ importers: '@sentry/mcp-server-mocks': specifier: workspace:* version: link:../mcp-server-mocks - '@sentry/mcp-server-tsconfig': - specifier: workspace:* - version: link:../mcp-server-tsconfig ai: specifier: 'catalog:' version: 6.0.64(zod@4.6.7) @@ -944,14 +932,10 @@ importers: specifier: 'catalog:' version: 2.10.2(@types/node@24.13.5)(typescript@5.9.3) devDependencies: - '@sentry/mcp-server-tsconfig': - specifier: workspace:* - version: link:../mcp-server-tsconfig tsdown: specifier: 'catalog:' version: 0.12.9(typescript@5.9.3) - packages/mcp-server-tsconfig: {} packages/mcp-test-client: dependencies: diff --git a/tsconfig.base.json b/tsconfig.base.json new file mode 100644 index 0000000000..bf775b69a8 --- /dev/null +++ b/tsconfig.base.json @@ -0,0 +1,14 @@ +{ + "$schema": "https://json.schemastore.org/tsconfig", + "compilerOptions": { + "target": "ES2022", + "module": "ESNext", + "moduleResolution": "Bundler", + "moduleDetection": "force", + "isolatedModules": true, + "esModuleInterop": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "forceConsistentCasingInFileNames": true + } +} From 8b2f7369ed17408a2257ebd7af64c1e072c80412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josh=20Goldberg=20=E2=9C=A8?= Date: Fri, 13 Nov 2026 10:30:21 -0500 Subject: [PATCH 04/18] ref(tsconfig): Apply the same strictness everywhere except mcp-core Co-Authored-By: Claude Opus 5.5 --- .oxlintrc.json | 11 ++++++ apps/docs-mcp/src/agent/query-agent.ts | 2 +- apps/docs-mcp/tsconfig.json | 1 - apps/games-api/src/leaderboard.test.ts | 10 +++--- apps/games-api/tsconfig.json | 5 +-- apps/local/.oxlintrc.json | 9 ----- apps/local/package.json | 2 +- apps/local/src/App.capture-lifecycle.test.tsx | 12 +++---- apps/local/src/App.integration.test.tsx | 34 ++++++++----------- .../src/App.sessions.integration.test.tsx | 3 +- apps/local/src/App.tsx | 1 + .../src/components/attachment-detail.tsx | 4 +-- apps/local/src/components/capture-header.tsx | 4 +-- .../src/components/event-command-dialog.tsx | 1 + apps/local/src/components/event-detail.tsx | 8 ++--- apps/local/src/components/json-view.tsx | 8 ++--- apps/local/src/components/local-settings.tsx | 7 ++-- .../src/components/performance-workspace.tsx | 5 +-- .../src/components/profile-workspace.tsx | 10 +++--- .../src/components/receiver-controls.tsx | 3 +- .../src/components/resizable-workspace.tsx | 1 + .../components/retention-settings.test.tsx | 22 +++++------- .../local/src/components/session-switcher.tsx | 5 +-- apps/local/src/components/span-detail.tsx | 8 ++--- apps/local/src/components/trace-waterfall.tsx | 12 +++---- apps/local/src/components/trace-workspace.tsx | 8 ++--- apps/local/src/tsconfig.json | 8 +++++ apps/local/tsconfig.app.json | 5 ++- apps/local/tsconfig.node.json | 3 +- packages/cli/tsconfig.json | 6 +--- packages/codemod-cli3to4/tsconfig.json | 5 +-- packages/logger/tsconfig.json | 2 -- .../animation/TerminalAnimation.tsx | 2 +- .../components/ui/slash-command-text.tsx | 2 +- .../mcp-cloudflare/src/homepage-content.ts | 2 +- .../src/server/lib/approval-dialog.ts | 9 +++-- .../src/server/lib/mcp-handler.ts | 2 +- .../src/server/oauth/resource-scope.ts | 22 +++--------- packages/mcp-cloudflare/tsconfig.client.json | 3 -- packages/mcp-cloudflare/tsconfig.node.json | 3 -- packages/mcp-core/tsconfig.json | 4 +-- packages/mcp-server-evals/tsconfig.json | 3 -- packages/mcp-server-mocks/tsconfig.json | 3 -- packages/mcp-test-client/src/agent.ts | 3 +- packages/mcp-test-client/tsconfig.json | 3 -- packages/toolkit-core/tsconfig.json | 2 -- tsconfig.base.json | 7 +++- 47 files changed, 124 insertions(+), 171 deletions(-) delete mode 100644 apps/local/.oxlintrc.json create mode 100644 apps/local/src/tsconfig.json diff --git a/.oxlintrc.json b/.oxlintrc.json index 0eafbfa64d..62ecf603df 100644 --- a/.oxlintrc.json +++ b/.oxlintrc.json @@ -62,6 +62,17 @@ "typescript/unbound-method": "off" } }, + { + "files": ["apps/local/**/*.{ts,tsx,js,mjs,cjs}"], + "plugins": ["react"], + "rules": { + "react/rules-of-hooks": "error", + "react/only-export-components": [ + "warn", + { "allowConstantExport": true } + ] + } + }, { "files": ["packages/mcp-cloudflare/src/client/**/*.tsx"], "rules": { diff --git a/apps/docs-mcp/src/agent/query-agent.ts b/apps/docs-mcp/src/agent/query-agent.ts index f55f308e9e..dc28147450 100644 --- a/apps/docs-mcp/src/agent/query-agent.ts +++ b/apps/docs-mcp/src/agent/query-agent.ts @@ -81,7 +81,7 @@ export function finalizeDocsAnswer( const body = answer.replace(SOURCES_SECTION_RE, "").trim(); const citations = uniqueCanonicalDocsUrls( - [...body.matchAll(MARKDOWN_LINK_URL_RE)].map((match) => match[1]), + [...body.matchAll(MARKDOWN_LINK_URL_RE)].map((match) => match[1]!), ); if (citations.length === 0) { throw new Error("Docs query answer must include an inline citation."); diff --git a/apps/docs-mcp/tsconfig.json b/apps/docs-mcp/tsconfig.json index d915be489c..7be5af3815 100644 --- a/apps/docs-mcp/tsconfig.json +++ b/apps/docs-mcp/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "strict": true, "target": "ESNext", "lib": ["ESNext", "WebWorker"], "jsx": "react-jsx", diff --git a/apps/games-api/src/leaderboard.test.ts b/apps/games-api/src/leaderboard.test.ts index 7032343e69..4d76ee4cab 100644 --- a/apps/games-api/src/leaderboard.test.ts +++ b/apps/games-api/src/leaderboard.test.ts @@ -103,7 +103,7 @@ describe("games leaderboard route", () => { }); expect(fetchMock).toHaveBeenCalledTimes(1); - const [url, init] = fetchMock.mock.calls[0]; + const [url, init] = fetchMock.mock.calls[0]!; const parsed = new URL(url as string); expect(parsed.origin + parsed.pathname).toBe( "https://us.sentry.io/api/0/organizations/sentry/events/", @@ -125,7 +125,7 @@ describe("games leaderboard route", () => { }); expect(cachePut).toHaveBeenCalledTimes(1); - const [key, cachedResponse] = cachePut.mock.calls[0]; + const [key, cachedResponse] = cachePut.mock.calls[0]!; expect(key).toBe(CACHE_URL); expect((cachedResponse as Response).headers.get("Cache-Control")).toBe( "max-age=300", @@ -211,7 +211,7 @@ describe("games leaderboard route", () => { expect(res.status).toBe(502); expect(text).not.toContain("secret-upstream-detail"); expect(text).not.toContain(TOKEN); - const reported = vi.mocked(Sentry.captureException).mock.calls[0][0]; + const reported = vi.mocked(Sentry.captureException).mock.calls[0]![0]; expect(String(reported)).toContain("Snake leaderboard upstream failed"); expect(String(reported)).not.toContain(TOKEN); }); @@ -243,8 +243,8 @@ describe("games leaderboard route", () => { it("uses a hashed IP rate limit key", async () => { const limit = vi.fn().mockResolvedValue({ success: false }); await app.request(PATH, REQ, makeEnv({ GAMES_RATE_LIMITER: { limit } })); - expect(limit.mock.calls[0][0].key).toMatch(/^games:ip:[a-f0-9]{16}$/); - expect(limit.mock.calls[0][0].key).not.toContain("192.0.2.1"); + expect(limit.mock.calls[0]![0].key).toMatch(/^games:ip:[a-f0-9]{16}$/); + expect(limit.mock.calls[0]![0].key).not.toContain("192.0.2.1"); }); it("fails open when the rate limiter throws", async () => { diff --git a/apps/games-api/tsconfig.json b/apps/games-api/tsconfig.json index 50fe6f5ba4..6c9736edcd 100644 --- a/apps/games-api/tsconfig.json +++ b/apps/games-api/tsconfig.json @@ -1,12 +1,9 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "strict": true, "lib": ["ES2023", "ES2024.String"], "types": ["@cloudflare/workers-types"], - "allowJs": true, - "noFallthroughCasesInSwitch": true, - "noUncheckedSideEffectImports": true + "allowJs": true }, "include": ["src"] } diff --git a/apps/local/.oxlintrc.json b/apps/local/.oxlintrc.json deleted file mode 100644 index 72cf41a39a..0000000000 --- a/apps/local/.oxlintrc.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "$schema": "./node_modules/oxlint/configuration_schema.json", - "plugins": ["react", "typescript", "oxc"], - "rules": { - "react/rules-of-hooks": "error", - "typescript/return-await": ["error", "always"], - "react/only-export-components": ["warn", { "allowConstantExport": true }] - } -} diff --git a/apps/local/package.json b/apps/local/package.json index 6f27dcc8f3..5e4d07877d 100644 --- a/apps/local/package.json +++ b/apps/local/package.json @@ -6,7 +6,7 @@ "scripts": { "dev": "vite", "build": "tsc -b && vite build", - "lint": "oxlint", + "lint": "pnpm -w exec oxlint --report-unused-disable-directives apps/local", "preview": "vite preview", "test": "pnpm --filter sentry exec node script/ensure-generated.mjs schema grammar && vitest run", "test:integration": "pnpm run test src/App.integration.test.tsx", diff --git a/apps/local/src/App.capture-lifecycle.test.tsx b/apps/local/src/App.capture-lifecycle.test.tsx index b654df824e..62e8bb5750 100644 --- a/apps/local/src/App.capture-lifecycle.test.tsx +++ b/apps/local/src/App.capture-lifecycle.test.tsx @@ -412,12 +412,10 @@ test("pending deletion disables Reload capture and ignores queued events until c "before pending reset", ); expect( - ( - screen.getByRole("button", { - name: "Reload capture", - exact: true, - }) as HTMLButtonElement - ).disabled, + screen.getByRole("button", { + name: "Reload capture", + exact: true, + }).disabled, ).toBe(false); expect(request).toHaveBeenCalledTimes(1); }); @@ -604,7 +602,7 @@ test.each(["connecting", "failed"] as const)( ), ); expect( - (screen.getByLabelText("Receiver endpoint") as HTMLInputElement).value, + screen.getByLabelText("Receiver endpoint").value, ).toBe("http://127.0.0.1:8970/stream"); expect(ControllableEventSource.instances).toHaveLength(attempts); }, diff --git a/apps/local/src/App.integration.test.tsx b/apps/local/src/App.integration.test.tsx index 09a2bece52..56b072cf25 100644 --- a/apps/local/src/App.integration.test.tsx +++ b/apps/local/src/App.integration.test.tsx @@ -540,7 +540,7 @@ describe("local receiver to viewer integration", () => { expect(detail.textContent).not.toContain("No additional event details."); const frames = screen.getAllByRole("list", { name: "Stack frames" }); expect(frames[0]?.textContent?.indexOf("submitOrder")).toBeLessThan( - frames[0]!.textContent!.indexOf("runMain"), + frames[0]!.textContent.indexOf("runMain"), ); fireEvent.click(screen.getByRole("tab", { name: "JSON" })); await waitFor(() => @@ -549,7 +549,7 @@ describe("local receiver to viewer integration", () => { ), ); expect( - JSON.parse(screen.getByTestId("highlighted-json").textContent!), + JSON.parse(screen.getByTestId("highlighted-json").textContent), ).toEqual({ ...sdkException, type: "event" }); } finally { cleanup(); @@ -713,7 +713,7 @@ describe("local receiver to viewer integration", () => { await sendEnvelope(port, "GET /dock"); await screen.findByLabelText(/^View transaction:/); const sidebar = screen.getByLabelText("Workspace navigation"); - expect(sidebar.querySelector('[role="status"]')).toBeNull(); + expect(sidebar.querySelector("output")).toBeNull(); expect(screen.getByLabelText("Capture context").textContent).toContain( "Capturing", ); @@ -1220,12 +1220,10 @@ describe("local receiver to viewer integration", () => { screen.getByRole("heading", { name: "No events displayed" }), ).not.toBeNull(); expect( - ( - screen.getByRole("button", { - name: "Reconnect", - exact: true, - }) as HTMLButtonElement - ).disabled, + screen.getByRole("button", { + name: "Reconnect", + exact: true, + }).disabled, ).toBe(false); fireEvent.click( screen.getByRole("button", { name: "Reconnect", exact: true }), @@ -1299,7 +1297,7 @@ describe("local receiver to viewer integration", () => { screen.getByRole("button", { name: "Switch receiver", exact: true }), ); expect( - (screen.getByLabelText("Receiver endpoint") as HTMLInputElement).value, + screen.getByLabelText("Receiver endpoint").value, ).toBe("http://127.0.0.1:8969/stream"); fireEvent.click( screen.getByRole("button", { name: "Connect", exact: true }), @@ -1415,7 +1413,7 @@ describe("local receiver to viewer integration", () => { .textContent, ).toContain("Connection timed out after 10 seconds"); expect( - (screen.getByRole("button", { name: "Connect" }) as HTMLButtonElement) + screen.getByRole("button", { name: "Connect" }) .disabled, ).toBe(false); } finally { @@ -1790,14 +1788,14 @@ describe("local receiver to viewer integration", () => { ); expect( ( - (await settings.findByRole("button", { + await settings.findByRole("button", { name: "Applying…", - })) as HTMLButtonElement + }) ).disabled, ).toBe(true); // The edited input is already 2000 while the HTTP mutation is pending. expect( - (settings.getByLabelText("Envelope limit") as HTMLInputElement).value, + settings.getByLabelText("Envelope limit").value, ).toBe("2000"); expect(retention.getSettings().maxEnvelopes).toBe(1000); // Await completion, allowing the receiver's five-second request timeout @@ -1889,7 +1887,7 @@ describe("local receiver to viewer integration", () => { ); await waitFor(() => expect( - (screen.getByLabelText("Envelope limit") as HTMLInputElement).value, + screen.getByLabelText("Envelope limit").value, ).toBe("1000"), ); fireEvent.click(screen.getByRole("button", { name: "Close", exact: true })); @@ -2053,7 +2051,7 @@ describe("local receiver to viewer integration", () => { ); await waitFor(() => expect( - (screen.getByLabelText("Envelope limit") as HTMLInputElement).value, + screen.getByLabelText("Envelope limit").value, ).toBe("1000"), ); fireEvent.click( @@ -2237,9 +2235,7 @@ describe("local receiver to viewer integration", () => { }); const clearButton = captureAction("Delete captured events"); - await waitFor(() => - expect((clearButton as HTMLButtonElement).disabled).toBe(false), - ); + await waitFor(() => expect(clearButton.disabled).toBe(false)); fireEvent.click(clearButton); fireEvent.click( screen.getByRole("button", { diff --git a/apps/local/src/App.sessions.integration.test.tsx b/apps/local/src/App.sessions.integration.test.tsx index c4ce523b3f..622b735d56 100644 --- a/apps/local/src/App.sessions.integration.test.tsx +++ b/apps/local/src/App.sessions.integration.test.tsx @@ -419,8 +419,7 @@ test("pasting a plain receiver discovers active sessions and waits for newly sta ); await screen.findByRole("dialog", { name: "Settings", exact: true }); expect( - ((await screen.findByLabelText("Envelope limit")) as HTMLInputElement) - .value, + (await screen.findByLabelText("Envelope limit")).value, ).toBe("500"); expect( screen.getByRole("button", { name: "Apply envelope limit" }), diff --git a/apps/local/src/App.tsx b/apps/local/src/App.tsx index 2fa2d85744..531d91c3fd 100644 --- a/apps/local/src/App.tsx +++ b/apps/local/src/App.tsx @@ -1089,6 +1089,7 @@ export default function App() { {error ? ( -

+ Could not refresh sessions. Your current feed is still available. -

+ ) : null} ); diff --git a/apps/local/src/components/span-detail.tsx b/apps/local/src/components/span-detail.tsx index e5efaf4d5f..faed1f3b8e 100644 --- a/apps/local/src/components/span-detail.tsx +++ b/apps/local/src/components/span-detail.tsx @@ -66,13 +66,9 @@ export function DetailFields({ {copiedField ? ( - + {copiedField} copied - + ) : null} ); diff --git a/apps/local/src/components/trace-waterfall.tsx b/apps/local/src/components/trace-waterfall.tsx index fa82bc26d9..f8a3e36184 100644 --- a/apps/local/src/components/trace-waterfall.tsx +++ b/apps/local/src/components/trace-waterfall.tsx @@ -1,3 +1,4 @@ +/* oxlint-disable jsx-a11y/prefer-tag-over-role -- the span tree is an ARIA table laid out with CSS grid */ import { useMemo, useState } from "react"; import { ChevronDown, ChevronRight } from "lucide-react"; import { @@ -374,13 +375,10 @@ export function TraceWaterfall({ return (
{trace.profileSpansTruncated ? ( -

+ Showing up to 5,000 sampled function spans. Inspect the associated profile for all samples. -

+ ) : null} {compact ? (

{query.trim() ? ( - + {matching.size} matches · branches expanded while searching - + ) : null} ) : null} diff --git a/apps/local/src/components/trace-workspace.tsx b/apps/local/src/components/trace-workspace.tsx index 018ace5429..c902cc6b39 100644 --- a/apps/local/src/components/trace-workspace.tsx +++ b/apps/local/src/components/trace-workspace.tsx @@ -81,11 +81,11 @@ export function TraceWorkspace({ const previous = previousSpan.current; previousSpan.current = undefined; if (previous.traceId === activeTraceId) { - const button = Array.from( - inspector.current?.querySelectorAll( + const button = [ + ...(inspector.current?.querySelectorAll( "[data-span-id]", - ) ?? [], - ).find((entry) => entry.dataset.spanId === previous.spanId); + ) ?? []), + ].find((entry) => entry.dataset.spanId === previous.spanId); button?.focus(); } } diff --git a/apps/local/src/tsconfig.json b/apps/local/src/tsconfig.json new file mode 100644 index 0000000000..da171d155f --- /dev/null +++ b/apps/local/src/tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "../tsconfig.app.json", + "compilerOptions": { + "types": ["vite/client", "node"] + }, + "include": ["."], + "exclude": [] +} diff --git a/apps/local/tsconfig.app.json b/apps/local/tsconfig.app.json index 9611e02d40..4f7f227ea5 100644 --- a/apps/local/tsconfig.app.json +++ b/apps/local/tsconfig.app.json @@ -3,7 +3,7 @@ "compilerOptions": { "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo", "target": "es2023", - "lib": ["ES2023", "DOM"], + "lib": ["ES2023", "DOM", "DOM.Iterable"], "types": ["vite/client"], "allowArbitraryExtensions": true, @@ -19,8 +19,7 @@ /* Linting */ "noUnusedLocals": true, "noUnusedParameters": true, - "erasableSyntaxOnly": true, - "noFallthroughCasesInSwitch": true + "erasableSyntaxOnly": true }, "include": ["src"], "exclude": ["src/**/*.test.ts", "src/**/*.test.tsx"] diff --git a/apps/local/tsconfig.node.json b/apps/local/tsconfig.node.json index a2e3655d00..82b379bd07 100644 --- a/apps/local/tsconfig.node.json +++ b/apps/local/tsconfig.node.json @@ -16,8 +16,7 @@ /* Linting */ "noUnusedLocals": true, "noUnusedParameters": true, - "erasableSyntaxOnly": true, - "noFallthroughCasesInSwitch": true + "erasableSyntaxOnly": true }, "include": ["vite.config.ts", "scripts/**/*.ts"] } diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index a03877f246..7a70bc7782 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -1,17 +1,13 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "strict": true, "lib": ["ESNext"], "target": "ESNext", "allowJs": true, "allowImportingTsExtensions": true, "verbatimModuleSyntax": true, "erasableSyntaxOnly": true, - "noEmit": true, - "noFallthroughCasesInSwitch": true, - "noUncheckedIndexedAccess": true, - "noImplicitOverride": true + "noEmit": true }, "include": ["src/**/*.ts"], "exclude": ["node_modules", "dist"] diff --git a/packages/codemod-cli3to4/tsconfig.json b/packages/codemod-cli3to4/tsconfig.json index 123ee59216..8d91770c8c 100644 --- a/packages/codemod-cli3to4/tsconfig.json +++ b/packages/codemod-cli3to4/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "strict": true, "target": "ESNext", "module": "NodeNext", "moduleResolution": "NodeNext", @@ -10,9 +9,7 @@ "noEmit": true, "verbatimModuleSyntax": true, "erasableSyntaxOnly": true, - "noImplicitReturns": true, - "noFallthroughCasesInSwitch": true, - "noUncheckedIndexedAccess": true + "noImplicitReturns": true }, "exclude": ["tests"] } diff --git a/packages/logger/tsconfig.json b/packages/logger/tsconfig.json index c3f8e5906c..999b11224d 100644 --- a/packages/logger/tsconfig.json +++ b/packages/logger/tsconfig.json @@ -1,10 +1,8 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "strict": true, "lib": ["ES2023"], "types": ["node"], - "noUncheckedIndexedAccess": true, "noEmit": true }, "include": ["src/**/*.ts", "test/*.ts"] diff --git a/packages/mcp-cloudflare/src/client/components/animation/TerminalAnimation.tsx b/packages/mcp-cloudflare/src/client/components/animation/TerminalAnimation.tsx index 48f5c82b97..c8308c7171 100644 --- a/packages/mcp-cloudflare/src/client/components/animation/TerminalAnimation.tsx +++ b/packages/mcp-cloudflare/src/client/components/animation/TerminalAnimation.tsx @@ -44,7 +44,7 @@ function getPulseColorClass(index: number): string { } } -const steps: Step[] = [ +const steps: [Step, ...Step[]] = [ { label: "Copypaste Sentry Issue URL", description: "Copy the Sentry issue url directly from your browser", diff --git a/packages/mcp-cloudflare/src/client/components/ui/slash-command-text.tsx b/packages/mcp-cloudflare/src/client/components/ui/slash-command-text.tsx index 9a4f3c1997..39452adcff 100644 --- a/packages/mcp-cloudflare/src/client/components/ui/slash-command-text.tsx +++ b/packages/mcp-cloudflare/src/client/components/ui/slash-command-text.tsx @@ -25,7 +25,7 @@ export function SlashCommandText({ match = SLASH_COMMAND_REGEX.exec(children); while (match !== null) { const fullMatch = match[0]; // e.g., "/help" - const command = match[1]; // e.g., "help" + const command = match[1]!; // e.g., "help" const startIndex = match.index; // Add text before the command diff --git a/packages/mcp-cloudflare/src/homepage-content.ts b/packages/mcp-cloudflare/src/homepage-content.ts index 09e7d70c00..8f5362c6d0 100644 --- a/packages/mcp-cloudflare/src/homepage-content.ts +++ b/packages/mcp-cloudflare/src/homepage-content.ts @@ -174,7 +174,7 @@ export function generateHomepageFallbackHtml( } else { closeList(); inCodeBlock = true; - codeBlockLang = fence[1].trim(); + codeBlockLang = line.slice(3).trim(); codeLines = []; } continue; diff --git a/packages/mcp-cloudflare/src/server/lib/approval-dialog.ts b/packages/mcp-cloudflare/src/server/lib/approval-dialog.ts index 30a75a76a0..0eb7736b5a 100644 --- a/packages/mcp-cloudflare/src/server/lib/approval-dialog.ts +++ b/packages/mcp-cloudflare/src/server/lib/approval-dialog.ts @@ -122,9 +122,13 @@ async function getSignedCookiePayload( const cookieValue = getCookieValue(cookieHeader, cookieName); if (!cookieValue) return null; - const parts = cookieValue.split("."); + const [signatureHex, base64Payload, ...extraParts] = cookieValue.split("."); - if (parts.length !== 2) { + if ( + signatureHex === undefined || + base64Payload === undefined || + extraParts.length > 0 + ) { logWarn("Invalid signed cookie format", { loggerScope: ["cloudflare", "approval-dialog"], extra: { cookieName }, @@ -132,7 +136,6 @@ async function getSignedCookiePayload( return null; } - const [signatureHex, base64Payload] = parts; let payload: string; try { payload = atob(base64Payload); diff --git a/packages/mcp-cloudflare/src/server/lib/mcp-handler.ts b/packages/mcp-cloudflare/src/server/lib/mcp-handler.ts index 01a93530a2..85bea78449 100644 --- a/packages/mcp-cloudflare/src/server/lib/mcp-handler.ts +++ b/packages/mcp-cloudflare/src/server/lib/mcp-handler.ts @@ -98,7 +98,7 @@ export function getRequestGrantId(request: Request): string | null { if (!auth) return null; const match = auth.match(/^Bearer\s+(.+)$/i); if (!match) return null; - const parts = match[1].split(":"); + const parts = match[1]!.split(":"); if (parts.length !== 3) return null; return parts[1] || null; } diff --git a/packages/mcp-cloudflare/src/server/oauth/resource-scope.ts b/packages/mcp-cloudflare/src/server/oauth/resource-scope.ts index 925f5be669..f47dcf88e0 100644 --- a/packages/mcp-cloudflare/src/server/oauth/resource-scope.ts +++ b/packages/mcp-cloudflare/src/server/oauth/resource-scope.ts @@ -11,27 +11,15 @@ export function parseResourceMcpConstraints( try { const { pathname } = new URL(resource); - const pathSegments = pathname.split("/").filter(Boolean); + const [root, organizationSlug, projectSlug, ...extraSegments] = pathname + .split("/") + .filter(Boolean); - if (pathSegments[0] !== "mcp") { + if (root !== "mcp" || !organizationSlug || extraSegments.length > 0) { return null; } - if (pathSegments.length === 2) { - return { - organizationSlug: pathSegments[1], - projectSlug: null, - }; - } - - if (pathSegments.length === 3) { - return { - organizationSlug: pathSegments[1], - projectSlug: pathSegments[2], - }; - } - - return null; + return { organizationSlug, projectSlug: projectSlug ?? null }; } catch { return null; } diff --git a/packages/mcp-cloudflare/tsconfig.client.json b/packages/mcp-cloudflare/tsconfig.client.json index 5e76fc37f9..b3722fcf81 100644 --- a/packages/mcp-cloudflare/tsconfig.client.json +++ b/packages/mcp-cloudflare/tsconfig.client.json @@ -1,15 +1,12 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "strict": true, "target": "ES2020", "lib": ["ES2020", "DOM", "DOM.Iterable"], "types": ["vite/client"], "jsx": "react-jsx", "useDefineForClassFields": true, "allowJs": true, - "noFallthroughCasesInSwitch": true, - "noUncheckedSideEffectImports": true, "sourceMap": true, "declaration": true, "declarationMap": true, diff --git a/packages/mcp-cloudflare/tsconfig.node.json b/packages/mcp-cloudflare/tsconfig.node.json index 2a1294c664..10f3658dd2 100644 --- a/packages/mcp-cloudflare/tsconfig.node.json +++ b/packages/mcp-cloudflare/tsconfig.node.json @@ -1,11 +1,8 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "strict": true, "lib": ["ES2023", "ES2024.String"], "allowJs": true, - "noFallthroughCasesInSwitch": true, - "noUncheckedSideEffectImports": true, "sourceMap": true, "declaration": true, "declarationMap": true, diff --git a/packages/mcp-core/tsconfig.json b/packages/mcp-core/tsconfig.json index 522f596576..1fa90ef72f 100644 --- a/packages/mcp-core/tsconfig.json +++ b/packages/mcp-core/tsconfig.json @@ -1,11 +1,9 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "strict": true, + "noUncheckedIndexedAccess": false, "lib": ["ES2023", "ES2024.String"], "allowJs": true, - "noFallthroughCasesInSwitch": true, - "noUncheckedSideEffectImports": true, "sourceMap": true, "declaration": true, "declarationMap": true, diff --git a/packages/mcp-server-evals/tsconfig.json b/packages/mcp-server-evals/tsconfig.json index 522f596576..4061fbae45 100644 --- a/packages/mcp-server-evals/tsconfig.json +++ b/packages/mcp-server-evals/tsconfig.json @@ -1,11 +1,8 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "strict": true, "lib": ["ES2023", "ES2024.String"], "allowJs": true, - "noFallthroughCasesInSwitch": true, - "noUncheckedSideEffectImports": true, "sourceMap": true, "declaration": true, "declarationMap": true, diff --git a/packages/mcp-server-mocks/tsconfig.json b/packages/mcp-server-mocks/tsconfig.json index 522f596576..4061fbae45 100644 --- a/packages/mcp-server-mocks/tsconfig.json +++ b/packages/mcp-server-mocks/tsconfig.json @@ -1,11 +1,8 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "strict": true, "lib": ["ES2023", "ES2024.String"], "allowJs": true, - "noFallthroughCasesInSwitch": true, - "noUncheckedSideEffectImports": true, "sourceMap": true, "declaration": true, "declarationMap": true, diff --git a/packages/mcp-test-client/src/agent.ts b/packages/mcp-test-client/src/agent.ts index 381a5b28ba..95be419954 100644 --- a/packages/mcp-test-client/src/agent.ts +++ b/packages/mcp-test-client/src/agent.ts @@ -175,8 +175,7 @@ export async function runAgent( } // Show tool calls with their results - for (let i = 0; i < toolCalls.length; i++) { - const toolCall = toolCalls[i]; + for (const [i, toolCall] of toolCalls.entries()) { const toolResult = toolResults?.[i]; logTool(toolCall.toolName, toolCall.input); diff --git a/packages/mcp-test-client/tsconfig.json b/packages/mcp-test-client/tsconfig.json index 9f08251975..efb3d30c1c 100644 --- a/packages/mcp-test-client/tsconfig.json +++ b/packages/mcp-test-client/tsconfig.json @@ -1,11 +1,8 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "strict": true, "lib": ["ES2023", "ES2024.String"], "allowJs": true, - "noFallthroughCasesInSwitch": true, - "noUncheckedSideEffectImports": true, "sourceMap": true, "declaration": true, "declarationMap": true, diff --git a/packages/toolkit-core/tsconfig.json b/packages/toolkit-core/tsconfig.json index 7495e3bd8d..0d7100cbc2 100644 --- a/packages/toolkit-core/tsconfig.json +++ b/packages/toolkit-core/tsconfig.json @@ -1,8 +1,6 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "strict": true, - "noUncheckedIndexedAccess": true, "noEmit": true }, "include": ["src/**/*.ts"] diff --git a/tsconfig.base.json b/tsconfig.base.json index bf775b69a8..fd393380f7 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -9,6 +9,11 @@ "esModuleInterop": true, "resolveJsonModule": true, "skipLibCheck": true, - "forceConsistentCasingInFileNames": true + "forceConsistentCasingInFileNames": true, + "strict": true, + "noFallthroughCasesInSwitch": true, + "noImplicitOverride": true, + "noUncheckedIndexedAccess": true, + "noUncheckedSideEffectImports": true } } From 727c72c20fab7ef02e7676984ccbde308b951da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josh=20Goldberg=20=E2=9C=A8?= Date: Fri, 13 Nov 2026 10:10:59 -0500 Subject: [PATCH 05/18] ref(tsconfig): Apply the same strictness to mcp-core Co-Authored-By: Claude Opus 5.5 --- .../src/api-client/client-event.test.ts | 2 +- .../mcp-core/src/api-client/client.test.ts | 24 ++++---- packages/mcp-core/src/api-client/client.ts | 16 ++--- .../mcp-core/src/api-client/schema.test.ts | 2 +- .../src/internal/agents/callEmbeddedAgent.ts | 2 +- .../agents/tools/dataset-fields.test.ts | 24 ++++---- packages/mcp-core/src/internal/formatting.ts | 10 ++-- .../tool-helpers/credential-routing.ts | 2 +- .../tool-helpers/default-organization.test.ts | 8 +-- .../src/internal/tool-helpers/seer.ts | 4 +- packages/mcp-core/src/internal/url-helpers.ts | 19 ++++-- packages/mcp-core/src/server.metadata.test.ts | 2 +- packages/mcp-core/src/server.test.ts | 30 +++++----- packages/mcp-core/src/telem/logging.test.ts | 4 +- packages/mcp-core/src/telem/sentry.test.ts | 6 +- .../catalog/create-metric-monitor.test.ts | 2 +- .../src/tools/catalog/create-project.ts | 2 +- .../tools/catalog/find-alert-rules.test.ts | 6 +- .../src/tools/catalog/find-dashboards.test.ts | 10 ++-- .../src/tools/catalog/find-dropped-events.ts | 2 +- .../get-agent-conversation-details.test.ts | 12 ++-- .../catalog/get-agent-conversation-details.ts | 2 +- .../src/tools/catalog/get-alert-rule.test.ts | 2 +- .../src/tools/catalog/get-alert-rule.ts | 2 +- .../catalog/get-dashboard-details.test.ts | 8 +-- .../tools/catalog/get-issue-activity.test.ts | 18 +++--- .../catalog/get-issue-breadcrumbs.test.ts | 8 +-- .../tools/catalog/get-snapshot-image.test.ts | 50 ++++++++-------- .../src/tools/catalog/get-trace-details.ts | 14 ++--- .../search-agent-conversations.test.ts | 12 ++-- .../tools/catalog/search-issue-events.test.ts | 4 +- .../catalog/search-replays.structured.test.ts | 16 ++--- .../src/tools/catalog/support/alerts.ts | 4 +- .../tools/catalog/support/uptime-monitors.ts | 2 +- .../tools/catalog/update-alert-rule.test.ts | 22 +++---- .../src/tools/catalog/update-alert-rule.ts | 2 +- .../catalog/update-metric-monitor.test.ts | 2 +- packages/mcp-core/src/tools/catalog/whoami.ts | 2 +- .../src/tools/support/dashboards/index.ts | 2 +- .../src/tools/support/event-stacktrace.ts | 4 +- .../src/tools/support/issue-linking/app.ts | 8 +-- .../src/tools/support/issue-linking/index.ts | 4 +- .../tools/support/metric-monitor-config.ts | 2 +- .../tools/support/profile/analyzer.test.ts | 58 +++++++++---------- .../src/tools/support/profile/analyzer.ts | 5 +- .../tools/support/profile/details-output.ts | 2 +- .../support/profile/flamegraph-output.test.ts | 24 ++++---- .../tools/support/search-events/formatters.ts | 4 +- .../src/tools/support/search-events/search.ts | 8 +-- .../tools/support/search-events/utils.test.ts | 6 +- .../src/tools/support/search-events/utils.ts | 4 +- .../support/search-issue-events/utils.ts | 4 +- .../tools/support/traces/semantic-display.ts | 8 +-- .../mcp-core/src/transports/stdio.test.ts | 2 +- packages/mcp-core/src/utils/url-utils.ts | 14 ++--- packages/mcp-core/tsconfig.json | 1 - 56 files changed, 260 insertions(+), 259 deletions(-) diff --git a/packages/mcp-core/src/api-client/client-event.test.ts b/packages/mcp-core/src/api-client/client-event.test.ts index 5e30187c48..50f233410c 100644 --- a/packages/mcp-core/src/api-client/client-event.test.ts +++ b/packages/mcp-core/src/api-client/client-event.test.ts @@ -56,7 +56,7 @@ describe("getEventForIssue context validation", () => { ); expect(log).toHaveBeenCalledTimes(1); - const output = String(log.mock.calls[0][0]); + const output = String(log.mock.calls[0]![0]); const record = JSON.parse(output); expect(record.message).toBe("Event failed schema validation: error"); expect(record.properties.contextType).toBe(contextType); diff --git a/packages/mcp-core/src/api-client/client.test.ts b/packages/mcp-core/src/api-client/client.test.ts index 797516c5a7..eecad617e4 100644 --- a/packages/mcp-core/src/api-client/client.test.ts +++ b/packages/mcp-core/src/api-client/client.test.ts @@ -1973,7 +1973,7 @@ describe("request headers", () => { }).getAuthenticatedUser(); const [, requestInit] = (globalThis.fetch as ReturnType).mock - .calls[0]; + .calls[0]!; expect(new Headers(requestInit.headers).get("User-Agent")).toBe( "sentry-mcp/0.48.0-test (https://mcp.sentry.dev)", ); @@ -2006,7 +2006,7 @@ describe("request headers", () => { await apiService.getAuthenticatedUser(); const [, requestInit] = (globalThis.fetch as ReturnType).mock - .calls[0]; + .calls[0]!; expect(new Headers(requestInit.headers).get("X-Sentry-MCP-Client-Id")).toBe( "abc123", ); @@ -2044,7 +2044,7 @@ describe("request headers", () => { await apiService.getAuthenticatedUser(); const [, requestInit] = (globalThis.fetch as ReturnType).mock - .calls[0]; + .calls[0]!; expect( new Headers(requestInit.headers).get("X-Sentry-MCP-Client-Id"), ).toBeNull(); @@ -2947,7 +2947,7 @@ describe("API query builders", () => { }, ]); expect(urls).toHaveLength(1); - const params = new URL(urls[0]).searchParams; + const params = new URL(urls[0]!).searchParams; expect(params.get("itemType")).toBe("spans"); expect(params.get("project")).toBe("123"); expect(params.get("statsPeriod")).toBe("7d"); @@ -2985,7 +2985,7 @@ describe("API query builders", () => { }); expect(urls).toHaveLength(1); - const params = new URL(urls[0]).searchParams; + const params = new URL(urls[0]!).searchParams; expect(params.get("itemType")).toBe("spans"); expect(params.get("expand")).toBe("context"); }); @@ -3426,7 +3426,7 @@ describe("API query builders", () => { expect.any(Object), ); expect(repos).toHaveLength(1); - expect(repos[0].name).toBe("getsentry/sentry"); + expect(repos[0]?.name).toBe("getsentry/sentry"); }); it("should paginate repos", async () => { @@ -3476,8 +3476,8 @@ describe("API query builders", () => { "getsentry/sentry-javascript", ]); expect(fetchMock).toHaveBeenCalledTimes(2); - expect(fetchMock.mock.calls[0][0]).toContain("per_page=100"); - expect(fetchMock.mock.calls[1][0]).toContain("cursor=cursor-2"); + expect(fetchMock.mock.calls[0]?.[0]).toContain("per_page=100"); + expect(fetchMock.mock.calls[1]?.[0]).toContain("cursor=cursor-2"); }); it("should include query parameter when provided", async () => { @@ -3554,8 +3554,8 @@ describe("API query builders", () => { }); expect(repos).toHaveLength(1); - expect(repos[0].externalSlug).toBeNull(); - expect(repos[0].externalId).toBeNull(); + expect(repos[0]!.externalSlug).toBeNull(); + expect(repos[0]!.externalId).toBeNull(); }); }); @@ -3621,7 +3621,7 @@ describe("API query builders", () => { }), ); expect(result.created).toBe(1); - expect(result.mappings[0].status).toBe("created"); + expect(result.mappings[0]?.status).toBe("created"); }); it("should handle updated mappings response", async () => { @@ -3654,7 +3654,7 @@ describe("API query builders", () => { }); expect(result.updated).toBe(1); - expect(result.mappings[0].status).toBe("updated"); + expect(result.mappings[0]?.status).toBe("updated"); }); }); diff --git a/packages/mcp-core/src/api-client/client.ts b/packages/mcp-core/src/api-client/client.ts index 7b3b41779d..56a4d1077d 100644 --- a/packages/mcp-core/src/api-client/client.ts +++ b/packages/mcp-core/src/api-client/client.ts @@ -1104,8 +1104,9 @@ export class SentryApiService { if (isAggregate) { urlParams.set("mode", "aggregate"); // For aggregate queries in Discover, set yAxis to the first aggregate function - if (aggregateFunctions && aggregateFunctions.length > 0) { - urlParams.set("yAxis", aggregateFunctions[0]); + const firstAggregate = aggregateFunctions?.[0]; + if (firstAggregate !== undefined) { + urlParams.set("yAxis", firstAggregate); } } else { urlParams.set("yAxis", "count()"); @@ -3663,7 +3664,7 @@ export class SentryApiService { uri: string; query?: string; projectId?: string; - dependentData?: Record; + dependentData?: Record; }, opts?: RequestOptions, ): Promise { @@ -4133,7 +4134,7 @@ export class SentryApiService { // the two share the same DB source but the download header reflects any // server-side correction (getsentry/sentry#115977) applied at request time. const contentType = - downloadResponse.headers.get("content-type")?.split(";")[0].trim() || + downloadResponse.headers.get("content-type")?.split(";")[0]?.trim() || attachment.mimetype || "application/octet-stream"; @@ -5203,7 +5204,8 @@ export class SentryApiService { ProfileChunkResponseSchema, ); // Normalize the Sentry {chunk: ...} wrapper to the internal chunks array. - if (response.chunks.length === 0) { + const [chunk] = response.chunks; + if (chunk === undefined) { throw new ApiNotFoundError( `No profile chunk found for profiler_id ${params.profilerId}`, undefined, @@ -5212,10 +5214,10 @@ export class SentryApiService { } return { - ...response.chunks[0], + ...chunk, // Sentry's frontend does the same query-param backfill for continuous // profile chunks because profiling-service may omit profiler_id. - profiler_id: response.chunks[0].profiler_id ?? params.profilerId, + profiler_id: chunk.profiler_id ?? params.profilerId, }; } diff --git a/packages/mcp-core/src/api-client/schema.test.ts b/packages/mcp-core/src/api-client/schema.test.ts index d0b459d97b..b95b7d6223 100644 --- a/packages/mcp-core/src/api-client/schema.test.ts +++ b/packages/mcp-core/src/api-client/schema.test.ts @@ -711,7 +711,7 @@ describe("AutofixRunStateSchema", () => { expect(state.autofix?.status).toBe("processing"); expect(state.autofix?.blocks).toHaveLength(1); - expect(state.autofix?.blocks[0].todos).toEqual([ + expect(state.autofix?.blocks[0]?.todos).toEqual([ { content: "Investigate failing request", status: "completed" }, { content: "Draft fix plan", status: "in_progress" }, ]); diff --git a/packages/mcp-core/src/internal/agents/callEmbeddedAgent.ts b/packages/mcp-core/src/internal/agents/callEmbeddedAgent.ts index fd5226ee5f..c8409283fc 100644 --- a/packages/mcp-core/src/internal/agents/callEmbeddedAgent.ts +++ b/packages/mcp-core/src/internal/agents/callEmbeddedAgent.ts @@ -380,7 +380,7 @@ function extractJsonCandidates(text: string): string[] { const codeBlockRegex = /```(?:json)?\s*\n?([\s\S]*?)\n?```/g; const allMatches = [...text.matchAll(codeBlockRegex)]; for (const match of allMatches) { - candidates.add(match[1].trim()); + candidates.add(match[1]!.trim()); } // Strategy 2: Find balanced JSON objects anywhere in the text. diff --git a/packages/mcp-core/src/internal/agents/tools/dataset-fields.test.ts b/packages/mcp-core/src/internal/agents/tools/dataset-fields.test.ts index b60ad3cac4..dd6aaf13a5 100644 --- a/packages/mcp-core/src/internal/agents/tools/dataset-fields.test.ts +++ b/packages/mcp-core/src/internal/agents/tools/dataset-fields.test.ts @@ -72,10 +72,10 @@ describe("dataset-fields agent tool", () => { expect(result.dataset).toBe("search_issues"); expect(result.fields).toHaveLength(2); // sentry:user should be filtered out - expect(result.fields[0].key).toBe("level"); - expect(result.fields[0].name).toBe("Level"); - expect(result.fields[0].totalValues).toBe(5); - expect(result.fields[1].key).toBe("is"); + expect(result.fields[0]?.key).toBe("level"); + expect(result.fields[0]?.name).toBe("Level"); + expect(result.fields[0]?.totalValues).toBe(5); + expect(result.fields[1]?.key).toBe("is"); expect(result.commonPatterns).toContainEqual({ pattern: "is:unresolved", description: "Open issues", @@ -116,15 +116,15 @@ describe("dataset-fields agent tool", () => { expect(result.dataset).toBe("events"); expect(result.fields).toHaveLength(2); - expect(result.fields[0].key).toBe("http.method"); - expect(result.fields[0].examples).toEqual([ + expect(result.fields[0]?.key).toBe("http.method"); + expect(result.fields[0]?.examples).toEqual([ "GET", "POST", "PUT", "DELETE", ]); - expect(result.fields[1].key).toBe("environment"); - expect(result.fields[1].examples).toEqual([ + expect(result.fields[1]?.key).toBe("environment"); + expect(result.fields[1]?.examples).toEqual([ "production", "staging", "development", @@ -270,12 +270,12 @@ describe("dataset-fields agent tool", () => { "search_issues", ); - expect(issuesResult.fields[0].examples).toEqual([ + expect(issuesResult.fields[0]?.examples).toEqual([ "email@example.com", "team-slug", "me", ]); - expect(issuesResult.fields[1].examples).toEqual([ + expect(issuesResult.fields[1]?.examples).toEqual([ "unresolved", "resolved", "ignored", @@ -304,13 +304,13 @@ describe("dataset-fields agent tool", () => { "events", ); - expect(eventsResult.fields[0].examples).toEqual([ + expect(eventsResult.fields[0]?.examples).toEqual([ "GET", "POST", "PUT", "DELETE", ]); - expect(eventsResult.fields[1].examples).toEqual([ + expect(eventsResult.fields[1]?.examples).toEqual([ "postgresql", "mysql", "redis", diff --git a/packages/mcp-core/src/internal/formatting.ts b/packages/mcp-core/src/internal/formatting.ts index 7b8b2bd08a..5b0a2d0786 100644 --- a/packages/mcp-core/src/internal/formatting.ts +++ b/packages/mcp-core/src/internal/formatting.ts @@ -1229,16 +1229,14 @@ function renderPerformanceSpanTree(spans: PerformanceSpan[]): string[] { lines.push(line); // Render children - for (let i = 0; i < span.children.length; i++) { - const child = span.children[i]; + for (const [i, child] of span.children.entries()) { const isLastChild = i === span.children.length - 1; const childPrefix = prefix + (isLast ? " " : "│ "); renderSpan(child, childPrefix, isLastChild); } } - for (let i = 0; i < spans.length; i++) { - const span = spans[i]; + for (const [i, span] of spans.entries()) { const isLastRoot = i === spans.length - 1; renderSpan(span, "", isLastRoot); } @@ -1421,7 +1419,7 @@ function formatN1QueryEvidence( // Show the query pattern - if single line, render as SQL block; if multiple, as list if (repeatingLines.length === 1) { - parts.push(codeBlock(repeatingLines[0], "sql")); + parts.push(codeBlock(repeatingLines[0]!, "sql")); parts.push(""); } else { parts.push("**Repeated operations:**"); @@ -2711,7 +2709,7 @@ function buildAIConversationResponseNotes({ }); if (aiConversations.length === 1) { - const [conversation] = aiConversations; + const conversation = aiConversations[0]!; const spanSuffix = conversation.spanId ? ` Matching span: \`${conversation.spanId}\`.` : ""; diff --git a/packages/mcp-core/src/internal/tool-helpers/credential-routing.ts b/packages/mcp-core/src/internal/tool-helpers/credential-routing.ts index ac014d9646..5a5e4727de 100644 --- a/packages/mcp-core/src/internal/tool-helpers/credential-routing.ts +++ b/packages/mcp-core/src/internal/tool-helpers/credential-routing.ts @@ -201,7 +201,7 @@ export async function mapCredentialContexts( const results: Array<{ entry: CredentialContext; value: T }> = []; let firstError: unknown; for (const [index, result] of settled.entries()) { - const entry = entries[index]; + const entry = entries[index]!; if (result.status === "fulfilled") { results.push({ entry, value: result.value }); continue; diff --git a/packages/mcp-core/src/internal/tool-helpers/default-organization.test.ts b/packages/mcp-core/src/internal/tool-helpers/default-organization.test.ts index 7d8d11eccc..a8a995bbc5 100644 --- a/packages/mcp-core/src/internal/tool-helpers/default-organization.test.ts +++ b/packages/mcp-core/src/internal/tool-helpers/default-organization.test.ts @@ -88,8 +88,8 @@ describe("applyDefaultOrganization", () => { requiredOrgTool, getServerContext(), ); - expect(unscoped.organizationSlug.safeParse(undefined).success).toBe(true); - expect(unscoped.organizationSlug.safeParse("").success).toBe(false); + expect(unscoped.organizationSlug?.safeParse(undefined).success).toBe(true); + expect(unscoped.organizationSlug?.safeParse("").success).toBe(false); const scoped = getFilteredInputSchema( requiredOrgTool, @@ -282,7 +282,7 @@ describe("applyDefaultOrganization", () => { const context = getServerContext({ sentryHost: "sentry.io", credentialRouter: { - resolve: async () => credentials[0], + resolve: async () => credentials[0]!, list: async () => credentials, }, }); @@ -317,7 +317,7 @@ describe("applyDefaultOrganization", () => { { id: "personal", accessToken: "personal-token" }, ]; const credentialRouter: CredentialRouter = { - resolve: async () => credentials[0], + resolve: async () => credentials[0]!, list: async () => credentials, }; const context = getServerContext({ diff --git a/packages/mcp-core/src/internal/tool-helpers/seer.ts b/packages/mcp-core/src/internal/tool-helpers/seer.ts index 8cccac0596..74628f61fb 100644 --- a/packages/mcp-core/src/internal/tool-helpers/seer.ts +++ b/packages/mcp-core/src/internal/tool-helpers/seer.ts @@ -391,8 +391,8 @@ export function getAutofixArtifactSummaries(autofix: AutofixRun): { * a run is processing. */ export function getActiveAutofixTodo(autofix: AutofixRun): string | null { - for (let i = autofix.blocks.length - 1; i >= 0; i--) { - const todos = autofix.blocks[i].todos; + for (const block of autofix.blocks.toReversed()) { + const todos = block.todos; if (!todos?.length) { continue; } diff --git a/packages/mcp-core/src/internal/url-helpers.ts b/packages/mcp-core/src/internal/url-helpers.ts index c95f4249ef..6b5a647253 100644 --- a/packages/mcp-core/src/internal/url-helpers.ts +++ b/packages/mcp-core/src/internal/url-helpers.ts @@ -174,12 +174,14 @@ function extractOrganizationSlug(parsedUrl: URL, pathParts: string[]): string { "insights", "preprod", ]; + const [firstPathPart, secondPathPart] = pathParts; if ( - pathParts.length > 1 && - !knownSegments.includes(pathParts[0]) && - knownSegments.includes(pathParts[1]) + firstPathPart !== undefined && + secondPathPart !== undefined && + !knownSegments.includes(firstPathPart) && + knownSegments.includes(secondPathPart) ) { - return pathParts[0]; + return firstPathPart; } // Check for subdomain (e.g., my-org.sentry.io) @@ -188,8 +190,13 @@ function extractOrganizationSlug(parsedUrl: URL, pathParts: string[]): string { const regionPrefixes = ["us", "eu", "de", "www"]; // Non-region subdomain (e.g., my-org.sentry.io or sentry.mycompany.com) - if (hostParts.length >= 2 && !regionPrefixes.includes(hostParts[0])) { - return hostParts[0]; + const [subdomain] = hostParts; + if ( + subdomain !== undefined && + hostParts.length >= 2 && + !regionPrefixes.includes(subdomain) + ) { + return subdomain; } // If we reach here with region-prefixed URL, we couldn't determine the org diff --git a/packages/mcp-core/src/server.metadata.test.ts b/packages/mcp-core/src/server.metadata.test.ts index d2696db3dc..626fedc71b 100644 --- a/packages/mcp-core/src/server.metadata.test.ts +++ b/packages/mcp-core/src/server.metadata.test.ts @@ -234,7 +234,7 @@ describe("outputSchema skip lists", () => { ...Object.keys(OUTPUT_SCHEMA_EXEMPT).map((name) => ["EXEMPT", name]), ...Object.keys(OUTPUT_SCHEMA_PENDING).map((name) => ["PENDING", name]), ].flatMap(([list, name]) => { - const tools = listings(name); + const tools = listings(name!); if (tools.length === 0) { return [`${name}: in OUTPUT_SCHEMA_${list} but not listed`]; } diff --git a/packages/mcp-core/src/server.test.ts b/packages/mcp-core/src/server.test.ts index 569c41b2bf..d252f71925 100644 --- a/packages/mcp-core/src/server.test.ts +++ b/packages/mcp-core/src/server.test.ts @@ -650,7 +650,7 @@ describe("buildServer", () => { await callRegisteredTool(server, "boom_tool", {}); expect(onError).toHaveBeenCalledTimes(1); - expect(onError.mock.calls[0][0]).toBeInstanceOf(UserInputError); + expect(onError.mock.calls[0]?.[0]).toBeInstanceOf(UserInputError); }); it("invokes onError when a tool fails via execute_sentry_tool", async () => { @@ -672,7 +672,7 @@ describe("buildServer", () => { }); expect(onError).toHaveBeenCalledTimes(1); - expect(onError.mock.calls[0][0]).toBeInstanceOf(UserInputError); + expect(onError.mock.calls[0]?.[0]).toBeInstanceOf(UserInputError); }); }); @@ -701,7 +701,7 @@ describe("buildServer", () => { expect(registeredTools.v2_tool).toBeDefined(); await expect( - registeredTools.v2_tool.handler({ value: "ok" }), + registeredTools.v2_tool?.handler({ value: "ok" }), ).resolves.toMatchObject({ content: [{ type: "text", text: "v2:ok" }], }); @@ -955,7 +955,7 @@ describe("buildServer", () => { } )._registeredTools; - await registeredTools.example_tool.handler({}, {}); + await registeredTools.example_tool!.handler({}, {}); expect(setUser).toHaveBeenCalledWith({ id: "user-123", @@ -978,7 +978,7 @@ describe("buildServer", () => { it("advertises the schema to experimental sessions", async () => { const [tool] = await listRegisteredTools(createServer(true)); - expect(tool.outputSchema).toMatchObject({ + expect(tool?.outputSchema).toMatchObject({ type: "object", properties: { status: { type: "string" } }, }); @@ -986,7 +986,7 @@ describe("buildServer", () => { it("keeps it from stable sessions, which still get markdown", async () => { const [tool] = await listRegisteredTools(createServer(false)); - expect(tool.outputSchema).toBeUndefined(); + expect(tool!.outputSchema).toBeUndefined(); }); }); @@ -1319,12 +1319,12 @@ describe("buildServer", () => { }), ); expect( - dynamicDescription.mock.calls[0][0].availableToolNames?.has( + dynamicDescription.mock.calls[0]?.[0].availableToolNames?.has( "dynamic_tool", ), ).toBe(true); expect( - dynamicDescription.mock.calls[0][0].directToolNames?.has( + dynamicDescription.mock.calls[0]?.[0].directToolNames?.has( "dynamic_tool", ), ).toBe(true); @@ -1748,8 +1748,8 @@ describe("buildServer", () => { ); expect(getTextContent(result)).not.toContain("# Tool Search Results"); expect(getTextContent(result)).not.toContain("```json"); - expect(firstResult.name).toBe("get_replay_details"); - expect(Object.keys(firstResult).sort()).toEqual([ + expect(firstResult?.name).toBe("get_replay_details"); + expect(Object.keys(firstResult!).sort()).toEqual([ "annotations", "description", "inputSchema", @@ -1758,7 +1758,7 @@ describe("buildServer", () => { expect(firstResult).not.toHaveProperty("requiredSkills"); expect(firstResult).not.toHaveProperty("requiredScopes"); expect(firstResult).not.toHaveProperty("skills"); - expect(firstResult.inputSchema.properties).not.toHaveProperty( + expect(firstResult!.inputSchema.properties).not.toHaveProperty( "organizationSlug", ); }); @@ -3274,9 +3274,9 @@ describe("buildServer", () => { expect.any(Function), ); const span = startedSpans[0]; - expect(span.setStatus).toHaveBeenCalledWith({ code: 2 }); + expect(span?.setStatus).toHaveBeenCalledWith({ code: 2 }); // Expected validation failures mark the span failed without recording an exception. - expect(span.recordException).not.toHaveBeenCalled(); + expect(span!.recordException).not.toHaveBeenCalled(); }); it("execute_sentry_tool injects constrained arguments for catalog-only tools", async () => { @@ -3360,9 +3360,9 @@ describe("buildServer", () => { }>(result); const replayTool = payload.results[0]; - expect(replayTool.name).toBe("get_replay_details"); + expect(replayTool?.name).toBe("get_replay_details"); expect( - Object.keys(replayTool.inputSchema.properties ?? {}).sort(), + Object.keys(replayTool?.inputSchema.properties ?? {}).sort(), ).toEqual([ "categories", "endOffsetSeconds", diff --git a/packages/mcp-core/src/telem/logging.test.ts b/packages/mcp-core/src/telem/logging.test.ts index 1a5362e24b..ca2a3b2343 100644 --- a/packages/mcp-core/src/telem/logging.test.ts +++ b/packages/mcp-core/src/telem/logging.test.ts @@ -23,7 +23,7 @@ describe("logging", () => { expect(info).not.toHaveBeenCalled(); expect(error).toHaveBeenCalledTimes(1); - const [payload] = error.mock.calls[0]; + const [payload] = error.mock.calls[0]!; expect(typeof payload).toBe("string"); expect(JSON.parse(payload as string)).toMatchObject({ level: "INFO", @@ -54,7 +54,7 @@ describe("logging", () => { }); expect(error).toHaveBeenCalledTimes(1); - const [payload] = error.mock.calls[0]; + const [payload] = error.mock.calls[0]!; expect(JSON.parse(payload as string)).toMatchObject({ level: "ERROR", message: "issue failed", diff --git a/packages/mcp-core/src/telem/sentry.test.ts b/packages/mcp-core/src/telem/sentry.test.ts index 8d5e636c19..7463163323 100644 --- a/packages/mcp-core/src/telem/sentry.test.ts +++ b/packages/mcp-core/src/telem/sentry.test.ts @@ -100,10 +100,10 @@ describe("sentry", () => { }; const result = sentryBeforeSend(event, {}) as SentryEvent; - expect(result.breadcrumbs?.[0].message).toBe( + expect(result.breadcrumbs?.[0]?.message).toBe( "API call with [REDACTED_OPENAI_KEY]", ); - expect(result.breadcrumbs?.[0].data?.tokens).toEqual([ + expect(result.breadcrumbs?.[0]?.data?.tokens).toEqual([ "[REDACTED_SENTRY_TOKEN]", "[REDACTED_SENTRY_TOKEN]", ]); @@ -126,7 +126,7 @@ describe("sentry", () => { }; const result = sentryBeforeSend(event, {}) as SentryEvent; - expect(result.exception?.values?.[0].value).toBe( + expect(result.exception?.values?.[0]?.value).toBe( "Failed to authenticate with [REDACTED_OPENAI_KEY]", ); }); diff --git a/packages/mcp-core/src/tools/catalog/create-metric-monitor.test.ts b/packages/mcp-core/src/tools/catalog/create-metric-monitor.test.ts index 1db869629a..48ab9bb936 100644 --- a/packages/mcp-core/src/tools/catalog/create-metric-monitor.test.ts +++ b/packages/mcp-core/src/tools/catalog/create-metric-monitor.test.ts @@ -58,7 +58,7 @@ function create(changes: Record = {}) { function savedMonitor(body: MetricMonitorCreate) { const source = structuredClone(metricMonitor.dataSources[0]); - Object.assign(source.queryObj.snubaQuery, body.dataSources[0]); + Object.assign(source!.queryObj.snubaQuery, body.dataSources[0]); return { ...metricMonitor, ...body, diff --git a/packages/mcp-core/src/tools/catalog/create-project.ts b/packages/mcp-core/src/tools/catalog/create-project.ts index f0c83862de..e9cd4b0fb5 100644 --- a/packages/mcp-core/src/tools/catalog/create-project.ts +++ b/packages/mcp-core/src/tools/catalog/create-project.ts @@ -86,7 +86,7 @@ function findRepositoryMatch( ); } - return matches[0]; + return matches[0]!; } function getRepositoryProvider(repository: RepositoryMatch): string | null { diff --git a/packages/mcp-core/src/tools/catalog/find-alert-rules.test.ts b/packages/mcp-core/src/tools/catalog/find-alert-rules.test.ts index db65ae7c50..a81d49b687 100644 --- a/packages/mcp-core/src/tools/catalog/find-alert-rules.test.ts +++ b/packages/mcp-core/src/tools/catalog/find-alert-rules.test.ts @@ -103,7 +103,7 @@ describe("find_alert_rules", () => { expect(issueParams.get("projectSlug")).toBe("cloudflare-mcp"); expect(issueParams.get("query")).toBe('name:"*backend*"'); expect(metricRequestUrls).toHaveLength(1); - const metricParams = new URL(metricRequestUrls[0]).searchParams; + const metricParams = new URL(metricRequestUrls[0]!).searchParams; expect(metricParams.get("project")).toBe(project.id); expect(metricParams.get("query")).toBe('name:"*backend*"'); expect(metricParams.getAll("type")).toEqual(["metric_issue"]); @@ -235,8 +235,8 @@ describe("find_alert_rules", () => { ); expect(requests).toHaveLength(1); - expect(requests[0].searchParams.get("projectSlug")).toBeNull(); - expect(requests[0].searchParams.get("cursor")).toBe("workflow-page-1"); + expect(requests[0]!.searchParams.get("projectSlug")).toBeNull(); + expect(requests[0]?.searchParams.get("cursor")).toBe("workflow-page-1"); expect(getStructuredContent(result)).toMatchObject({ issueRules: [{ id: "123" }], pagination: { issue: { nextCursor: "workflow-page-2" }, metric: null }, diff --git a/packages/mcp-core/src/tools/catalog/find-dashboards.test.ts b/packages/mcp-core/src/tools/catalog/find-dashboards.test.ts index 782ed48dde..8419876c61 100644 --- a/packages/mcp-core/src/tools/catalog/find-dashboards.test.ts +++ b/packages/mcp-core/src/tools/catalog/find-dashboards.test.ts @@ -245,9 +245,9 @@ describe("find_dashboards", () => { ); expect(requestUrls).toHaveLength(2); - expect(new URL(requestUrls[0]).searchParams.get("per_page")).toBe("2"); - expect(new URL(requestUrls[1]).searchParams.get("cursor")).toBe("2:1:0"); - expect(new URL(requestUrls[1]).searchParams.get("per_page")).toBe("2"); + expect(new URL(requestUrls[0]!).searchParams.get("per_page")).toBe("2"); + expect(new URL(requestUrls[1]!).searchParams.get("cursor")).toBe("2:1:0"); + expect(new URL(requestUrls[1]!).searchParams.get("per_page")).toBe("2"); assertStructuredOnlyResult(result); const structuredContent = findDashboardsOutputSchema.parse( getStructuredContent(result), @@ -316,8 +316,8 @@ describe("find_dashboards", () => { const secondResult = await search(first.nextCursor, 1); - expect(new URL(requestUrls[2]).searchParams.get("cursor")).toBe("2:1:0"); - expect(new URL(requestUrls[2]).searchParams.get("per_page")).toBe("2"); + expect(new URL(requestUrls[2]!).searchParams.get("cursor")).toBe("2:1:0"); + expect(new URL(requestUrls[2]!).searchParams.get("per_page")).toBe("2"); assertStructuredOnlyResult(secondResult); expect(getStructuredContent(secondResult)).toMatchObject({ dashboards: [{ id: "304", title: "Cloudflare Throughput" }], diff --git a/packages/mcp-core/src/tools/catalog/find-dropped-events.ts b/packages/mcp-core/src/tools/catalog/find-dropped-events.ts index 5b16149ea9..8cf8ff524d 100644 --- a/packages/mcp-core/src/tools/catalog/find-dropped-events.ts +++ b/packages/mcp-core/src/tools/catalog/find-dropped-events.ts @@ -39,7 +39,7 @@ function isSupportedInterval(value: string): boolean { if (!match) { return false; } - const seconds = Number(match[1]) * INTERVAL_UNIT_SECONDS[match[2]]; + const seconds = Number(match[1]) * INTERVAL_UNIT_SECONDS[match[2]!]!; return seconds > 0 && seconds % 60 === 0 && ONE_DAY_SECONDS % seconds === 0; } diff --git a/packages/mcp-core/src/tools/catalog/get-agent-conversation-details.test.ts b/packages/mcp-core/src/tools/catalog/get-agent-conversation-details.test.ts index 33f8d77855..67ef1dc2ce 100644 --- a/packages/mcp-core/src/tools/catalog/get-agent-conversation-details.test.ts +++ b/packages/mcp-core/src/tools/catalog/get-agent-conversation-details.test.ts @@ -152,7 +152,7 @@ describe("get_agent_conversation_details", () => { expect(structuredContent).not.toHaveProperty("messages"); expect(structuredContent).not.toHaveProperty("spanIds"); expect(structuredContent.title).toBe("Checkout worker timeouts"); - expect(structuredContent.timeline[0].genAi).toMatchObject({ + expect(structuredContent.timeline[0]?.genAi).toMatchObject({ operationType: "ai_client", requestModel: "gpt-5-mini", responseModel: "gpt-5-mini-2026-05-01", @@ -160,14 +160,16 @@ describe("get_agent_conversation_details", () => { costTotalTokens: 42, agentName: "triage-agent", }); - expect(structuredContent.timeline[2].genAi).toMatchObject({ + expect(structuredContent.timeline[2]?.genAi).toMatchObject({ operationType: "tool", }); - expect(structuredContent.timeline[2].genAi).not.toHaveProperty("toolName"); - expect(structuredContent.timeline[2].genAi).not.toHaveProperty( + expect(structuredContent.timeline[2]!.genAi).not.toHaveProperty("toolName"); + expect(structuredContent.timeline[2]!.genAi).not.toHaveProperty( "toolCallArguments", ); - expect(structuredContent.timeline[2].genAi).not.toHaveProperty("toolInput"); + expect(structuredContent.timeline[2]!.genAi).not.toHaveProperty( + "toolInput", + ); expect(structuredContent.spanSummaries[0]).toMatchObject({ spanId: "1111111111111111", spanOp: "gen_ai.chat", diff --git a/packages/mcp-core/src/tools/catalog/get-agent-conversation-details.ts b/packages/mcp-core/src/tools/catalog/get-agent-conversation-details.ts index 78cd92d5d7..618703e10e 100644 --- a/packages/mcp-core/src/tools/catalog/get-agent-conversation-details.ts +++ b/packages/mcp-core/src/tools/catalog/get-agent-conversation-details.ts @@ -563,7 +563,7 @@ function buildMessageEvents(span: AIConversationSpan): ConversationMessage[] { }); } else if (events.length > 0) { events[events.length - 1] = { - ...events[events.length - 1], + ...events[events.length - 1]!, metadata, genAi, }; diff --git a/packages/mcp-core/src/tools/catalog/get-alert-rule.test.ts b/packages/mcp-core/src/tools/catalog/get-alert-rule.test.ts index 524ad61eac..09b24b5e0b 100644 --- a/packages/mcp-core/src/tools/catalog/get-alert-rule.test.ts +++ b/packages/mcp-core/src/tools/catalog/get-alert-rule.test.ts @@ -528,7 +528,7 @@ describe("get_alert_rule", () => { id: `condition-${i}`, })); const actions = Array.from({ length: 6 }, (_, i) => ({ - ...issueAlertRule.actionFilters[0].actions[0], + ...issueAlertRule.actionFilters[0]!.actions[0], id: `action-${i}`, })); const groups = Array.from({ length: 6 }, (_, i) => ({ diff --git a/packages/mcp-core/src/tools/catalog/get-alert-rule.ts b/packages/mcp-core/src/tools/catalog/get-alert-rule.ts index 8faf69d1ad..ec62cac197 100644 --- a/packages/mcp-core/src/tools/catalog/get-alert-rule.ts +++ b/packages/mcp-core/src/tools/catalog/get-alert-rule.ts @@ -168,7 +168,7 @@ export default defineTool({ `Multiple alert rules named "${params.ruleIdOrName}" were found: ${matches.map(describeMatch).join(", ")}. Retry with the Alert ID and kind=issue, or use get_metric_monitor_details with the monitor ID. ${LIST_HINT}`, ); } - const [found] = matches; + const found = matches[0]!; match = found.kind === "issue" ? { diff --git a/packages/mcp-core/src/tools/catalog/get-dashboard-details.test.ts b/packages/mcp-core/src/tools/catalog/get-dashboard-details.test.ts index 8bac217833..6f708e35b5 100644 --- a/packages/mcp-core/src/tools/catalog/get-dashboard-details.test.ts +++ b/packages/mcp-core/src/tools/catalog/get-dashboard-details.test.ts @@ -391,7 +391,7 @@ describe("get_dashboard_details", () => { context, ), ); - return dashboard.widgets[0].queries[0]; + return dashboard.widgets[0]!.queries[0]; } it("describes saved transformations by aggregate position", async () => { @@ -405,7 +405,7 @@ describe("get_dashboard_details", () => { }, }); - expect((await getFirstQuery()).transformations).toMatchInlineSnapshot(` + expect((await getFirstQuery())?.transformations).toMatchInlineSnapshot(` [ { "aggregate": "count()", @@ -441,7 +441,7 @@ describe("get_dashboard_details", () => { transformations: { "3": ["fill(linear)"] }, }); - expect((await getFirstQuery()).transformations).toEqual([ + expect((await getFirstQuery())?.transformations).toEqual([ { aggregateIndex: 3, aggregate: null, @@ -472,7 +472,7 @@ describe("get_dashboard_details", () => { ), ); - expect((await getFirstQuery()).transformations).toBeNull(); + expect((await getFirstQuery())!.transformations).toBeNull(); }); it("accepts widgets whose display type is null", async () => { diff --git a/packages/mcp-core/src/tools/catalog/get-issue-activity.test.ts b/packages/mcp-core/src/tools/catalog/get-issue-activity.test.ts index 915729be8c..d27991d783 100644 --- a/packages/mcp-core/src/tools/catalog/get-issue-activity.test.ts +++ b/packages/mcp-core/src/tools/catalog/get-issue-activity.test.ts @@ -454,12 +454,12 @@ describe("get_issue_activity", () => { deletedPr, blankCommit, ] = activity; - expect(unmerge.unmerge).toEqual({ + expect(unmerge?.unmerge).toEqual({ fingerprintCount: 2, source: { shortId: "CLOUDFLARE-MCP-42" }, destination: null, }); - expect(Object.keys(resolved).sort()).toEqual([ + expect(Object.keys(resolved!).sort()).toEqual([ "author", "commentId", "dateCreated", @@ -467,18 +467,18 @@ describe("get_issue_activity", () => { "text", "type", ]); - expect(rca.text).toBe("Null org slug reaches the API client."); - expect(seerPr.pullRequestUrls).toEqual([ + expect(rca?.text).toBe("Null org slug reaches the API client."); + expect(seerPr?.pullRequestUrls).toEqual([ "https://github.com/getsentry/sentry-mcp/pull/7", ]); - expect(createIssue.externalIssue).toEqual({ + expect(createIssue?.externalIssue).toEqual({ title: "Fix null org", provider: "Jira", location: "https://example.atlassian.net/browse/ENG-1", }); - expect(resolvedByAge.age).toBe(720); - expect(deletedPr.pullRequest).toBeNull(); - expect(blankCommit.commit).toMatchObject({ id: "abc123", message: null }); + expect(resolvedByAge?.age).toBe(720); + expect(deletedPr!.pullRequest).toBeNull(); + expect(blankCommit?.commit).toMatchObject({ id: "abc123", message: null }); const serialized = JSON.stringify(structuredContent); for (const leaked of [ @@ -514,7 +514,7 @@ describe("get_issue_activity", () => { const [assigned] = getStructuredContent<{ activity: Array<{ assignee?: { name: string | null } }>; }>(result).activity; - expect(assigned.assignee).toEqual({ + expect(assigned?.assignee).toEqual({ id: "43", type: "user", name: "jane@corp.com", diff --git a/packages/mcp-core/src/tools/catalog/get-issue-breadcrumbs.test.ts b/packages/mcp-core/src/tools/catalog/get-issue-breadcrumbs.test.ts index 71adbc2de0..6ae2477cf6 100644 --- a/packages/mcp-core/src/tools/catalog/get-issue-breadcrumbs.test.ts +++ b/packages/mcp-core/src/tools/catalog/get-issue-breadcrumbs.test.ts @@ -223,7 +223,7 @@ describe("get_issue_breadcrumbs", () => { ); const [crumb] = getStructuredContent(result).breadcrumbs; - expect(Object.keys(crumb).sort()).toEqual([ + expect(Object.keys(crumb!).sort()).toEqual([ "category", "data", "level", @@ -237,9 +237,9 @@ describe("get_issue_breadcrumbs", () => { category: null, type: "default", }); - expect(crumb.message).toMatch(/^line one line two x+\.\.\.$/); - expect((crumb.message as string).length).toBe(123); - expect((crumb.data as string).length).toBe(203); + expect(crumb?.message).toMatch(/^line one line two x+\.\.\.$/); + expect((crumb!.message as string).length).toBe(123); + expect((crumb!.data as string).length).toBe(203); expect(JSON.stringify(crumb)).not.toContain("must-not-leak"); }); }); diff --git a/packages/mcp-core/src/tools/catalog/get-snapshot-image.test.ts b/packages/mcp-core/src/tools/catalog/get-snapshot-image.test.ts index 7bcbd94644..ab45632caf 100644 --- a/packages/mcp-core/src/tools/catalog/get-snapshot-image.test.ts +++ b/packages/mcp-core/src/tools/catalog/get-snapshot-image.test.ts @@ -150,21 +150,21 @@ describe("get_snapshot_image", () => { const result = await callHandler(); const { textParts, imageParts } = splitParts(result); - expect(textParts[0].text).toContain("## login_screen.png"); - expect(textParts[0].text).toContain( + expect(textParts[0]?.text).toContain("## login_screen.png"); + expect(textParts[0]?.text).toContain( "- **URL**: https://sentry.sentry.io/preprod/snapshots/231949/?selectedSnapshot=login_screen.png", ); - expect(textParts[0].text).toContain("**Status**: changed"); - expect(textParts[0].text).toContain("**Diff**: 12.5%"); - expect(textParts[0].text).toContain("**Image Resolution**: preview"); - expect(textParts[0].text).toContain( + expect(textParts[0]?.text).toContain("**Status**: changed"); + expect(textParts[0]?.text).toContain("**Diff**: 12.5%"); + expect(textParts[0]?.text).toContain("**Image Resolution**: preview"); + expect(textParts[0]?.text).toContain( "Use the Sentry tool `get_snapshot_image` for full-resolution image bytes", ); - expect(textParts[0].text).toContain("### Context"); - expect(textParts[0].text).toContain("- **device_name**: iPhone 16"); - expect(textParts[1].text).toBe("### Head (current) — preview"); - expect(textParts[2].text).toBe("### Base (previous) — preview"); - expect(textParts[3].text).toBe("### Diff Mask — preview"); + expect(textParts[0]?.text).toContain("### Context"); + expect(textParts[0]?.text).toContain("- **device_name**: iPhone 16"); + expect(textParts[1]?.text).toBe("### Head (current) — preview"); + expect(textParts[2]?.text).toBe("### Base (previous) — preview"); + expect(textParts[3]?.text).toBe("### Diff Mask — preview"); expect(textParts.map((part) => part.text)).toMatchInlineSnapshot(` [ "## login_screen.png @@ -190,8 +190,8 @@ describe("get_snapshot_image", () => { ] `); expect(imageParts).toHaveLength(3); - expect(imageParts[0].mimeType).toBe("image/png"); - expect(imageParts[1].mimeType).toBe("image/png"); + expect(imageParts[0]?.mimeType).toBe("image/png"); + expect(imageParts[1]?.mimeType).toBe("image/png"); }); it("downsamples 16-bit PNGs in preview responses", async () => { @@ -219,14 +219,14 @@ describe("get_snapshot_image", () => { const result = await callHandler(); const { textParts, imageParts } = splitParts(result); - expect(textParts[1].text).toBe("### Head (current) — preview"); + expect(textParts[1]?.text).toBe("### Head (current) — preview"); expect(imageParts).toHaveLength(1); - expect(imageParts[0].mimeType).toBe("image/png"); - expect(imageParts[0].data).not.toBe( + expect(imageParts[0]?.mimeType).toBe("image/png"); + expect(imageParts[0]!.data).not.toBe( Buffer.from(largeSixteenBitPng).toString("base64"), ); - const decoded = decodePng(Buffer.from(imageParts[0].data, "base64")); + const decoded = decodePng(Buffer.from(imageParts[0]!.data, "base64")); expect(decoded.width).toBe(1024); expect(decoded.height).toBe(512); expect(decoded.depth).toBe(8); @@ -240,10 +240,10 @@ describe("get_snapshot_image", () => { }); const { textParts, imageParts } = splitParts(result); - expect(textParts[0].text).toContain("**Image Resolution**: full"); - expect(textParts[1].text).toBe("### Head (current) — full"); - expect(imageParts[0].data).toBe(Buffer.from(fakePng).toString("base64")); - expect(imageParts[1].data).toBe(Buffer.from(fakePng).toString("base64")); + expect(textParts[0]?.text).toContain("**Image Resolution**: full"); + expect(textParts[1]?.text).toBe("### Head (current) — full"); + expect(imageParts[0]?.data).toBe(Buffer.from(fakePng).toString("base64")); + expect(imageParts[1]?.data).toBe(Buffer.from(fakePng).toString("base64")); }); it("throws on missing explicit snapshot params", async () => { @@ -294,7 +294,7 @@ describe("get_snapshot_image", () => { const result = await callHandler(); const { textParts, imageParts } = splitParts(result); - expect(textParts[1].text).toBe( + expect(textParts[1]?.text).toBe( "### Head (current) — preview unavailable. Retry with imageResolution=full to fetch the original image.", ); expect(imageParts).toHaveLength(0); @@ -332,8 +332,8 @@ describe("get_snapshot_image", () => { }); const { textParts } = splitParts(result); - expect(textParts[0].text).toContain(`## ${slashImageIdentifier}`); - expect(textParts[0].text).toContain( + expect(textParts[0]?.text).toContain(`## ${slashImageIdentifier}`); + expect(textParts[0]?.text).toContain( `- **File**: \`${slashImageIdentifier}\``, ); }); @@ -344,7 +344,7 @@ describe("get_snapshot_image", () => { const result = await callHandler(); const { imageParts } = splitParts(result); - expect(imageParts[0].mimeType).toBe("image/png"); + expect(imageParts[0]?.mimeType).toBe("image/png"); }); it("throws when no image data is available", async () => { diff --git a/packages/mcp-core/src/tools/catalog/get-trace-details.ts b/packages/mcp-core/src/tools/catalog/get-trace-details.ts index fb308f8d7b..2cd1b55eae 100644 --- a/packages/mcp-core/src/tools/catalog/get-trace-details.ts +++ b/packages/mcp-core/src/tools/catalog/get-trace-details.ts @@ -251,8 +251,8 @@ function selectInterestingSpans( break; } - fakeRoot.children.push(createSelectedSpan(root, 0)); - const selectedRoot = fakeRoot.children[fakeRoot.children.length - 1]; + const selectedRoot = createSelectedSpan(root, 0); + fakeRoot.children.push(selectedRoot); spanCount += 1; enqueueSelectedChildren( root, @@ -511,16 +511,14 @@ function renderSpanTree(spans: SelectedSpan[]): string[] { } // Render children with proper tree indentation - for (let i = 0; i < span.children.length; i++) { - const child = span.children[i]; + for (const [i, child] of span.children.entries()) { const isLastChild = i === span.children.length - 1; const childPrefix = prefix + (isLast ? " " : "│ "); renderSpan(child, childPrefix, isLastChild); } } - for (let i = 0; i < spans.length; i++) { - const span = spans[i]; + for (const [i, span] of spans.entries()) { const isLastRoot = i === spans.length - 1; renderSpan(span, "", isLastRoot); } @@ -573,7 +571,7 @@ function calculateOperationStats(trace: Trace): Record< // Only consider leaf nodes - spans that have no children if (span.children.length === 0) { // Use span.op if available, otherwise extract from span.name, fallback to "unknown" - const op = span.op || (span.name ? span.name.split(" ")[0] : "unknown"); + const op = span.op || (span.name ? span.name.split(" ")[0]! : "unknown"); const bucket = operationSpans.get(op); if (bucket) { bucket.push(span); @@ -1171,7 +1169,7 @@ function formatAIConversationSection({ const lines = ["## Agent Conversations", ""]; if (aiConversations.length === 1) { - const [conversation] = aiConversations; + const conversation = aiConversations[0]!; lines.push(`**Conversation ID**: \`${conversation.conversationId}\``); if (conversation.spanId) { lines.push(`**Matching Span**: \`${conversation.spanId}\``); diff --git a/packages/mcp-core/src/tools/catalog/search-agent-conversations.test.ts b/packages/mcp-core/src/tools/catalog/search-agent-conversations.test.ts index 425d66db68..b46606e1d7 100644 --- a/packages/mcp-core/src/tools/catalog/search-agent-conversations.test.ts +++ b/packages/mcp-core/src/tools/catalog/search-agent-conversations.test.ts @@ -201,11 +201,11 @@ describe("search_agent_conversations", () => { }>(result); const conversation = structuredContent.conversations[0]; - expect(conversation.firstInputPreview).toHaveLength(240); - expect(conversation.firstInputPreview?.endsWith("...")).toBe(true); - expect(conversation.lastOutputPreview).toHaveLength(240); - expect(conversation.lastOutputPreview?.endsWith("...")).toBe(true); - expect(conversation.sampleTraceIds).toEqual([ + expect(conversation?.firstInputPreview).toHaveLength(240); + expect(conversation?.firstInputPreview?.endsWith("...")).toBe(true); + expect(conversation?.lastOutputPreview).toHaveLength(240); + expect(conversation?.lastOutputPreview?.endsWith("...")).toBe(true); + expect(conversation?.sampleTraceIds).toEqual([ "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb", "cccccccccccccccccccccccccccccccc", @@ -315,7 +315,7 @@ describe("search_agent_conversations", () => { getServerContext(), ); - const params = new URL(requestUrls[0]).searchParams; + const params = new URL(requestUrls[0]!).searchParams; expect(params.get("query")).toBe("failed"); expect(params.get("sort")).toBe(null); expect(params.getAll("project")).toEqual(["4509109107622913"]); diff --git a/packages/mcp-core/src/tools/catalog/search-issue-events.test.ts b/packages/mcp-core/src/tools/catalog/search-issue-events.test.ts index 2e8a29c226..f503a5f30d 100644 --- a/packages/mcp-core/src/tools/catalog/search-issue-events.test.ts +++ b/packages/mcp-core/src/tools/catalog/search-issue-events.test.ts @@ -515,8 +515,8 @@ describe("search_issue_events", () => { ); const [emptyUser, emptyGeo] = sc(result).events; - expect(emptyUser.user).toBeNull(); - expect(emptyGeo.user).toEqual({ + expect(emptyUser!.user).toBeNull(); + expect(emptyGeo?.user).toEqual({ id: "user-1", email: null, username: null, diff --git a/packages/mcp-core/src/tools/catalog/search-replays.structured.test.ts b/packages/mcp-core/src/tools/catalog/search-replays.structured.test.ts index 2a9fc1d1c6..4c55fd7de5 100644 --- a/packages/mcp-core/src/tools/catalog/search-replays.structured.test.ts +++ b/packages/mcp-core/src/tools/catalog/search-replays.structured.test.ts @@ -184,12 +184,12 @@ describe("search_replays structured output", () => { const structuredContent = await runSearch({ query: "count_errors:>0" }); const [replay] = structuredContent.replays; - expect(replay.urls).toHaveLength(3); - expect(replay.urlCount).toBe(8); - expect(replay.traceIds).toHaveLength(3); - expect(replay.traceCount).toBe(7); - expect(replay.releases).toHaveLength(3); - expect(replay.releaseCount).toBe(5); + expect(replay?.urls).toHaveLength(3); + expect(replay?.urlCount).toBe(8); + expect(replay?.traceIds).toHaveLength(3); + expect(replay?.traceCount).toBe(7); + expect(replay?.releases).toHaveLength(3); + expect(replay?.releaseCount).toBe(5); }); it("omits the placeholder user on archived replays", async () => { @@ -204,8 +204,8 @@ describe("search_replays structured output", () => { const structuredContent = await runSearch({ query: "count_errors:>0" }); const [replay] = structuredContent.replays; - expect(replay.isArchived).toBe(true); - expect(replay.user).toBeNull(); + expect(replay?.isArchived).toBe(true); + expect(replay!.user).toBeNull(); }); it("keeps the unknown-environment warning in notes", async () => { diff --git a/packages/mcp-core/src/tools/catalog/support/alerts.ts b/packages/mcp-core/src/tools/catalog/support/alerts.ts index ae467a4c1a..0d6b179fa8 100644 --- a/packages/mcp-core/src/tools/catalog/support/alerts.ts +++ b/packages/mcp-core/src/tools/catalog/support/alerts.ts @@ -68,7 +68,7 @@ export async function resolveIssueAlertRule( return await apiService.getIssueAlertRule({ organizationSlug: params.organizationSlug, projectSlug: params.projectSlug, - ruleId: matches[0].id, + ruleId: matches[0]!.id, }); } if (matches.length > 1) { @@ -124,7 +124,7 @@ export async function resolveMetricAlertRule( : `Metric monitor "${ruleIdOrName}" was not found. Use find_metric_monitors to find its monitor ID.`, ); } - monitorId = matches[0].id; + monitorId = matches[0]!.id; } return await getMetricMonitor(apiService, { organizationSlug, diff --git a/packages/mcp-core/src/tools/catalog/support/uptime-monitors.ts b/packages/mcp-core/src/tools/catalog/support/uptime-monitors.ts index 2f17e752dd..6e99984360 100644 --- a/packages/mcp-core/src/tools/catalog/support/uptime-monitors.ts +++ b/packages/mcp-core/src/tools/catalog/support/uptime-monitors.ts @@ -65,7 +65,7 @@ export const ParamUptimeHeaders = z export function toUptimeHeaderPairs( headers: string[][], ): Array<[string, string]> { - return headers.map(([name, value]) => [name, value]); + return headers.map(([name, value]) => [name!, value!]); } /** Owner actor for create/update. Empty/whitespace rejected. */ diff --git a/packages/mcp-core/src/tools/catalog/update-alert-rule.test.ts b/packages/mcp-core/src/tools/catalog/update-alert-rule.test.ts index b44d24642f..d56079669e 100644 --- a/packages/mcp-core/src/tools/catalog/update-alert-rule.test.ts +++ b/packages/mcp-core/src/tools/catalog/update-alert-rule.test.ts @@ -115,8 +115,8 @@ describe("update_alert_rule", () => { it("reports when Sentry saves a Slack destination without resolving its channel ID", async () => { const { writes } = useAlertRuleHandlers(); const actionFilters = structuredClone(alertRule.actionFilters); - actionFilters[0].actions[0].config.targetDisplay = "#new-channel"; - actionFilters[0].actions[0].config.targetIdentifier = ""; + actionFilters[0]!.actions[0]!.config.targetDisplay = "#new-channel"; + actionFilters[0]!.actions[0]!.config.targetIdentifier = ""; await expect(updateRule({ actionFilters })).rejects.toThrow( "The alert was saved, but Sentry did not resolve a Slack destination.", @@ -208,7 +208,7 @@ describe("update_alert_rule", () => { const actionFilters: Parameters< typeof updateAlertRule.handler >[0]["actionFilters"] = structuredClone(alertRule.actionFilters); - actionFilters[0].actions.push({ + actionFilters[0]!.actions.push({ id: "22", type: "email", integrationId: null, @@ -220,18 +220,18 @@ describe("update_alert_rule", () => { }, }); actionFilters.push({ - ...actionFilters[0], + ...actionFilters[0]!, id: "30", actions: [{ ...slackAction, id: "31" }], }); - actionFilters[0].actions[0].config = { + actionFilters[0]!.actions[0]!.config = { ...slackAction.config, targetDisplay, targetIdentifier: inputId, }; - actionFilters[0].actions[0].integrationId = integrationId; + actionFilters[0]!.actions[0]!.integrationId = integrationId; const savedFilters = structuredClone(actionFilters); - savedFilters[0].actions[0].config.targetIdentifier = "CNEW"; + savedFilters[0]!.actions[0]!.config.targetIdentifier = "CNEW"; mswServer.use( http.put(endpoint, async ({ request }) => { writes.push((await request.json()) as Record); @@ -245,7 +245,7 @@ describe("update_alert_rule", () => { const result = await updateRule({ actionFilters }); const expectedFilters = structuredClone(actionFilters); const expectedConfig: Record = - expectedFilters[0].actions[0].config; + expectedFilters[0]!.actions[0]!.config; if (expectedId === undefined) delete expectedConfig.targetIdentifier; else expectedConfig.targetIdentifier = expectedId; expect(writes).toEqual([ @@ -313,7 +313,7 @@ describe("update_alert_rule", () => { alertRule: { actionFilters: (typeof group)[] }; }>(await getAlertRule.handler({ ...params, kind: "issue" }, context)); const actionFilters = inspected.actionFilters; - actionFilters[0].actions[0].config = action.config; + actionFilters[0]!.actions[0]!.config = action.config; // Teams always resolves the supplied name, replacing even an old channel ID. const savedAction = type === "msteams" @@ -391,7 +391,7 @@ describe("update_alert_rule", () => { { ...changes.actionFilters[0], conditions: [ - { ...changes.actionFilters[0].conditions[0], comparison: 25 }, + { ...changes.actionFilters[0]!.conditions[0], comparison: 25 }, ], }, ], @@ -652,7 +652,7 @@ describe("update_alert_rule", () => { { ...context, constraints: { projectSlug: "cloudflare-mcp" } }, ); - expect(queries[0].searchParams.get("projectSlug")).toBe("cloudflare-mcp"); + expect(queries[0]?.searchParams.get("projectSlug")).toBe("cloudflare-mcp"); expect(reads).toHaveLength(1); expect(writes).toEqual([{ name: "Renamed alert", enabled: true }]); }); diff --git a/packages/mcp-core/src/tools/catalog/update-alert-rule.ts b/packages/mcp-core/src/tools/catalog/update-alert-rule.ts index 031fecdba4..a4f84021ce 100644 --- a/packages/mcp-core/src/tools/catalog/update-alert-rule.ts +++ b/packages/mcp-core/src/tools/catalog/update-alert-rule.ts @@ -179,7 +179,7 @@ export default defineTool({ `Alert rule "${ruleId}" was not found${projectSlug ? ` in project ${projectSlug}` : ""}.`, ); } - ruleId = String(matches[0].id); + ruleId = String(matches[0]!.id); } const current = await apiService.getIssueAlertRule({ organizationSlug, diff --git a/packages/mcp-core/src/tools/catalog/update-metric-monitor.test.ts b/packages/mcp-core/src/tools/catalog/update-metric-monitor.test.ts index 844cc417d5..f07df357c8 100644 --- a/packages/mcp-core/src/tools/catalog/update-metric-monitor.test.ts +++ b/packages/mcp-core/src/tools/catalog/update-metric-monitor.test.ts @@ -189,7 +189,7 @@ describe("update_metric_monitor", () => { environment: null, }; const source = structuredClone(metricMonitor.dataSources[0]); - Object.assign(source.queryObj.snubaQuery, { + Object.assign(source!.queryObj.snubaQuery, { ...query, timeWindow: 7200, query: "release:previous", diff --git a/packages/mcp-core/src/tools/catalog/whoami.ts b/packages/mcp-core/src/tools/catalog/whoami.ts index 566b33ec5e..f32303aa51 100644 --- a/packages/mcp-core/src/tools/catalog/whoami.ts +++ b/packages/mcp-core/src/tools/catalog/whoami.ts @@ -68,7 +68,7 @@ export default defineTool({ ) ).map(({ value }) => value) : [toUser(await apiServiceFromContext(context).getAuthenticatedUser())]; - const [user] = users; + const user = users[0]!; const constraints = context.constraints; const sessionConstraints = diff --git a/packages/mcp-core/src/tools/support/dashboards/index.ts b/packages/mcp-core/src/tools/support/dashboards/index.ts index 972993da3e..def89bf5a8 100644 --- a/packages/mcp-core/src/tools/support/dashboards/index.ts +++ b/packages/mcp-core/src/tools/support/dashboards/index.ts @@ -340,7 +340,7 @@ export async function resolveDashboardId({ ); if (exactMatches.length === 1) { - return String(exactMatches[0].id); + return String(exactMatches[0]!.id); } if (exactMatches.length > 1) { diff --git a/packages/mcp-core/src/tools/support/event-stacktrace.ts b/packages/mcp-core/src/tools/support/event-stacktrace.ts index 5b4ce3d8cd..6f7873e824 100644 --- a/packages/mcp-core/src/tools/support/event-stacktrace.ts +++ b/packages/mcp-core/src/tools/support/event-stacktrace.ts @@ -184,7 +184,7 @@ function selectSentryDefaultThread(threads: Thread[]): Thread { return ( sortedThreads.find((thread) => thread.crashed) ?? sortedThreads.find((thread) => hasFrames(thread)) ?? - sortedThreads[0] + sortedThreads[0]! ); } @@ -208,5 +208,5 @@ function selectUnique( return { kind: "ambiguous", message: ambiguousMessage }; } - return { kind: "selected", thread: matches[0] }; + return { kind: "selected", thread: matches[0]! }; } diff --git a/packages/mcp-core/src/tools/support/issue-linking/app.ts b/packages/mcp-core/src/tools/support/issue-linking/app.ts index 71fea223a1..c4ab9724d6 100644 --- a/packages/mcp-core/src/tools/support/issue-linking/app.ts +++ b/packages/mcp-core/src/tools/support/issue-linking/app.ts @@ -61,7 +61,7 @@ function isIssueKey(value: string, key: string): boolean { function choiceLabelKey(label: string | number): string { return String(label) .toUpperCase() - .split(/[^A-Z0-9-]+/)[0]; + .split(/[^A-Z0-9-]+/)[0]!; } function parseTarget(raw: string) { @@ -241,7 +241,7 @@ async function resolveFields( ); } if (targetKey) { - const [selectedValue, selectedLabel] = matches[0]; + const [selectedValue, selectedLabel] = matches[0]!; const valueKey = String(selectedValue).toUpperCase(); const labelKey = choiceLabelKey(selectedLabel); const identifiedChoices = choices.filter( @@ -263,7 +263,7 @@ async function resolveFields( ); } } - value = matches[0][0]; + value = matches[0]![0]; } else { value ??= search; if ( @@ -319,7 +319,7 @@ export async function linkAppIssue( ); if (installed.length !== 1) throw new UserInputError(`Expected one installed Sentry App '${appSlug}'.`); - const installation = installed[0]; + const installation = installed[0]!; const matchingComponents = components.filter( (component) => component.type === "issue-link" && diff --git a/packages/mcp-core/src/tools/support/issue-linking/index.ts b/packages/mcp-core/src/tools/support/issue-linking/index.ts index 2e8cb5ffda..aea12ddf10 100644 --- a/packages/mcp-core/src/tools/support/issue-linking/index.ts +++ b/packages/mcp-core/src/tools/support/issue-linking/index.ts @@ -86,7 +86,7 @@ function nativeIdentity( /^\/([^/]+\/[^/]+)\/(issues|pull)\/(\d+)(?:\/(files|changes|commits|checks))?$/, ); if (!match || (match[2] === "issues" && match[4])) return undefined; - return `${url.origin}/${match[1].toLowerCase()}#${match[3]}`; + return `${url.origin}/${match[1]!.toLowerCase()}#${match[3]}`; } case "gitlab": { const match = path.match(/^\/(.+?)(?:\/-)?\/issues\/(\d+)$/); @@ -262,7 +262,7 @@ export async function linkExternalIssue( `Multiple installed issue integrations match this URL. Provide integrationId to select one: ${describeIntegrations(candidates)}.`, ); } - const integration = candidates[0]; + const integration = candidates[0]!; const { issue, changed } = await apiService.linkNativeExternalIssue({ ...params, integrationId: String(integration.id), diff --git a/packages/mcp-core/src/tools/support/metric-monitor-config.ts b/packages/mcp-core/src/tools/support/metric-monitor-config.ts index fbe07305b9..724e1ff306 100644 --- a/packages/mcp-core/src/tools/support/metric-monitor-config.ts +++ b/packages/mcp-core/src/tools/support/metric-monitor-config.ts @@ -152,7 +152,7 @@ export function toMetricMonitorUpdate( if (status !== undefined) body.enabled = status === "active"; if (query !== undefined) { const sources = current.dataSources ?? []; - const existing = sources.length === 1 ? getMetricQuery(sources[0]) : null; + const existing = sources.length === 1 ? getMetricQuery(sources[0]!) : null; if (!existing) { throw new UserInputError( "This monitor's query is unavailable or has multiple sources; cannot safely update it.", diff --git a/packages/mcp-core/src/tools/support/profile/analyzer.test.ts b/packages/mcp-core/src/tools/support/profile/analyzer.test.ts index df379e55bd..875fbbe0ca 100644 --- a/packages/mcp-core/src/tools/support/profile/analyzer.test.ts +++ b/packages/mcp-core/src/tools/support/profile/analyzer.test.ts @@ -115,8 +115,8 @@ describe("analyzer", () => { expect(hotPaths).toHaveLength(2); // First path should be the one with longer duration (100ms > 60ms) - expect(hotPaths[0].duration).toBe(100_000_000); - expect(hotPaths[1].duration).toBe(60_000_000); + expect(hotPaths[0]?.duration).toBe(100_000_000); + expect(hotPaths[1]?.duration).toBe(60_000_000); }); it("calculates percentage of total correctly", () => { @@ -128,9 +128,9 @@ describe("analyzer", () => { // Total samples: 50 + 30 = 80 // First path: 50/80 = 62.5% - expect(hotPaths[0].percentOfTotal).toBeCloseTo(62.5, 1); + expect(hotPaths[0]?.percentOfTotal).toBeCloseTo(62.5, 1); // Second path: 30/80 = 37.5% - expect(hotPaths[1].percentOfTotal).toBeCloseTo(37.5, 1); + expect(hotPaths[1]?.percentOfTotal).toBeCloseTo(37.5, 1); }); it("filters to user code when focusOnUserCode is true", () => { @@ -141,9 +141,9 @@ describe("analyzer", () => { }); // User code frames should be filtered - expect(hotPaths[0].userCodeFrames).toHaveLength(2); + expect(hotPaths[0]?.userCodeFrames).toHaveLength(2); expect( - hotPaths[0].userCodeFrames.every((f) => f.frame.is_application), + hotPaths[0]?.userCodeFrames.every((f) => f.frame.is_application), ).toBe(true); }); @@ -178,9 +178,9 @@ describe("analyzer", () => { ); expect(callStack).toHaveLength(3); - expect(callStack[0].depth).toBe(0); - expect(callStack[1].depth).toBe(1); - expect(callStack[2].depth).toBe(2); + expect(callStack[0]?.depth).toBe(0); + expect(callStack[1]?.depth).toBe(1); + expect(callStack[2]?.depth).toBe(2); }); it("marks root and leaf frames correctly", () => { @@ -193,16 +193,16 @@ describe("analyzer", () => { ); // First frame is leaf (leaf-to-root order) - expect(callStack[0].isLeaf).toBe(true); - expect(callStack[0].isRoot).toBe(false); + expect(callStack[0]?.isLeaf).toBe(true); + expect(callStack[0]?.isRoot).toBe(false); // Middle frame - expect(callStack[1].isRoot).toBe(false); - expect(callStack[1].isLeaf).toBe(false); + expect(callStack[1]?.isRoot).toBe(false); + expect(callStack[1]?.isLeaf).toBe(false); // Last frame is root - expect(callStack[2].isRoot).toBe(true); - expect(callStack[2].isLeaf).toBe(false); + expect(callStack[2]?.isRoot).toBe(true); + expect(callStack[2]?.isLeaf).toBe(false); }); it("handles single-frame stacks", () => { @@ -215,8 +215,8 @@ describe("analyzer", () => { expect(callStack).toHaveLength(1); // Single frame is both root and leaf - expect(callStack[0].isRoot).toBe(true); - expect(callStack[0].isLeaf).toBe(true); + expect(callStack[0]?.isRoot).toBe(true); + expect(callStack[0]?.isLeaf).toBe(true); }); it("preserves frame index reference", () => { @@ -227,9 +227,9 @@ describe("analyzer", () => { flamegraph.shared.frame_infos, ); - expect(callStack[0].frameIndex).toBe(0); - expect(callStack[1].frameIndex).toBe(1); - expect(callStack[2].frameIndex).toBe(2); + expect(callStack[0]?.frameIndex).toBe(0); + expect(callStack[1]?.frameIndex).toBe(1); + expect(callStack[2]?.frameIndex).toBe(2); }); }); @@ -243,8 +243,8 @@ describe("analyzer", () => { expect(hotspots.length).toBeGreaterThan(0); // Should be sorted by weight (highest first) for (let i = 1; i < hotspots.length; i++) { - expect(hotspots[i - 1].frameInfo.weight).toBeGreaterThanOrEqual( - hotspots[i].frameInfo.weight, + expect(hotspots[i - 1]?.frameInfo.weight).toBeGreaterThanOrEqual( + hotspots[i]!.frameInfo.weight, ); } }); @@ -338,7 +338,7 @@ describe("analyzer", () => { const current = createMockFlamegraph(); // Make current 30% slower (comparison uses sumDuration) - current.shared.frame_infos[0].sumDuration = 208000000; // 160ms * 1.3 = 208ms + current.shared.frame_infos[0]!.sumDuration = 208000000; // 160ms * 1.3 = 208ms const comparisons = compareFrameStats(baseline, current, { focusOnUserCode: false, @@ -348,7 +348,7 @@ describe("analyzer", () => { (c) => c.changeType === "major_regression", ); expect(regressions.length).toBeGreaterThan(0); - expect(regressions[0].percentChange).toBeGreaterThan(20); + expect(regressions[0]?.percentChange).toBeGreaterThan(20); }); it("detects minor regression (10-20% slower)", () => { @@ -356,7 +356,7 @@ describe("analyzer", () => { const current = createMockFlamegraph(); // Make current 15% slower (comparison uses sumDuration) - current.shared.frame_infos[1].sumDuration = 184000000; // 160ms * 1.15 = 184ms + current.shared.frame_infos[1]!.sumDuration = 184000000; // 160ms * 1.15 = 184ms const comparisons = compareFrameStats(baseline, current, { focusOnUserCode: false, @@ -373,7 +373,7 @@ describe("analyzer", () => { const current = createMockFlamegraph(); // Make current 20% faster (comparison uses sumDuration) - current.shared.frame_infos[0].sumDuration = 128000000; // 160ms * 0.8 = 128ms + current.shared.frame_infos[0]!.sumDuration = 128000000; // 160ms * 0.8 = 128ms const comparisons = compareFrameStats(baseline, current, { focusOnUserCode: false, @@ -390,7 +390,7 @@ describe("analyzer", () => { const current = createMockFlamegraph(); // Make current 5% slower (within no_change threshold, uses sumDuration) - current.shared.frame_infos[0].sumDuration = 168000000; // 160ms * 1.05 = 168ms + current.shared.frame_infos[0]!.sumDuration = 168000000; // 160ms * 1.05 = 168ms const comparisons = compareFrameStats(baseline, current, { focusOnUserCode: false, @@ -417,8 +417,8 @@ describe("analyzer", () => { const current = createMockFlamegraph(); // Create different severity changes - current.shared.frame_infos[0].weight = 240; // major regression (+50%) - current.shared.frame_infos[1].weight = 176; // minor regression (+10%) + current.shared.frame_infos[0]!.weight = 240; // major regression (+50%) + current.shared.frame_infos[1]!.weight = 176; // minor regression (+10%) const comparisons = compareFrameStats(baseline, current, { focusOnUserCode: true, diff --git a/packages/mcp-core/src/tools/support/profile/analyzer.ts b/packages/mcp-core/src/tools/support/profile/analyzer.ts index 364ed67355..9645bc470b 100644 --- a/packages/mcp-core/src/tools/support/profile/analyzer.ts +++ b/packages/mcp-core/src/tools/support/profile/analyzer.ts @@ -112,8 +112,7 @@ export function analyzeHotPathsFromFlamegraph( } >(); - for (let idx = 0; idx < profile.samples.length; idx++) { - const stackIndices = profile.samples[idx]; + for (const [idx, stackIndices] of profile.samples.entries()) { const sampleCount = profile.sample_counts[idx] || 0; const duration = profile.sample_durations_ns[idx] || 0; const weight = profile.weights[idx] || 0; @@ -357,7 +356,7 @@ export function compareFrameStats( continue; // Frame only in one dataset } - const currentFrame = currentFrames[indices.currentIdx]; + const currentFrame = currentFrames[indices.currentIdx]!; const baselineInfo = baselineInfos[indices.baselineIdx] || DEFAULT_FRAME_INFO; const currentInfo = currentInfos[indices.currentIdx] || DEFAULT_FRAME_INFO; diff --git a/packages/mcp-core/src/tools/support/profile/details-output.ts b/packages/mcp-core/src/tools/support/profile/details-output.ts index 7f44e62143..05f80704af 100644 --- a/packages/mcp-core/src/tools/support/profile/details-output.ts +++ b/packages/mcp-core/src/tools/support/profile/details-output.ts @@ -216,7 +216,7 @@ function getTransactionProfileDurationNs( return null; } - const duration = elapsed[elapsed.length - 1] - elapsed[0]; + const duration = elapsed.at(-1)! - elapsed[0]!; return duration > 0 ? Math.round(duration) : null; } diff --git a/packages/mcp-core/src/tools/support/profile/flamegraph-output.test.ts b/packages/mcp-core/src/tools/support/profile/flamegraph-output.test.ts index 801a8c0b35..47eaaa3514 100644 --- a/packages/mcp-core/src/tools/support/profile/flamegraph-output.test.ts +++ b/packages/mcp-core/src/tools/support/profile/flamegraph-output.test.ts @@ -137,7 +137,7 @@ describe("buildFlamegraphAnalysis", () => { it("maps placeholder file and line values to null", () => { const flamegraph = createMockFlamegraph(); flamegraph.shared.frames[0] = { - ...flamegraph.shared.frames[0], + ...flamegraph.shared.frames[0]!, file: "", line: 0, }; @@ -162,12 +162,10 @@ describe("buildFlamegraphAnalysis", () => { }); const [topPath] = analysis.hotPaths; - expect(topPath.stack.map((index) => analysis.frames[index]?.file)).toEqual([ - "main.py", - "utils.py", - "psycopg2/pool.py", - ]); - expect(topPath.stack.at(-1)).toBe(topPath.leaf); + expect(topPath?.stack.map((index) => analysis.frames[index]?.file)).toEqual( + ["main.py", "utils.py", "psycopg2/pool.py"], + ); + expect(topPath?.stack.at(-1)).toBe(topPath!.leaf); expect(analysis.topFunctions).toHaveLength(3); }); @@ -225,7 +223,7 @@ describe("buildFlamegraphComparison", () => { it("detects major regressions", () => { const current = createMockFlamegraph(); // Comparison uses sumDuration, not weight. - current.shared.frame_infos[0].sumDuration = 240_000_000; + current.shared.frame_infos[0]!.sumDuration = 240_000_000; const comparison = buildFlamegraphComparison( createMockFlamegraph(), @@ -250,7 +248,7 @@ describe("buildFlamegraphComparison", () => { const withPlaceholders = () => { const flamegraph = createMockFlamegraph(); flamegraph.shared.frames[0] = { - ...flamegraph.shared.frames[0], + ...flamegraph.shared.frames[0]!, file: "", line: 0, }; @@ -271,7 +269,7 @@ describe("buildFlamegraphComparison", () => { it("keeps improvements in changes when many frames are unchanged", () => { const withFrames = (improvedDurationNs: number) => { const flamegraph = createMockFlamegraph(); - const template = flamegraph.shared.frame_infos[0]; + const template = flamegraph.shared.frame_infos[0]!; flamegraph.shared.frames = Array.from({ length: 13 }, (_, index) => ({ file: `module_${index}.py`, name: `fn_${index}`, @@ -305,9 +303,9 @@ describe("buildFlamegraphComparison", () => { it("detects improvements", () => { const current = createMockFlamegraph(); - current.shared.frame_infos[0].sumDuration = 128_000_000; - current.shared.frame_infos[1].sumDuration = 128_000_000; - current.shared.frame_infos[2].sumDuration = 80_000_000; + current.shared.frame_infos[0]!.sumDuration = 128_000_000; + current.shared.frame_infos[1]!.sumDuration = 128_000_000; + current.shared.frame_infos[2]!.sumDuration = 80_000_000; expect( buildFlamegraphComparison(createMockFlamegraph(), current, { diff --git a/packages/mcp-core/src/tools/support/search-events/formatters.ts b/packages/mcp-core/src/tools/support/search-events/formatters.ts index 06ae5de807..2a5021796e 100644 --- a/packages/mcp-core/src/tools/support/search-events/formatters.ts +++ b/packages/mcp-core/src/tools/support/search-events/formatters.ts @@ -413,9 +413,7 @@ export function formatLogResults(params: FormatEventResultsParams): string { "sentry.item_id", ]; - for (let i = 0; i < eventData.length; i++) { - const event = eventData[i]; - + for (const [i, event] of eventData.entries()) { output += `### Log ${i + 1}\n`; if (typeof event.id === "string" && event.id) { diff --git a/packages/mcp-core/src/tools/support/search-events/search.ts b/packages/mcp-core/src/tools/support/search-events/search.ts index d2e9b71e32..29643b5c8a 100644 --- a/packages/mcp-core/src/tools/support/search-events/search.ts +++ b/packages/mcp-core/src/tools/support/search-events/search.ts @@ -241,7 +241,7 @@ function formatEnvironmentFilter( return undefined; } if (environments.length === 1) { - return `environment:${formatSearchValue(environments[0])}`; + return `environment:${formatSearchValue(environments[0]!)}`; } return `environment:[${environments.map(formatSearchValue).join(",")}]`; } @@ -278,11 +278,11 @@ export function collectRequestedEnvironments( // inside quoted text (e.g. a message value) aren't mistaken for a filter. const tokens = tokenizeSearchQuery(query); for (let i = 0; i < tokens.length; i++) { - const match = /^environment:(.*)$/is.exec(tokens[i]); + const match = /^environment:(.*)$/is.exec(tokens[i]!); if (!match) { continue; } - let value = match[1]; + let value = match[1]!; // An IN-list (`environment:[a, b]`) can be split across tokens on its // internal spaces; rejoin following tokens until the list is closed. while ( @@ -339,7 +339,7 @@ function tokenizeSearchQuery(query: string): string[] { let escaped = false; for (let i = 0; i < query.length; i += 1) { - const char = query[i]; + const char = query.charAt(i); if (escaped) { currentToken += char; escaped = false; diff --git a/packages/mcp-core/src/tools/support/search-events/utils.test.ts b/packages/mcp-core/src/tools/support/search-events/utils.test.ts index e34afd335e..95297d996a 100644 --- a/packages/mcp-core/src/tools/support/search-events/utils.test.ts +++ b/packages/mcp-core/src/tools/support/search-events/utils.test.ts @@ -80,8 +80,8 @@ describe("validateSearch tool contract", () => { }); expect(requests).toHaveLength(1); - expect(requests[0].getAll("environment")).toEqual([]); - expect(requests[0].get("query")).toBe(query); + expect(requests[0]?.getAll("environment")).toEqual([]); + expect(requests[0]?.get("query")).toBe(query); expect(result).toEqual({ result: { valid: true, message: "Search validation passed." }, }); @@ -1162,7 +1162,7 @@ describe("fetchCustomAttributes", () => { ); expect(requests).toHaveLength(1); - expect(requests[0].get("attributeType")).toBeNull(); + expect(requests[0]!.get("attributeType")).toBeNull(); for (const params of requests) { expect(params.get("itemType")).toBe("spans"); expect(params.get("project")).toBe("123"); diff --git a/packages/mcp-core/src/tools/support/search-events/utils.ts b/packages/mcp-core/src/tools/support/search-events/utils.ts index 7c6aefa23b..3de0bb56d0 100644 --- a/packages/mcp-core/src/tools/support/search-events/utils.ts +++ b/packages/mcp-core/src/tools/support/search-events/utils.ts @@ -278,7 +278,7 @@ function maskQuotedRegions(query: string): string { let escaped = false; for (let i = 0; i < query.length; i += 1) { - const char = query[i]; + const char = query.charAt(i); if (escaped) { escaped = false; out += quote ? "x" : char; @@ -1225,7 +1225,7 @@ function resolveAvailableFields( const replacementAttribute = { ...field, key: replacementKey }; available.set(replacementKey, replacementAttribute); replaced.push(field); - fieldTypes[replacementKey] = fieldTypes[key]; + fieldTypes[replacementKey] = fieldTypes[key]!; delete fieldTypes[key]; } else if (!attributeDeprecated && !available.has(key)) { available.set(key, field); diff --git a/packages/mcp-core/src/tools/support/search-issue-events/utils.ts b/packages/mcp-core/src/tools/support/search-issue-events/utils.ts index 6c3e4fa5b9..cea7af2987 100644 --- a/packages/mcp-core/src/tools/support/search-issue-events/utils.ts +++ b/packages/mcp-core/src/tools/support/search-issue-events/utils.ts @@ -120,9 +120,9 @@ Received: ${params.issueUrl}`, organizationSlug: resolveScopedOrganizationSlug({ resourceLabel: "Issue", scopedOrganizationSlug: params.organizationSlug, - urlOrganizationSlug: orgMatch[1], + urlOrganizationSlug: orgMatch[1]!, }), - issueId: orgMatch[2], + issueId: orgMatch[2]!, }; } diff --git a/packages/mcp-core/src/tools/support/traces/semantic-display.ts b/packages/mcp-core/src/tools/support/traces/semantic-display.ts index 212ce7d470..68f92bcb35 100644 --- a/packages/mcp-core/src/tools/support/traces/semantic-display.ts +++ b/packages/mcp-core/src/tools/support/traces/semantic-display.ts @@ -624,8 +624,8 @@ function formatHttpTarget(value: string): string { const trimmed = value.trim(); if (!/^[a-z][a-z0-9+.-]*:\/\//i.test(trimmed)) { - const withoutFragment = trimmed.split("#", 1)[0]; - return withoutFragment.split("?", 1)[0]; + const withoutFragment = trimmed.split("#", 1)[0]!; + return withoutFragment.split("?", 1)[0]!; } try { @@ -633,8 +633,8 @@ function formatHttpTarget(value: string): string { const path = url.pathname === "/" ? "" : url.pathname; return `${url.host}${path}`; } catch { - const withoutFragment = trimmed.split("#", 1)[0]; - return withoutFragment.split("?", 1)[0]; + const withoutFragment = trimmed.split("#", 1)[0]!; + return withoutFragment.split("?", 1)[0]!; } } diff --git a/packages/mcp-core/src/transports/stdio.test.ts b/packages/mcp-core/src/transports/stdio.test.ts index 476a57399e..913efd028a 100644 --- a/packages/mcp-core/src/transports/stdio.test.ts +++ b/packages/mcp-core/src/transports/stdio.test.ts @@ -17,7 +17,7 @@ const server = { async function spanAttributes(context: Parameters[1]) { await startStdio(server, context); - const [options] = vi.mocked(startSpan).mock.calls[0]; + const [options] = vi.mocked(startSpan).mock.calls[0]!; return options.attributes; } diff --git a/packages/mcp-core/src/utils/url-utils.ts b/packages/mcp-core/src/utils/url-utils.ts index 27d1f91d8b..8a5bcdf9dc 100644 --- a/packages/mcp-core/src/utils/url-utils.ts +++ b/packages/mcp-core/src/utils/url-utils.ts @@ -99,7 +99,7 @@ function extractTraceMetricFromAggregate( return null; } - const args = match[1] + const args = match[1]! .split(",") .map((arg) => arg.trim()) .filter((arg) => arg.length > 0); @@ -109,9 +109,9 @@ function extractTraceMetricFromAggregate( } return normalizeTraceMetric({ - name: args[1], - type: args[2], - unit: args[3], + name: args[1]!, + type: args[2]!, + unit: args[3]!, }); } @@ -669,12 +669,12 @@ export function extractConversationIdFromSearchQuery( } const pattern = /gen_ai\.conversation\.id:(?:"([^"]+)"|([^\s)]+))/g; - const matches = [...query.matchAll(pattern)]; - if (matches.length !== 1) { + const [match, ...otherMatches] = query.matchAll(pattern); + if (match === undefined || otherMatches.length > 0) { return undefined; } - const conversationId = matches[0].at(1) ?? matches[0][2]; + const conversationId = match[1] ?? match[2]!; if (conversationId.startsWith("[")) { return undefined; } diff --git a/packages/mcp-core/tsconfig.json b/packages/mcp-core/tsconfig.json index 1fa90ef72f..4061fbae45 100644 --- a/packages/mcp-core/tsconfig.json +++ b/packages/mcp-core/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "noUncheckedIndexedAccess": false, "lib": ["ES2023", "ES2024.String"], "allowJs": true, "sourceMap": true, From ae119b35599bbf480bbecb427eb264369e718b7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josh=20Goldberg=20=E2=9C=A8?= Date: Fri, 13 Nov 2026 11:08:51 -0500 Subject: [PATCH 06/18] fix(tsconfig): Keep the codemod's tsconfig standalone for jssg Co-Authored-By: Claude Opus 5.5 --- packages/codemod-cli3to4/tsconfig.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/codemod-cli3to4/tsconfig.json b/packages/codemod-cli3to4/tsconfig.json index 8d91770c8c..7ebfa025ba 100644 --- a/packages/codemod-cli3to4/tsconfig.json +++ b/packages/codemod-cli3to4/tsconfig.json @@ -1,9 +1,20 @@ { - "extends": "../../tsconfig.base.json", + // jssg can't resolve an `extends` outside this package, so this doesn't extend the shared base. "compilerOptions": { "target": "ESNext", "module": "NodeNext", "moduleResolution": "NodeNext", + "moduleDetection": "force", + "isolatedModules": true, + "esModuleInterop": true, + "resolveJsonModule": true, + "skipLibCheck": true, + "forceConsistentCasingInFileNames": true, + "strict": true, + "noFallthroughCasesInSwitch": true, + "noImplicitOverride": true, + "noUncheckedIndexedAccess": true, + "noUncheckedSideEffectImports": true, "types": ["@codemod.com/jssg-types"], "allowImportingTsExtensions": true, "noEmit": true, From eacda7a12db3c114183fa5c95818c6ce44d17aa9 Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Sat, 14 Nov 2026 17:23:48 +0000 Subject: [PATCH 07/18] build: Move to TypeScript 7 and pnpm 12 Co-Authored-By: Joshua Li <14209781+joshuarli@users.noreply.github.com> --- .github/workflows/cli-build.yml | 6 +- .github/workflows/deploy-docs-mcp.yml | 4 +- .github/workflows/deploy-games-api.yml | 4 +- .github/workflows/deploy.yml | 4 +- .github/workflows/eval.yml | 4 +- .github/workflows/install-scripts.yml | 2 +- .github/workflows/local.yml | 2 +- .github/workflows/merge-jobs.yml | 2 +- .../recover-cloudflare-deployment.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/smoke-tests.yml | 4 +- .github/workflows/test.yml | 15 +- .github/workflows/token-cost.yml | 4 +- .pnpmfile.cjs | 23 + .vscode/extensions.json | 2 +- .vscode/settings.json | 2 + AGENTS.md | 4 +- apps/cli-docs/package.json | 5 +- apps/docs-mcp/package.json | 4 +- apps/games-api/package.json | 3 +- apps/local/package.json | 10 +- package.json | 8 +- packages/cli/package.json | 8 +- .../cli/patches/@stricli%2Fcore@1.2.8.patch | 118 +- packages/logger/package.json | 4 +- packages/mcp-cloudflare/package.json | 3 +- packages/mcp-core/package.json | 8 +- packages/mcp-server-evals/package.json | 3 +- packages/mcp-server-mocks/package.json | 4 +- packages/mcp-server/package.json | 5 +- packages/smoke-tests/package.json | 7 +- packages/toolkit-core/package.json | 3 +- pnpm-lock.yaml | 3628 ++++++++++------- pnpm-workspace.yaml | 79 +- vitest.workspace.ts | 1 - 35 files changed, 2292 insertions(+), 1695 deletions(-) create mode 100644 .pnpmfile.cjs delete mode 100644 vitest.workspace.ts diff --git a/.github/workflows/cli-build.yml b/.github/workflows/cli-build.yml index f0c6296c0d..b7a50aa042 100644 --- a/.github/workflows/cli-build.yml +++ b/.github/workflows/cli-build.yml @@ -55,7 +55,7 @@ jobs: os: ubuntu-latest steps: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ env.NODE_VERSION_22 }} @@ -264,7 +264,7 @@ jobs: environment: ${{ github.ref == 'refs/heads/main' && 'production' || startsWith(github.ref, 'refs/heads/release/cli/') && 'cli-release' || '' }} steps: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ env.NODE_VERSION_22 }} @@ -344,7 +344,7 @@ jobs: PUBLIC_SENTRY_ENVIRONMENT: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/cli/')) && 'production' || 'development' }} steps: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ env.NODE_VERSION_24 }} diff --git a/.github/workflows/deploy-docs-mcp.yml b/.github/workflows/deploy-docs-mcp.yml index cd3ca3a47a..725069128b 100644 --- a/.github/workflows/deploy-docs-mcp.yml +++ b/.github/workflows/deploy-docs-mcp.yml @@ -75,8 +75,8 @@ jobs: with: node-version: "22" - # pnpm/action-setup@v4 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda + # pnpm/action-setup@v6.1.1 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 name: Install pnpm with: run_install: false diff --git a/.github/workflows/deploy-games-api.yml b/.github/workflows/deploy-games-api.yml index feaa2416b9..8464b3e51d 100644 --- a/.github/workflows/deploy-games-api.yml +++ b/.github/workflows/deploy-games-api.yml @@ -74,8 +74,8 @@ jobs: with: node-version: "22" - # pnpm/action-setup@v4 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda + # pnpm/action-setup@v6.1.1 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 name: Install pnpm with: run_install: false diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d27499a2af..5db4c610a1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -74,8 +74,8 @@ jobs: with: node-version: "22" - # pnpm/action-setup@v4 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda + # pnpm/action-setup@v6.1.1 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 name: Install pnpm with: run_install: false diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 25784c9d1d..673627fd17 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -32,8 +32,8 @@ jobs: # Roach (see packages/mcp-server-evals/roach.json) needs Node 24.14+. node-version: "24" - # pnpm/action-setup@v4 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda + # pnpm/action-setup@v6.1.1 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 name: Install pnpm with: run_install: false diff --git a/.github/workflows/install-scripts.yml b/.github/workflows/install-scripts.yml index 36b4debd2d..5352295187 100644 --- a/.github/workflows/install-scripts.yml +++ b/.github/workflows/install-scripts.yml @@ -119,7 +119,7 @@ jobs: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 with: persist-credentials: false - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: "22.23.4" diff --git a/.github/workflows/local.yml b/.github/workflows/local.yml index c287154ad2..3299833045 100644 --- a/.github/workflows/local.yml +++ b/.github/workflows/local.yml @@ -37,7 +37,7 @@ jobs: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 with: persist-credentials: false - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: "22.23.4" diff --git a/.github/workflows/merge-jobs.yml b/.github/workflows/merge-jobs.yml index 86f6b86009..5156a9191c 100644 --- a/.github/workflows/merge-jobs.yml +++ b/.github/workflows/merge-jobs.yml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v4 - name: Setup pnpm - uses: pnpm/action-setup@v4 + uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - name: Set up Node uses: actions/setup-node@v4 diff --git a/.github/workflows/recover-cloudflare-deployment.yml b/.github/workflows/recover-cloudflare-deployment.yml index 710a9b1e1d..08a63633a6 100644 --- a/.github/workflows/recover-cloudflare-deployment.yml +++ b/.github/workflows/recover-cloudflare-deployment.yml @@ -69,7 +69,7 @@ jobs: with: node-version: "22" - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 with: run_install: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 86ef245c0f..4cf8b7c764 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,7 +56,7 @@ jobs: with: node-version: "22" - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 name: Install pnpm with: run_install: false diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index d97c741f01..3fa07b8452 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -32,8 +32,8 @@ jobs: with: node-version: "22" - # pnpm/action-setup@v4 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda + # pnpm/action-setup@v6.1.1 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 name: Install pnpm with: run_install: false diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 467eed9143..17370816d7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: with: persist-credentials: false fetch-depth: 0 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ env.NODE_VERSION_22 }} @@ -57,7 +57,7 @@ jobs: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 with: persist-credentials: false - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ env.NODE_VERSION_22 }} @@ -71,7 +71,7 @@ jobs: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 with: persist-credentials: false - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ env.NODE_VERSION_22 }} @@ -79,6 +79,9 @@ jobs: - run: pnpm install --frozen-lockfile - run: pnpm run test:ci-projects - run: pnpm run docs:check + # Type-aware lint resolves workspace packages through their built types; + # without them, imports from these packages read as error-typed values. + - run: pnpm --filter '@sentry/mcp-core...' --filter @sentry/logger --if-present run build - run: pnpm run lint - run: pnpm run check:generated - name: Check generated files @@ -100,7 +103,7 @@ jobs: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 with: persist-credentials: false - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ env.NODE_VERSION_22 }} @@ -131,7 +134,7 @@ jobs: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 with: persist-credentials: false - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ env.NODE_VERSION_22 }} @@ -231,7 +234,7 @@ jobs: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 with: persist-credentials: false - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ env.NODE_VERSION_22 }} diff --git a/.github/workflows/token-cost.yml b/.github/workflows/token-cost.yml index 40217e2998..86a98b29af 100644 --- a/.github/workflows/token-cost.yml +++ b/.github/workflows/token-cost.yml @@ -49,8 +49,8 @@ jobs: with: node-version: "22" - # pnpm/action-setup@v4 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda + # pnpm/action-setup@v6.1.1 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 name: Install pnpm with: run_install: false diff --git a/.pnpmfile.cjs b/.pnpmfile.cjs new file mode 100644 index 0000000000..17f6df5e52 --- /dev/null +++ b/.pnpmfile.cjs @@ -0,0 +1,23 @@ +// pnpm install hooks. Keep each change narrow and say when it can go. + +// TypeScript 7 has no JavaScript compiler API. These packages import +// `typescript` for its compiler API through an optional peer, which resolves +// to the workspace's TypeScript 7. Give them the TypeScript 6 API instead. +// Remove an entry once the package supports TypeScript 7 or TypeScript 7.1 +// ships its API. +const TYPESCRIPT6_API = "npm:@typescript/typescript6@6.0.2"; +const NEEDS_TYPESCRIPT6_API = new Set([ + // `@sentry/api/source-analysis`, used by CLI command-analysis scripts. + "@sentry/api", +]); + +function readPackage(pkg) { + if (NEEDS_TYPESCRIPT6_API.has(pkg.name) && pkg.peerDependencies?.typescript) { + delete pkg.peerDependencies.typescript; + delete pkg.peerDependenciesMeta?.typescript; + pkg.dependencies = { ...pkg.dependencies, typescript: TYPESCRIPT6_API }; + } + return pkg; +} + +module.exports = { hooks: { readPackage } }; diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 0ef1e247fd..a61ef79edb 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["oxc.oxc-vscode"], + "recommendations": ["oxc.oxc-vscode", "TypeScriptTeam.native-preview"], "unwantedRecommendations": [] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 8daad2ef75..fca4578e6f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,6 +2,8 @@ "editor.defaultFormatter": "oxc.oxc-vscode", "editor.formatOnSave": true, "editor.formatOnSaveMode": "file", + "js/ts.experimental.useTsgo": true, + "js/ts.tsdk.path": "./node_modules/typescript", "editor.codeActionsOnSave": { "source.fixAll.oxc": "explicit" }, diff --git a/AGENTS.md b/AGENTS.md index 70f06568be..96f4a142d4 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -11,7 +11,7 @@ Toolkit contains the Sentry CLI, the Sentry MCP server, and shared code. Product ## Constraints - **MCP tool count**: `EXPOSE_ALL_TOOLS` lists every tool and relies on harness tool search. The gateway surface it falls back to (`TOP_LEVEL_TOOL_NAMES`) targets ≤20, hard limit 25. -- **Quality gate**: `pnpm run tsc && pnpm run lint && pnpm run test` must pass before committing. +- **Quality gate**: `pnpm run typecheck && pnpm run lint && pnpm run test` must pass before committing. - **Dependency direction**: `sentry` (cli) → `@sentry/mcp-core` → `@sentry/toolkit-core`, and `@sentry/mcp-cloudflare` → `@sentry/mcp-core`; never the reverse. mcp-core and toolkit-core never import the CLI. Inject CLI-only capabilities (SQLite cache, local-file DSN detection, file uploads) through interfaces defined in mcp-core or toolkit-core. `pnpm run lint` enforces this; see docs/architecture/overview.md#package-dependency-direction. - **Lint rules**: Write new lint rules for Oxlint: a built-in rule in `.oxlintrc.json`, or a custom rule in `packages/cli/lint-rules/cli-oxlint-plugin.js`. Do not add ast-grep rules. See docs/contributing/coding-guidelines.md#formatting-and-linting. - **Package CI**: Put checks for one workspace package in its `package.json` scripts and `sentryCi`, which `test.yml` runs per project. Do not add a workflow for them. See docs/operations/github-actions.md#package-ci-checks. @@ -115,7 +115,7 @@ pnpm -w run cli --transport stdio "q" # Test MCP tools pnpm -w run cli --transport stdio --access-token=TOKEN "q" # Quality (run before committing) -pnpm run tsc && pnpm run lint && pnpm run test +pnpm run typecheck && pnpm run lint && pnpm run test # Token overhead pnpm run measure-tokens # Check tool definition size diff --git a/apps/cli-docs/package.json b/apps/cli-docs/package.json index 83b7c34e89..1a2380bfa3 100644 --- a/apps/cli-docs/package.json +++ b/apps/cli-docs/package.json @@ -11,7 +11,8 @@ "build": "astro build", "test": "node --test test/*.test.mjs", "preview": "astro preview", - "deploy": "wrangler deploy" + "deploy": "wrangler deploy", + "typecheck": "astro check" }, "dependencies": { "@astrojs/mdx": "^7.0.8", @@ -25,6 +26,8 @@ "shiki": "^3.21.0" }, "devDependencies": { + "@astrojs/check": "^0.9.12", + "typescript": "catalog:astro-check", "wrangler": "catalog:" } } diff --git a/apps/docs-mcp/package.json b/apps/docs-mcp/package.json index b0f6a6ee4f..8c74dafaf1 100644 --- a/apps/docs-mcp/package.json +++ b/apps/docs-mcp/package.json @@ -22,8 +22,8 @@ "zod": "^4.6.6" }, "devDependencies": { - "@types/node": "^22", - "typescript": "^5.9.3", + "@types/node": "catalog:", + "typescript": "catalog:", "wrangler": "catalog:", "vitest": "catalog:" } diff --git a/apps/games-api/package.json b/apps/games-api/package.json index 946e885fd2..c0f8bc841c 100644 --- a/apps/games-api/package.json +++ b/apps/games-api/package.json @@ -11,7 +11,7 @@ "test": "vitest run", "test:ci": "vitest run --reporter=default --reporter=junit --outputFile=tests.junit.xml", "test:watch": "vitest", - "tsc": "tsc --noEmit" + "typecheck": "tsc --noEmit && tsc -p tsconfig.node.json --noEmit" }, "dependencies": { "@sentry/cloudflare": "catalog:", @@ -21,6 +21,7 @@ }, "devDependencies": { "@cloudflare/workers-types": "catalog:", + "@types/node": "catalog:", "typescript": "catalog:", "vitest": "catalog:", "wrangler": "catalog:" diff --git a/apps/local/package.json b/apps/local/package.json index 5e4d07877d..32e7c20427 100644 --- a/apps/local/package.json +++ b/apps/local/package.json @@ -5,12 +5,12 @@ "type": "module", "scripts": { "dev": "vite", - "build": "tsc -b && vite build", + "build": "tsc -b tsconfig.app.json tsconfig.node.json && vite build", "lint": "pnpm -w exec oxlint --report-unused-disable-directives apps/local", "preview": "vite preview", "test": "pnpm --filter sentry exec node script/ensure-generated.mjs schema grammar && vitest run", "test:integration": "pnpm run test src/App.integration.test.tsx", - "typecheck": "tsc -b", + "typecheck": "pnpm --filter sentry exec node script/ensure-generated.mjs && tsc -b", "sample": "node --experimental-strip-types --import ../../scripts/strip-types-resolve.mjs scripts/replay.ts" }, "engines": { @@ -45,14 +45,16 @@ "valibot": "catalog:" }, "devDependencies": { + "@rolldown/plugin-babel": "^0.3.1", "@testing-library/react": "^16.3.2", + "@types/convert-source-map": "^2.0.3", "@types/node": "^24.13.3", "@types/react": "^19.2.18", "@types/react-dom": "^19.2.4", - "@vitejs/plugin-react": "^6.1.0", + "@vitejs/plugin-react": "^6.3.0", "eventsource": "^4.1.0", "jsdom": "^28.1.0", - "oxlint": "^1.79.0", + "oxlint": "catalog:", "typescript": "catalog:", "vite": "^8.3.3", "vitest": "catalog:" diff --git a/package.json b/package.json index 01dca39938..ed8c0e7dec 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "private": true, "type": "module", - "packageManager": "pnpm@11.8.0", + "packageManager": "pnpm@12.18.0", "engines": { "node": ">=22.15" }, @@ -23,7 +23,7 @@ }, "scripts": { "docs:check": "node scripts/check-doc-links.mjs", - "test:ci-projects": "node --test scripts/ci-projects.test.mjs scripts/check-workspace-deps.test.mjs scripts/cli-nightly-version.test.mjs scripts/cli-nightly-watchdog.test.mjs scripts/platform-setup-pr.test.mjs scripts/codemod-version-changed.test.mjs scripts/cloudflare-deployment.test.mjs scripts/deploy-workflow.test.mjs scripts/migrate-cloudflare-token.test.mjs scripts/oxc-config.test.mjs scripts/cli-lint-rules.test.mjs scripts/workflow-policy.test.mjs", + "test:ci-projects": "node --test scripts/ci-projects.test.mjs scripts/check-workspace-deps.test.mjs scripts/cli-nightly-version.test.mjs scripts/cli-nightly-watchdog.test.mjs scripts/platform-setup-pr.test.mjs scripts/codemod-version-changed.test.mjs scripts/cloudflare-deployment.test.mjs scripts/deploy-workflow.test.mjs scripts/migrate-cloudflare-token.test.mjs scripts/oxc-config.test.mjs scripts/cli-lint-rules.test.mjs scripts/workflow-policy.test.mjs scripts/tsconfig-policy.test.mjs", "dev": "pnpm --filter '@sentry/mcp-cloudflare...' --if-present run build && dotenv -e .env -e .env.local -- pnpm --parallel --filter @sentry/mcp-cloudflare --filter @sentry/mcp-core --filter @sentry/mcp-server-mocks --if-present run dev", "dev:stdio": "pnpm --filter '@sentry/mcp-core...' --if-present run build 1>&2 && dotenv -e .env -e .env.local -- pnpm --silent --dir packages/cli run cli mcp", "build": "dotenv -e .env -e .env.local -- pnpm -r --filter '!sentry' --filter '!sentry-cli-docs' --if-present run build", @@ -48,11 +48,13 @@ "test": "pnpm run build && dotenv -e .env -e .env.local -- pnpm -r --filter '!@sentry/mcp-smoke-tests' --if-present run test", "test:ci": "pnpm run build && CI=true dotenv -e .env -e .env.local -- pnpm --stream -r run test:ci", "test:watch": "dotenv -e .env -e .env.local -- pnpm -r --parallel --if-present run test:watch", - "tsc": "pnpm run build && pnpm -r --if-present run tsc && pnpm -r --if-present run typecheck" + "tsc": "pnpm run typecheck", + "typecheck": "pnpm run build && pnpm -r --if-present run typecheck" }, "dependencies": { "@ast-grep/cli": "catalog:", "@types/node": "catalog:", + "@typescript/typescript6": "catalog:", "dotenv": "catalog:", "dotenv-cli": "catalog:", "lint-staged": "catalog:", diff --git a/packages/cli/package.json b/packages/cli/package.json index 409d4e116b..fef507a517 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -46,7 +46,7 @@ "version": ">=22.15" } }, - "packageManager": "pnpm@10.11.0", + "packageManager": "pnpm@12.18.0", "sentryCi": { "coverage": "coverage/lcov.info", "npmRuntime": "bundle", @@ -59,7 +59,7 @@ "build": "pnpm --filter @sentry/mcp-core run build && node --experimental-strip-types --import ./script/require-shim.mjs script/generate.ts docs sdk && pnpm ts script/build.ts --single", "build:all": "pnpm --filter @sentry/mcp-core run build && node --experimental-strip-types --import ./script/require-shim.mjs script/generate.ts docs sdk && pnpm ts script/build.ts", "bundle": "pnpm --filter @sentry/mcp-core run build && node --experimental-strip-types --import ./script/require-shim.mjs script/generate.ts docs sdk && pnpm ts script/bundle.ts", - "typecheck": "pnpm --filter @sentry/mcp-core run build && node --experimental-strip-types --import ./script/require-shim.mjs script/generate.ts docs sdk && tsc --noEmit", + "typecheck": "pnpm --filter @sentry/mcp-core run build && node --experimental-strip-types --import ./script/require-shim.mjs script/generate.ts docs sdk && tsc --noEmit -p tsconfig.json && tsc --noEmit -p script && tsc --noEmit -p test", "lint": "pnpm -w exec oxlint --report-unused-disable-directives packages/cli && pnpm -w exec oxfmt --check packages/cli", "lint:fix": "pnpm -w exec oxlint --fix packages/cli && pnpm -w exec oxfmt --write packages/cli", "test": "pnpm run test:unit", @@ -112,12 +112,13 @@ "@stricli/auto-complete": "^1.2.8", "@stricli/core": "1.2.8", "@types/http-cache-semantics": "^4.2.0", - "@types/node": "^22.20.0", + "@types/node": "catalog:", "@types/picomatch": "^4.0.3", "@types/pngjs": "^6.0.5", "@types/qrcode-terminal": "^0.12.2", "@types/semver": "^7.7.1", "@types/yauzl": "3.4.0", + "@typescript/typescript6": "catalog:", "@vitest/coverage-v8": "catalog:", "binpatch": "^0.4.2", "chalk": "^5.6.2", @@ -144,6 +145,7 @@ "string-width": "^8.2.1", "tinyglobby": "^0.2.17", "typescript": "catalog:", + "undici-types": "^6.21.0", "uuidv7": "^1.2.1", "valibot": "^1.4.2", "vitest": "catalog:", diff --git a/packages/cli/patches/@stricli%2Fcore@1.2.8.patch b/packages/cli/patches/@stricli%2Fcore@1.2.8.patch index c8256f2a88..9070a8fe47 100644 --- a/packages/cli/patches/@stricli%2Fcore@1.2.8.patch +++ b/packages/cli/patches/@stricli%2Fcore@1.2.8.patch @@ -1,5 +1,5 @@ diff --git a/dist/index.cjs b/dist/index.cjs -index a9afbc1ab78cad7ba97d53882a80236af62854df..141532779be923b8f3b421b0afc031b5ea209e29 100644 +index a9afbc1..433eefb 100644 --- a/dist/index.cjs +++ b/dist/index.cjs @@ -1277,6 +1277,35 @@ var RouteMapSymbol = Symbol("RouteMap"); @@ -68,7 +68,7 @@ index a9afbc1ab78cad7ba97d53882a80236af62854df..141532779be923b8f3b421b0afc031b5 if (!treatInputsAsArguments) { if (input === "--help" || input === "-h") { helpRequested = true; -@@ -1300,12 +1341,28 @@ function buildRouteScanner(root, config, startingPrefix) { +@@ -1300,12 +1344,28 @@ function buildRouteScanner(root, config, startingPrefix) { target = current; } return; @@ -98,7 +98,7 @@ index a9afbc1ab78cad7ba97d53882a80236af62854df..141532779be923b8f3b421b0afc031b5 } } if (target) { -@@ -1357,6 +1414,7 @@ function buildRouteScanner(root, config, startingPrefix) { +@@ -1357,6 +1417,7 @@ function buildRouteScanner(root, config, startingPrefix) { target, unprocessedInputs, helpRequested, @@ -106,7 +106,7 @@ index a9afbc1ab78cad7ba97d53882a80236af62854df..141532779be923b8f3b421b0afc031b5 prefix, rootLevel, aliases -@@ -1410,16 +1468,6 @@ async function runApplication({ root, defaultText, config }, rawInputs, context) +@@ -1410,16 +1471,6 @@ async function runApplication({ root, defaultText, config }, rawInputs, context) } } const inputs = rawInputs.slice(); @@ -123,7 +123,7 @@ index a9afbc1ab78cad7ba97d53882a80236af62854df..141532779be923b8f3b421b0afc031b5 const scanner = buildRouteScanner(root, config.scanner, [config.name]); let error; while (inputs.length > 0 && !error) { -@@ -1445,7 +1493,37 @@ async function runApplication({ root, defaultText, config }, rawInputs, context) +@@ -1445,7 +1496,37 @@ async function runApplication({ root, defaultText, config }, rawInputs, context) return ExitCode.UnknownCommand; } const result = scanner.finish(); @@ -161,7 +161,7 @@ index a9afbc1ab78cad7ba97d53882a80236af62854df..141532779be923b8f3b421b0afc031b5 const ansiColor = shouldUseAnsiColor(context.process, context.process.stdout, config.documentation); context.process.stdout.write( result.target.formatHelp({ -@@ -1514,6 +1592,9 @@ function withDefaults(config) { +@@ -1514,6 +1595,9 @@ function withDefaults(config) { const scannerConfig = { caseStyle: scannerCaseStyle, allowArgumentEscapeSequence: config.scanner?.allowArgumentEscapeSequence ?? false, @@ -171,7 +171,7 @@ index a9afbc1ab78cad7ba97d53882a80236af62854df..141532779be923b8f3b421b0afc031b5 distanceOptions: config.scanner?.distanceOptions ?? { threshold: 7, weights: { -@@ -1529,7 +1610,10 @@ function withDefaults(config) { +@@ -1529,7 +1613,10 @@ function withDefaults(config) { useAliasInUsageLine: config.documentation?.useAliasInUsageLine ?? false, onlyRequiredInUsageLine: config.documentation?.onlyRequiredInUsageLine ?? false, caseStyle: displayCaseStyle, @@ -183,7 +183,7 @@ index a9afbc1ab78cad7ba97d53882a80236af62854df..141532779be923b8f3b421b0afc031b5 }; const completionConfig = { includeAliases: config.completion?.includeAliases ?? documentationConfig.useAliasInUsageLine, -@@ -1881,7 +1965,7 @@ function formatDocumentationForFlagParameters(flags, aliases, args) { +@@ -1881,7 +1968,7 @@ function formatDocumentationForFlagParameters(flags, aliases, args) { if (args.includeHelpAllFlag) { const helpAllFlagName = formatForDisplay("helpAll", args.config.caseStyle); rows.push({ @@ -192,7 +192,7 @@ index a9afbc1ab78cad7ba97d53882a80236af62854df..141532779be923b8f3b421b0afc031b5 flagName: atLeastOneOptional ? ` --${helpAllFlagName}` : `--${helpAllFlagName}`, brief: briefs.helpAll, hidden: !args.config.alwaysShowHelpAllFlag -@@ -1920,7 +2004,7 @@ function* generateBuiltInFlagUsageLines(args) { +@@ -1920,7 +2007,7 @@ function* generateBuiltInFlagUsageLines(args) { yield args.config.useAliasInUsageLine ? "-h" : "--help"; if (args.includeHelpAllFlag) { const helpAllFlagName = formatForDisplay("helpAll", args.config.caseStyle); @@ -201,7 +201,7 @@ index a9afbc1ab78cad7ba97d53882a80236af62854df..141532779be923b8f3b421b0afc031b5 } if (args.includeVersionFlag) { yield args.config.useAliasInUsageLine ? "-v" : "--version"; -@@ -2057,7 +2141,7 @@ function checkForInvalidVariadicSeparators(flags) { +@@ -2057,7 +2144,7 @@ function checkForInvalidVariadicSeparators(flags) { function buildCommand(builderArgs) { const { flags = {}, aliases = {} } = builderArgs.parameters; checkForReservedFlags(flags, ["help", "helpAll", "help-all"]); @@ -211,10 +211,21 @@ index a9afbc1ab78cad7ba97d53882a80236af62854df..141532779be923b8f3b421b0afc031b5 checkForInvalidVariadicSeparators(flags); let loader; diff --git a/dist/index.d.cts b/dist/index.d.cts -index 111d1fd9e926f23b71359a692cd2e9e05ebf379e..1714047c8cf7d46e38062bab670451851709a7e2 100644 +index 111d1fd..bc2bb46 100644 --- a/dist/index.d.cts +++ b/dist/index.d.cts -@@ -402,6 +402,25 @@ interface ScannerConfiguration { +@@ -42,7 +42,9 @@ interface StricliProcess extends WritableStreams { + /** + * A number which will be the process exit code. + */ +- exitCode?: number | string | null; ++ // PATCH(getsentry/cli): accept `undefined`, as Node's `process.exitCode` ++ // does, so `NodeJS.Process` satisfies this under exactOptionalPropertyTypes. ++ exitCode?: number | string | null | undefined; + } + /** + * Environment variable names used by Stricli. +@@ -402,6 +404,25 @@ interface ScannerConfiguration { * Default value is `false` */ readonly allowArgumentEscapeSequence: boolean; @@ -240,7 +251,7 @@ index 111d1fd9e926f23b71359a692cd2e9e05ebf379e..1714047c8cf7d46e38062bab67045185 /** * Options used when calculating distance for alternative inputs ("did you mean?"). * -@@ -470,6 +489,28 @@ interface DocumentationConfiguration { +@@ -470,6 +491,28 @@ interface DocumentationConfiguration { * Defaults to `false`. */ readonly disableAnsiColor: boolean; @@ -269,11 +280,44 @@ index 111d1fd9e926f23b71359a692cd2e9e05ebf379e..1714047c8cf7d46e38062bab67045185 } /** * Configuration for controlling the behavior of completion proposals. +@@ -645,7 +688,9 @@ interface OptionalBooleanFlagParameter extends BaseBooleanFlagParameter { + * Optional parameters should not have default values. + * This flag should be required if a value will always be provided. + */ +- readonly default?: undefined; ++ // PATCH(getsentry/cli): `never` instead of `undefined`, so this still ++ // extends the base `default?: T` under exactOptionalPropertyTypes (TS2430). ++ readonly default?: never; + } + type BooleanFlagParameter = RequiredBooleanFlagParameter | OptionalBooleanFlagParameter; + interface BaseCounterFlagParameter extends BaseFlagParameter { +@@ -824,7 +869,9 @@ interface OptionalParsedFlagParameter extends + * Optional parameters should not have default values. + * This flag should be required if a value will always be provided. + */ +- readonly default?: undefined; ++ // PATCH(getsentry/cli): `never` instead of `undefined`, so this still ++ // extends the base `default?: T` under exactOptionalPropertyTypes (TS2430). ++ readonly default?: never; + /** + * Parameter does not extend array and cannot be set as variadic. + */ diff --git a/dist/index.d.ts b/dist/index.d.ts -index 111d1fd9e926f23b71359a692cd2e9e05ebf379e..1714047c8cf7d46e38062bab670451851709a7e2 100644 +index 111d1fd..bc2bb46 100644 --- a/dist/index.d.ts +++ b/dist/index.d.ts -@@ -402,6 +402,25 @@ interface ScannerConfiguration { +@@ -42,7 +42,9 @@ interface StricliProcess extends WritableStreams { + /** + * A number which will be the process exit code. + */ +- exitCode?: number | string | null; ++ // PATCH(getsentry/cli): accept `undefined`, as Node's `process.exitCode` ++ // does, so `NodeJS.Process` satisfies this under exactOptionalPropertyTypes. ++ exitCode?: number | string | null | undefined; + } + /** + * Environment variable names used by Stricli. +@@ -402,6 +404,25 @@ interface ScannerConfiguration { * Default value is `false` */ readonly allowArgumentEscapeSequence: boolean; @@ -299,7 +343,7 @@ index 111d1fd9e926f23b71359a692cd2e9e05ebf379e..1714047c8cf7d46e38062bab67045185 /** * Options used when calculating distance for alternative inputs ("did you mean?"). * -@@ -470,6 +489,28 @@ interface DocumentationConfiguration { +@@ -470,6 +491,28 @@ interface DocumentationConfiguration { * Defaults to `false`. */ readonly disableAnsiColor: boolean; @@ -328,8 +372,30 @@ index 111d1fd9e926f23b71359a692cd2e9e05ebf379e..1714047c8cf7d46e38062bab67045185 } /** * Configuration for controlling the behavior of completion proposals. +@@ -645,7 +688,9 @@ interface OptionalBooleanFlagParameter extends BaseBooleanFlagParameter { + * Optional parameters should not have default values. + * This flag should be required if a value will always be provided. + */ +- readonly default?: undefined; ++ // PATCH(getsentry/cli): `never` instead of `undefined`, so this still ++ // extends the base `default?: T` under exactOptionalPropertyTypes (TS2430). ++ readonly default?: never; + } + type BooleanFlagParameter = RequiredBooleanFlagParameter | OptionalBooleanFlagParameter; + interface BaseCounterFlagParameter extends BaseFlagParameter { +@@ -824,7 +869,9 @@ interface OptionalParsedFlagParameter extends + * Optional parameters should not have default values. + * This flag should be required if a value will always be provided. + */ +- readonly default?: undefined; ++ // PATCH(getsentry/cli): `never` instead of `undefined`, so this still ++ // extends the base `default?: T` under exactOptionalPropertyTypes (TS2430). ++ readonly default?: never; + /** + * Parameter does not extend array and cannot be set as variadic. + */ diff --git a/dist/index.js b/dist/index.js -index f76639637e812453d107bda3e3ec165fc195f4d8..eff534dc79cdbe5bf8ee14839157b6d87c52de17 100644 +index f766396..63d3a08 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1229,6 +1229,35 @@ var RouteMapSymbol = Symbol("RouteMap"); @@ -398,7 +464,7 @@ index f76639637e812453d107bda3e3ec165fc195f4d8..eff534dc79cdbe5bf8ee14839157b6d8 if (!treatInputsAsArguments) { if (input === "--help" || input === "-h") { helpRequested = true; -@@ -1252,12 +1293,28 @@ function buildRouteScanner(root, config, startingPrefix) { +@@ -1252,12 +1296,28 @@ function buildRouteScanner(root, config, startingPrefix) { target = current; } return; @@ -428,7 +494,7 @@ index f76639637e812453d107bda3e3ec165fc195f4d8..eff534dc79cdbe5bf8ee14839157b6d8 } } if (target) { -@@ -1309,6 +1366,7 @@ function buildRouteScanner(root, config, startingPrefix) { +@@ -1309,6 +1369,7 @@ function buildRouteScanner(root, config, startingPrefix) { target, unprocessedInputs, helpRequested, @@ -436,7 +502,7 @@ index f76639637e812453d107bda3e3ec165fc195f4d8..eff534dc79cdbe5bf8ee14839157b6d8 prefix, rootLevel, aliases -@@ -1362,16 +1420,6 @@ async function runApplication({ root, defaultText, config }, rawInputs, context) +@@ -1362,16 +1423,6 @@ async function runApplication({ root, defaultText, config }, rawInputs, context) } } const inputs = rawInputs.slice(); @@ -453,7 +519,7 @@ index f76639637e812453d107bda3e3ec165fc195f4d8..eff534dc79cdbe5bf8ee14839157b6d8 const scanner = buildRouteScanner(root, config.scanner, [config.name]); let error; while (inputs.length > 0 && !error) { -@@ -1397,7 +1445,37 @@ async function runApplication({ root, defaultText, config }, rawInputs, context) +@@ -1397,7 +1448,37 @@ async function runApplication({ root, defaultText, config }, rawInputs, context) return ExitCode.UnknownCommand; } const result = scanner.finish(); @@ -491,7 +557,7 @@ index f76639637e812453d107bda3e3ec165fc195f4d8..eff534dc79cdbe5bf8ee14839157b6d8 const ansiColor = shouldUseAnsiColor(context.process, context.process.stdout, config.documentation); context.process.stdout.write( result.target.formatHelp({ -@@ -1466,6 +1544,9 @@ function withDefaults(config) { +@@ -1466,6 +1547,9 @@ function withDefaults(config) { const scannerConfig = { caseStyle: scannerCaseStyle, allowArgumentEscapeSequence: config.scanner?.allowArgumentEscapeSequence ?? false, @@ -501,7 +567,7 @@ index f76639637e812453d107bda3e3ec165fc195f4d8..eff534dc79cdbe5bf8ee14839157b6d8 distanceOptions: config.scanner?.distanceOptions ?? { threshold: 7, weights: { -@@ -1481,7 +1562,10 @@ function withDefaults(config) { +@@ -1481,7 +1565,10 @@ function withDefaults(config) { useAliasInUsageLine: config.documentation?.useAliasInUsageLine ?? false, onlyRequiredInUsageLine: config.documentation?.onlyRequiredInUsageLine ?? false, caseStyle: displayCaseStyle, @@ -513,7 +579,7 @@ index f76639637e812453d107bda3e3ec165fc195f4d8..eff534dc79cdbe5bf8ee14839157b6d8 }; const completionConfig = { includeAliases: config.completion?.includeAliases ?? documentationConfig.useAliasInUsageLine, -@@ -1833,7 +1917,7 @@ function formatDocumentationForFlagParameters(flags, aliases, args) { +@@ -1833,7 +1920,7 @@ function formatDocumentationForFlagParameters(flags, aliases, args) { if (args.includeHelpAllFlag) { const helpAllFlagName = formatForDisplay("helpAll", args.config.caseStyle); rows.push({ @@ -522,7 +588,7 @@ index f76639637e812453d107bda3e3ec165fc195f4d8..eff534dc79cdbe5bf8ee14839157b6d8 flagName: atLeastOneOptional ? ` --${helpAllFlagName}` : `--${helpAllFlagName}`, brief: briefs.helpAll, hidden: !args.config.alwaysShowHelpAllFlag -@@ -1872,7 +1956,7 @@ function* generateBuiltInFlagUsageLines(args) { +@@ -1872,7 +1959,7 @@ function* generateBuiltInFlagUsageLines(args) { yield args.config.useAliasInUsageLine ? "-h" : "--help"; if (args.includeHelpAllFlag) { const helpAllFlagName = formatForDisplay("helpAll", args.config.caseStyle); @@ -531,7 +597,7 @@ index f76639637e812453d107bda3e3ec165fc195f4d8..eff534dc79cdbe5bf8ee14839157b6d8 } if (args.includeVersionFlag) { yield args.config.useAliasInUsageLine ? "-v" : "--version"; -@@ -2009,7 +2093,7 @@ function checkForInvalidVariadicSeparators(flags) { +@@ -2009,7 +2096,7 @@ function checkForInvalidVariadicSeparators(flags) { function buildCommand(builderArgs) { const { flags = {}, aliases = {} } = builderArgs.parameters; checkForReservedFlags(flags, ["help", "helpAll", "help-all"]); diff --git a/packages/logger/package.json b/packages/logger/package.json index cbb12de6a7..36d24eb15f 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -60,8 +60,8 @@ "build": "tsdown", "test": "vitest run", "test:ci": "vitest run --reporter=default --reporter=junit --outputFile=tests.junit.xml", - "test:package": "bash test/package/check.sh", - "tsc": "tsc --noEmit" + "test:package": "sh test/package/check.sh", + "typecheck": "tsc --noEmit" }, "devDependencies": { "@types/node": "catalog:", diff --git a/packages/mcp-cloudflare/package.json b/packages/mcp-cloudflare/package.json index 1357edddcd..6f543a5946 100644 --- a/packages/mcp-cloudflare/package.json +++ b/packages/mcp-cloudflare/package.json @@ -27,7 +27,7 @@ "test": "vitest run", "test:ci": "vitest run --reporter=default --reporter=junit --outputFile=tests.junit.xml", "test:watch": "vitest", - "tsc": "tsc --noEmit" + "typecheck": "tsc -b" }, "devDependencies": { "@cloudflare/vite-plugin": "catalog:", @@ -39,6 +39,7 @@ "@sentry/vite-plugin": "catalog:", "@tailwindcss/typography": "catalog:", "@tailwindcss/vite": "catalog:", + "@types/node": "catalog:", "@types/react": "catalog:", "@types/react-dom": "catalog:", "@types/react-scroll-to-bottom": "^4.2.5", diff --git a/packages/mcp-core/package.json b/packages/mcp-core/package.json index 0d96006b43..ec8c1cf9fe 100644 --- a/packages/mcp-core/package.json +++ b/packages/mcp-core/package.json @@ -3,7 +3,7 @@ "version": "0.42.0", "type": "module", "private": true, - "packageManager": "pnpm@11.8.0", + "packageManager": "pnpm@12.18.0", "engines": { "node": ">=22.13" }, @@ -101,10 +101,6 @@ "types": "./dist/tools/search-issue-events/agent.d.ts", "default": "./dist/tools/search-issue-events/agent.js" }, - "./tools/agent-tools": { - "types": "./dist/tools/agent-tools.d.ts", - "default": "./dist/tools/agent-tools.js" - }, "./internal/agents/callEmbeddedAgent": { "types": "./dist/internal/agents/callEmbeddedAgent.d.ts", "default": "./dist/internal/agents/callEmbeddedAgent.js" @@ -158,7 +154,7 @@ "test": "pnpm run validate-skills && vitest run", "test:ci": "pnpm run generate-definitions && pnpm run validate-skills && vitest run --reporter=default --reporter=junit --outputFile=tests.junit.xml", "test:watch": "pnpm run generate-definitions && vitest", - "tsc": "tsc --noEmit", + "typecheck": "tsc --noEmit && tsc --noEmit -p tsconfig.scripts.json", "generate-definitions": "node --experimental-strip-types --import ../../scripts/strip-types-resolve.mjs scripts/generate-definitions.ts && oxfmt --write src/toolDefinitions.json src/skillDefinitions.json", "generate-platform-setup": "node --experimental-strip-types --import ../../scripts/strip-types-resolve.mjs scripts/generate-platform-setup.ts && oxfmt --write src/tools/support/project-setup/platforms.json", "generate-otel-namespaces": "node --experimental-strip-types --import ../../scripts/strip-types-resolve.mjs scripts/generate-otel-namespaces.ts", diff --git a/packages/mcp-server-evals/package.json b/packages/mcp-server-evals/package.json index b83253c3d9..19edac71f1 100644 --- a/packages/mcp-server-evals/package.json +++ b/packages/mcp-server-evals/package.json @@ -12,7 +12,8 @@ "dev": "tsc -w", "start": "node --experimental-strip-types --import ../../scripts/strip-types-resolve.mjs src/bin/start-mock-stdio.ts", "eval": "vitest --config=vitest.config.ts", - "eval:ci": "vitest run --reporter=vitest-evals/reporter --reporter=junit --reporter=json --outputFile.json=eval-results.json --outputFile.junit=eval.junit.xml" + "eval:ci": "vitest run --reporter=vitest-evals/reporter --reporter=junit --reporter=json --outputFile.json=eval-results.json --outputFile.junit=eval.junit.xml", + "typecheck": "tsc --noEmit && tsc -p tsconfig.node.json" }, "dependencies": { "@ai-sdk/mcp": "catalog:", diff --git a/packages/mcp-server-mocks/package.json b/packages/mcp-server-mocks/package.json index 755ddf7abe..4f974f5261 100644 --- a/packages/mcp-server-mocks/package.json +++ b/packages/mcp-server-mocks/package.json @@ -23,9 +23,11 @@ }, "scripts": { "build": "tsdown", - "dev": "tsdown -w" + "dev": "tsdown -w", + "typecheck": "tsc --noEmit && tsc -p tsconfig.node.json" }, "devDependencies": { + "@types/node": "catalog:", "tsdown": "catalog:" }, "dependencies": { diff --git a/packages/mcp-server/package.json b/packages/mcp-server/package.json index 17b8299ffb..56f6c3a78e 100644 --- a/packages/mcp-server/package.json +++ b/packages/mcp-server/package.json @@ -11,7 +11,7 @@ ] }, "type": "module", - "packageManager": "pnpm@11.8.0", + "packageManager": "pnpm@12.18.0", "engines": { "node": ">=22.15" }, @@ -41,7 +41,8 @@ ], "scripts": { "bundle": "pnpm --filter @sentry/mcp-core run build && pnpm --filter sentry run generate && node --experimental-strip-types --import ../../scripts/strip-types-resolve.mjs script/bundle.ts", - "test:bundle": "node --test test/bundle.test.mjs test/server-json.test.mjs" + "test:bundle": "node --test test/bundle.test.mjs test/server-json.test.mjs", + "typecheck": "tsc" }, "devDependencies": { "esbuild": "^0.28.1" diff --git a/packages/smoke-tests/package.json b/packages/smoke-tests/package.json index 569fb97f6d..34ce67da8c 100644 --- a/packages/smoke-tests/package.json +++ b/packages/smoke-tests/package.json @@ -1,10 +1,10 @@ { "name": "@sentry/mcp-smoke-tests", "sentryCi": { - "enabled": false, "roles": [ "smoke" - ] + ], + "test": false }, "version": "0.42.0", "private": true, @@ -12,7 +12,8 @@ "scripts": { "test": "vitest run", "test:ci": "vitest run --reporter=default --reporter=junit --outputFile=tests.junit.xml", - "test:watch": "vitest" + "test:watch": "vitest", + "typecheck": "tsc" }, "devDependencies": { "vitest": "catalog:", diff --git a/packages/toolkit-core/package.json b/packages/toolkit-core/package.json index 575fbf9d8c..2675eb6acc 100644 --- a/packages/toolkit-core/package.json +++ b/packages/toolkit-core/package.json @@ -71,13 +71,14 @@ "scripts": { "test": "vitest run", "test:ci": "vitest run --reporter=default --reporter=junit --outputFile=tests.junit.xml", - "tsc": "tsc --noEmit && tsc -p tsconfig.browser.json" + "typecheck": "tsc --noEmit && tsc -p tsconfig.browser.json" }, "dependencies": { "@sentry/api": "catalog:", "@sentry/search-syntax": "catalog:" }, "devDependencies": { + "@types/node": "catalog:", "fast-check": "^4.8.0", "marked": "catalog:", "mdast-util-from-markdown": "catalog:", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 71a54645ea..18a4f78ac0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,3 +1,161 @@ +--- +lockfileVersion: '9.0' + +importers: + + .: + configDependencies: {} + packageManagerDependencies: + pnpm: + specifier: 12.18.0 + version: 12.18.0 + +packages: + + '@pnpm/exe.android-arm64@12.18.0': + resolution: {integrity: sha512-fOF6IwgvnUKEmVedGqiAsNPfN2Ry8GvaqzSQOiF3RJFbpBfPKO/6YT54s1GjToyYinRxw9preHHPe4y2N3SzhA==} + cpu: [arm64] + os: [android] + + '@pnpm/exe.android-x64@12.18.0': + resolution: {integrity: sha512-6OiolnaCsB3/GcJ9XNrenbUH3zFHRJ+5QynrMUUEyThbgnnCzWxa199hpQlOmxN4rAXuYQ0IYgWFNUZxyzg31Q==} + cpu: [x64] + os: [android] + + '@pnpm/exe.darwin-arm64@12.18.0': + resolution: {integrity: sha512-zkq+4YzVIX39ETYLyC3W7LY7MpHEU/J3nRhHl4i2yPld2Cf2+rEKRh3ejJ4AmaQ77HHJLCktY4Z3jq0fpcxFXg==} + cpu: [arm64] + os: [darwin] + + '@pnpm/exe.darwin-x64@12.18.0': + resolution: {integrity: sha512-qMsL9qx92unOTa6hgkfiTJv8ceZaTx0IQg7InhYDVX2ZrTECujaVEEVypnJK5m3eGUsP1KD7Y4qIgleCwfRsYw==} + cpu: [x64] + os: [darwin] + + '@pnpm/exe.freebsd-x64@12.18.0': + resolution: {integrity: sha512-/9vy/4ms52cU4MjZ5NhHd6N2d9L9W0kARf5/ff2tweAHu0VeUzs/0qp/7ZHFuddm2Wa/m0AKQoPum9AVUCqKsw==} + cpu: [x64] + os: [freebsd] + + '@pnpm/exe.linux-arm64-musl@12.18.0': + resolution: {integrity: sha512-Vp+TIMPPyackVCXkOdEKH/RmAn/r07EcIyrgZYQK7VrkksqZOie0GnWIx+85mPqeFEYCRtXIZAFJ9L4ceTndDg==} + cpu: [arm64] + os: [linux] + libc: [musl] + + '@pnpm/exe.linux-arm64@12.18.0': + resolution: {integrity: sha512-2dpyVBCHT+FfpuQh9i+7MXAqNWYLCvD5vYr5p6Eimxoga8USLnjbUgyj72AOrO0hjc5ri3TEFP3jiyBHjkSZpQ==} + cpu: [arm64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-ppc64@12.18.0': + resolution: {integrity: sha512-BBOOOfNJ2QwIIya3eKqOjiN4WNTszfRz7HCvw9XggcT7+ftMjNP8XJ/GfW+ltCBeUFR9d8WBVsr2m/NLjX2CZQ==} + cpu: [ppc64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-riscv64@12.18.0': + resolution: {integrity: sha512-7kMN77xSOYJX8GPSH5RbNAc5oM61LMmcSUukDDUwllnZPXm8GRPskCNsTWy8SCw01Kr1FB+5SwGNMiTdiziLNQ==} + cpu: [riscv64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-s390x@12.18.0': + resolution: {integrity: sha512-htuSCpEcmDzhKoJqXbPkvfr176dBHU0QIF5mWcRiqxRXAB/1JoYiMYotfjWpk+ztgpB9qlx4XnWlLFAf7gzc6g==} + cpu: [s390x] + os: [linux] + libc: [glibc] + + '@pnpm/exe.linux-x64-musl@12.18.0': + resolution: {integrity: sha512-Uj+vzfIQ62kDP10x36yHZIXVs5ohdNtiPYwn5FhCLlNScHPo0OAI+ShGDtLofiBXKE7umu71Jmjm7N8a8zVcDw==} + cpu: [x64] + os: [linux] + libc: [musl] + + '@pnpm/exe.linux-x64@12.18.0': + resolution: {integrity: sha512-OJ+X2wcraldCwj75pCIerWARQSRpdfj0eBTs/2ODyhfeW46ylOnjTIE/GKra6Mn6E72/gBmXS8igrUioa+F9fQ==} + cpu: [x64] + os: [linux] + libc: [glibc] + + '@pnpm/exe.win32-arm64@12.18.0': + resolution: {integrity: sha512-wEY6jiACGcbhhi5yD59doHqNTndS7AaujaPmtWAu1DKkHru2hy5fJ9yUGecW72Ypaw2/I3BEprfMOopap2NQtw==} + cpu: [arm64] + os: [win32] + + '@pnpm/exe.win32-x64@12.18.0': + resolution: {integrity: sha512-5FJkghO7RLRkQpWxeVEygW9XsmnNuxzPfXbgwFWCHsFyFhpDn/vOdL88ToQEM0Kt5igdW5s6U0/IDH8Dvkt3pg==} + cpu: [x64] + os: [win32] + + pnpm@12.18.0: + resolution: {integrity: sha512-nXiC1dyCFH7PxOBiqjSDTgrQKWcQoYN6ERWuASEn02txCeMhrBWYod0KZVl2gbHpmRfhLtDXSerpEYeUM2O+sw==} + engines: {node: '>=18'} + hasBin: true + +snapshots: + + '@pnpm/exe.android-arm64@12.18.0': + optional: true + + '@pnpm/exe.android-x64@12.18.0': + optional: true + + '@pnpm/exe.darwin-arm64@12.18.0': + optional: true + + '@pnpm/exe.darwin-x64@12.18.0': + optional: true + + '@pnpm/exe.freebsd-x64@12.18.0': + optional: true + + '@pnpm/exe.linux-arm64-musl@12.18.0': + optional: true + + '@pnpm/exe.linux-arm64@12.18.0': + optional: true + + '@pnpm/exe.linux-ppc64@12.18.0': + optional: true + + '@pnpm/exe.linux-riscv64@12.18.0': + optional: true + + '@pnpm/exe.linux-s390x@12.18.0': + optional: true + + '@pnpm/exe.linux-x64-musl@12.18.0': + optional: true + + '@pnpm/exe.linux-x64@12.18.0': + optional: true + + '@pnpm/exe.win32-arm64@12.18.0': + optional: true + + '@pnpm/exe.win32-x64@12.18.0': + optional: true + + pnpm@12.18.0: + optionalDependencies: + '@pnpm/exe.android-arm64': 12.18.0 + '@pnpm/exe.android-x64': 12.18.0 + '@pnpm/exe.darwin-arm64': 12.18.0 + '@pnpm/exe.darwin-x64': 12.18.0 + '@pnpm/exe.freebsd-x64': 12.18.0 + '@pnpm/exe.linux-arm64': 12.18.0 + '@pnpm/exe.linux-arm64-musl': 12.18.0 + '@pnpm/exe.linux-ppc64': 12.18.0 + '@pnpm/exe.linux-riscv64': 12.18.0 + '@pnpm/exe.linux-s390x': 12.18.0 + '@pnpm/exe.linux-x64': 12.18.0 + '@pnpm/exe.linux-x64-musl': 12.18.0 + '@pnpm/exe.win32-arm64': 12.18.0 + '@pnpm/exe.win32-x64': 12.18.0 + +--- lockfileVersion: '9.0' settings: @@ -5,6 +163,10 @@ settings: excludeLinksFromLockfile: false catalogs: + astro-check: + typescript: + specifier: 6.0.3 + version: 6.0.3 default: '@ai-sdk/anthropic': specifier: ^3.0.137 @@ -19,8 +181,8 @@ catalogs: specifier: ^3.0.232 version: 3.0.232 '@ast-grep/cli': - specifier: ^0.43.0 - version: 0.43.0 + specifier: ^0.51.2 + version: 0.51.3 '@cloudflare/vite-plugin': specifier: 1.67.0 version: 1.67.0 @@ -73,19 +235,22 @@ catalogs: specifier: ^4.3.3 version: 4.3.3 '@types/node': - specifier: ^22.15.33 - version: 22.16.0 + specifier: ^22.20.3 + version: 22.20.3 '@types/react': specifier: ^19.1.8 version: 19.1.8 '@types/react-dom': specifier: ^19.1.6 version: 19.1.6 + '@typescript/typescript6': + specifier: 6.0.2 + version: 6.0.2 '@vitejs/plugin-react': specifier: ^4.6.0 version: 4.6.0 '@vitest/coverage-v8': - specifier: ^5.0.5 + specifier: ~5.0.5 version: 5.0.5 agents: specifier: 0.32.0 @@ -115,8 +280,8 @@ catalogs: specifier: ^4.13.16 version: 4.13.18 lint-staged: - specifier: ^15.5.2 - version: 15.5.2 + specifier: ^16.4.0 + version: 16.4.0 lucide-react: specifier: ^0.503.0 version: 0.503.0 @@ -136,20 +301,20 @@ catalogs: specifier: 5.20261101.0-beta version: 5.20261101.0-beta msw: - specifier: ^2.10.2 - version: 2.10.2 + specifier: ^2.15.0 + version: 2.15.0 open: specifier: ^10.1.2 version: 10.1.2 oxfmt: - specifier: 0.72.0 - version: 0.72.0 + specifier: 0.78.0 + version: 0.78.0 oxlint: - specifier: 1.87.0 - version: 1.87.0 + specifier: 1.93.0 + version: 1.93.0 oxlint-tsgolint: - specifier: 7.0.2004 - version: 7.0.2004 + specifier: 7.0.2007 + version: 7.0.2007 react: specifier: ^19.2.8 version: 19.2.8 @@ -163,8 +328,8 @@ catalogs: specifier: ^4.0.1 version: 4.0.1 simple-git-hooks: - specifier: ^2.13.1 - version: 2.13.1 + specifier: ^2.14.0 + version: 2.14.0 tailwind-merge: specifier: ^3.3.1 version: 3.3.1 @@ -172,14 +337,14 @@ catalogs: specifier: ^4.3.3 version: 4.3.3 tsdown: - specifier: ^0.12.9 - version: 0.12.9 + specifier: ^0.23.7 + version: 0.23.7 tw-animate-css: specifier: ^1.3.4 version: 1.3.5 typescript: - specifier: ^5.9.3 - version: 5.9.3 + specifier: ^7.0.2 + version: 7.0.2 valibot: specifier: ^1.4.2 version: 1.4.2 @@ -187,7 +352,7 @@ catalogs: specifier: ^6.4.5 version: 6.4.5 vitest: - specifier: ^5.0.5 + specifier: ~5.0.5 version: 5.0.5 vitest-evals: specifier: ^0.18.0 @@ -219,9 +384,11 @@ overrides: packageExtensionsChecksum: sha256-PIoL2jn0sFpFHgcMKW97dNeqBXVNxH6qFIzsWIBFOMY= +pnpmfileChecksum: sha256-1htpKjHU5u44S3mCFE1Y//LzpIIU/D926HMC9+7+mtQ= + patchedDependencies: '@cloudflare/workers-oauth-provider@0.10.3': 34910b67929c1888b1492384c514d6baeedc4a439f66e21375dee5af404834f8 - '@stricli/core@1.2.8': cbf047581d38be04108d3921321c14a778272c24004da8110d4498d4f2a6b2e1 + '@stricli/core@1.2.8': c1d70807ac8f612d2e942650da25753076478898ece26cbdef5af377bedcbadc importers: @@ -229,10 +396,13 @@ importers: dependencies: '@ast-grep/cli': specifier: 'catalog:' - version: 0.43.0 + version: 0.51.3 '@types/node': specifier: 'catalog:' - version: 22.16.0 + version: 22.20.3 + '@typescript/typescript6': + specifier: 'catalog:' + version: 6.0.2 dotenv: specifier: 'catalog:' version: 16.6.1 @@ -241,34 +411,34 @@ importers: version: 8.0.0 lint-staged: specifier: 'catalog:' - version: 15.5.2 + version: 16.4.0 oxfmt: specifier: 'catalog:' - version: 0.72.0 + version: 0.78.0(@astrojs/compiler-rs@0.5.3) oxlint: specifier: 'catalog:' - version: 1.87.0(oxlint-tsgolint@7.0.2004) + version: 1.93.0(oxlint-tsgolint@7.0.2007) oxlint-tsgolint: specifier: 'catalog:' - version: 7.0.2004 + version: 7.0.2007 peggy: specifier: ^5.1.0 version: 5.1.0 simple-git-hooks: specifier: 'catalog:' - version: 2.13.1 + version: 2.14.0 tsdown: specifier: 'catalog:' - version: 0.12.9(typescript@5.9.3) + version: 0.23.7(tsx@4.23.13)(typescript@7.0.2) typescript: specifier: 'catalog:' - version: 5.9.3 + version: 7.0.2 valibot: specifier: 'catalog:' - version: 1.4.2(typescript@5.9.3) + version: 1.4.2(typescript@7.0.2) vitest: specifier: 'catalog:' - version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.16.0)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@22.16.0)(typescript@5.9.3))(vite@8.3.8(@types/node@22.16.0)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.3)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0(supports-color@10.1.0))(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) devDependencies: '@types/json-schema': specifier: ^7.0.15 @@ -278,16 +448,16 @@ importers: dependencies: '@astrojs/mdx': specifier: ^7.0.8 - version: 7.0.8(@astrojs/markdown-satteri@0.3.8)(astro@7.4.11(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + version: 7.0.8(@astrojs/markdown-satteri@0.3.8)(astro@7.4.11(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(supports-color@10.1.0) '@astrojs/starlight': specifier: ^0.41.5 - version: 0.41.11(astro@7.4.11(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(typescript@5.9.3) + version: 0.41.11(astro@7.4.11(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(supports-color@10.1.0)(typescript@6.0.3) '@sentry/astro': specifier: ^11.12.0 - version: 11.12.0(astro@7.4.11(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(rollup@4.62.4) + version: 11.12.0(astro@7.4.11(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(rollup@4.62.4) '@sentry/starlight-theme': specifier: ^0.8.0 - version: 0.8.1(@astrojs/starlight@0.41.11(astro@7.4.11(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(typescript@5.9.3)) + version: 0.8.1(@astrojs/starlight@0.41.11(astro@7.4.11(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(supports-color@10.1.0)(typescript@6.0.3)) '@vercel/analytics': specifier: ^2.0.1 version: 2.0.1(react@19.2.8) @@ -296,32 +466,38 @@ importers: version: 2.0.0(react@19.2.8) astro: specifier: ^7.4.7 - version: 7.4.11(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) + version: 7.4.11(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) sharp: specifier: ^0.35.5 - version: 0.35.5(@types/node@24.13.5) + version: 0.35.5(@types/node@22.20.3) shiki: specifier: ^3.21.0 version: 3.23.0 devDependencies: + '@astrojs/check': + specifier: ^0.9.12 + version: 0.9.12(prettier@3.10.1)(typescript@6.0.3) + typescript: + specifier: catalog:astro-check + version: 6.0.3 wrangler: specifier: 'catalog:' - version: 4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@24.13.5) + version: 4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@22.20.3) apps/docs-mcp: dependencies: '@hono/mcp': specifier: ^0.2.3 - version: 0.2.5(@modelcontextprotocol/sdk@1.32.2(@cfworker/json-schema@4.1.1)(zod@4.6.7))(hono-rate-limiter@0.4.2(hono@4.13.18))(hono@4.13.18)(zod@4.6.7) + version: 0.2.5(@modelcontextprotocol/sdk@1.32.2(@cfworker/json-schema@4.1.1)(supports-color@10.1.0)(zod@4.6.7))(hono-rate-limiter@0.4.2(hono@4.13.18))(hono@4.13.18)(zod@4.6.7) '@modelcontextprotocol/sdk': specifier: 1.32.2 - version: 1.32.2(@cfworker/json-schema@4.1.1)(zod@4.6.7) + version: 1.32.2(@cfworker/json-schema@4.1.1)(supports-color@10.1.0)(zod@4.6.7) '@openrouter/ai-sdk-provider': specifier: ^1.5.4 version: 1.5.4(ai@5.0.216(zod@4.6.7))(zod@4.6.7) '@sentry/cloudflare': specifier: 'catalog:' - version: 11.12.0(vite@8.3.8(@types/node@22.20.1)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(wrangler@4.156.1(@types/node@22.20.1)) + version: 11.12.0(@cloudflare/workers-types@4.20260405.1)(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(wrangler@4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@22.20.3)) '@sentry/toolkit-core': specifier: workspace:* version: link:../../packages/toolkit-core @@ -336,23 +512,23 @@ importers: version: 4.6.7 devDependencies: '@types/node': - specifier: ^22 - version: 22.20.1 + specifier: 'catalog:' + version: 22.20.3 typescript: - specifier: ^5.9.3 - version: 5.9.3 + specifier: 'catalog:' + version: 7.0.2 vitest: specifier: 'catalog:' - version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.1)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@22.20.1)(typescript@5.9.3))(vite@8.3.8(@types/node@22.20.1)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.3)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0(supports-color@10.1.0))(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) wrangler: specifier: 'catalog:' - version: 4.156.1(@types/node@22.20.1) + version: 4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@22.20.3) apps/games-api: dependencies: '@sentry/cloudflare': specifier: 'catalog:' - version: 11.12.0(@cloudflare/workers-types@4.20260405.1)(vite@8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(wrangler@4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@24.13.5)) + version: 11.12.0(@cloudflare/workers-types@4.20260405.1)(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(wrangler@4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@22.20.3)) '@sentry/toolkit-core': specifier: workspace:* version: link:../../packages/toolkit-core @@ -366,21 +542,24 @@ importers: '@cloudflare/workers-types': specifier: 'catalog:' version: 4.20260405.1 + '@types/node': + specifier: 'catalog:' + version: 22.20.3 typescript: specifier: 'catalog:' - version: 5.9.3 + version: 7.0.2 vitest: specifier: 'catalog:' - version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@24.13.5)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@24.13.5)(typescript@5.9.3))(vite@8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.3)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0(supports-color@10.1.0))(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) wrangler: specifier: 'catalog:' - version: 4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@24.13.5) + version: 4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@22.20.3) apps/local: dependencies: '@hookform/resolvers': specifier: ^5.9.1 - version: 5.9.1(@standard-schema/spec@1.1.0)(ajv@8.20.0)(react-hook-form@7.90.0(@types/react@19.3.0)(react@19.2.8))(valibot@1.4.2(typescript@5.9.3))(zod@4.6.7) + version: 5.9.1(@standard-schema/spec@1.1.0)(ajv@8.20.0)(react-hook-form@7.90.0(@types/react@19.3.0)(react@19.2.8))(valibot@1.4.2(typescript@7.0.2))(zod@4.6.7) '@radix-ui/react-dialog': specifier: ^1.1.23 version: 1.3.0(@types/react-dom@19.3.0(@types/react@19.3.0))(@types/react@19.3.0)(react-dom@19.2.8(react@19.2.8))(react@19.2.8) @@ -455,11 +634,17 @@ importers: version: 2.8.1 valibot: specifier: 'catalog:' - version: 1.4.2(typescript@5.9.3) + version: 1.4.2(typescript@7.0.2) devDependencies: + '@rolldown/plugin-babel': + specifier: ^0.3.1 + version: 0.3.1(@babel/core@7.29.13(supports-color@10.1.0))(@babel/runtime@7.28.4)(rolldown@1.3.2)(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0)) '@testing-library/react': specifier: ^16.3.2 version: 16.3.3(@testing-library/dom@10.4.2)(@types/react-dom@19.3.0(@types/react@19.3.0))(@types/react@19.3.0)(react-dom@19.2.8(react@19.2.8))(react@19.2.8) + '@types/convert-source-map': + specifier: ^2.0.3 + version: 2.0.3 '@types/node': specifier: ^24.13.3 version: 24.13.5 @@ -470,26 +655,26 @@ importers: specifier: ^19.2.4 version: 19.3.0(@types/react@19.3.0) '@vitejs/plugin-react': - specifier: ^6.1.0 - version: 6.1.2(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.13)(@babel/runtime@7.28.4)(rolldown@1.2.19)(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0)))(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0)) + specifier: ^6.3.0 + version: 6.3.0(@rolldown/plugin-babel@0.3.1(@babel/core@7.29.13(supports-color@10.1.0))(@babel/runtime@7.28.4)(rolldown@1.3.2)(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0)))(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0)) eventsource: specifier: ^4.1.0 version: 4.1.1 jsdom: specifier: ^28.1.0 - version: 28.1.0 + version: 28.1.0(supports-color@10.1.0) oxlint: - specifier: ^1.79.0 - version: 1.87.0(oxlint-tsgolint@7.0.2004) + specifier: 'catalog:' + version: 1.93.0(oxlint-tsgolint@7.0.2007) typescript: specifier: 'catalog:' - version: 5.9.3 + version: 7.0.2 vite: specifier: ^8.3.3 version: 8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@24.13.5)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@24.13.5)(typescript@5.9.3))(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0)) + version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@24.13.5)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0(supports-color@10.1.0))(msw@2.15.0(@types/node@24.13.5)(typescript@7.0.2))(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0)) packages/cli: devDependencies: @@ -504,7 +689,7 @@ importers: version: 2.1.7(hono@4.13.18) '@sentry/api': specifier: 'catalog:' - version: 2.15.0(typescript@5.9.3)(valibot@1.4.2(typescript@5.9.3))(zod@4.6.7) + version: 2.15.0(valibot@1.4.2(typescript@7.0.2))(zod@4.6.7) '@sentry/core': specifier: 'catalog:' version: 11.12.0 @@ -534,12 +719,12 @@ importers: version: 1.3.0 '@stricli/core': specifier: 1.2.8 - version: 1.2.8(patch_hash=cbf047581d38be04108d3921321c14a778272c24004da8110d4498d4f2a6b2e1) + version: 1.2.8(patch_hash=c1d70807ac8f612d2e942650da25753076478898ece26cbdef5af377bedcbadc) '@types/http-cache-semantics': specifier: ^4.2.0 version: 4.2.0 '@types/node': - specifier: ^22.20.0 + specifier: 'catalog:' version: 22.20.3 '@types/picomatch': specifier: ^4.0.3 @@ -556,6 +741,9 @@ importers: '@types/yauzl': specifier: 3.4.0 version: 3.4.0 + '@typescript/typescript6': + specifier: 'catalog:' + version: 6.0.2 '@vitest/coverage-v8': specifier: 'catalog:' version: 5.0.5(vitest@5.0.5) @@ -633,16 +821,19 @@ importers: version: 0.2.17 typescript: specifier: 'catalog:' - version: 5.9.3 + version: 7.0.2 + undici-types: + specifier: ^6.21.0 + version: 6.21.0 uuidv7: specifier: ^1.2.1 version: 1.2.1 valibot: specifier: ^1.4.2 - version: 1.4.2(typescript@5.9.3) + version: 1.4.2(typescript@7.0.2) vitest: specifier: 'catalog:' - version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.3)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@22.20.3)(typescript@5.9.3))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.1)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.3)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0(supports-color@10.1.0))(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.1)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) wrap-ansi: specifier: ^10.0.0 version: 10.0.1 @@ -657,22 +848,22 @@ importers: version: 1.6.3 typescript: specifier: 'catalog:' - version: 5.9.3 + version: 7.0.2 packages/logger: devDependencies: '@types/node': specifier: 'catalog:' - version: 22.16.0 + version: 22.20.3 tsdown: specifier: 'catalog:' - version: 0.12.9(typescript@5.9.3) + version: 0.23.7(tsx@4.23.13)(typescript@7.0.2) typescript: specifier: 'catalog:' - version: 5.9.3 + version: 7.0.2 vitest: specifier: 'catalog:' - version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.16.0)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@22.16.0)(typescript@5.9.3))(vite@8.3.8(@types/node@22.16.0)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.3)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0(supports-color@10.1.0))(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) packages/mcp-cloudflare: dependencies: @@ -696,13 +887,13 @@ importers: version: 1.2.3(@types/react@19.1.8)(react@19.2.8) '@sentry/cloudflare': specifier: 'catalog:' - version: 11.12.0(@cloudflare/workers-types@4.20260405.1)(vite@6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))(wrangler@4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@24.13.5)) + version: 11.12.0(@cloudflare/workers-types@4.20260405.1)(vite@6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))(wrangler@4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@22.20.3)) '@sentry/react': specifier: 'catalog:' version: 11.12.0(react-router@7.18.5(react-dom@19.2.8(react@19.2.8))(react@19.2.8))(react@19.2.8) agents: specifier: 'catalog:' - version: 0.32.0(@ai-sdk/provider@4.0.35)(@ai-sdk/react@3.0.232(react@19.2.8)(zod@4.6.7))(@babel/core@7.29.13)(@babel/runtime@7.28.4)(@modelcontextprotocol/client@2.4.0)(@modelcontextprotocol/sdk@1.32.2(@cfworker/json-schema@4.1.1)(zod@4.6.7))(@modelcontextprotocol/server@2.4.0)(ai@6.0.64(zod@4.6.7))(chat@4.45.0(ai@6.0.64(zod@4.6.7))(zod@4.6.7))(react@19.2.8)(rolldown@1.2.14)(vite@6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))(zod@4.6.7) + version: 0.32.0(@ai-sdk/provider@4.0.35)(@ai-sdk/react@3.0.232(react@19.2.8)(zod@4.6.7))(@babel/core@7.29.13(supports-color@10.1.0))(@babel/runtime@7.28.4)(@modelcontextprotocol/client@2.4.0)(@modelcontextprotocol/sdk@1.32.2(@cfworker/json-schema@4.1.1)(supports-color@10.1.0)(zod@4.6.7))(@modelcontextprotocol/server@2.4.0)(ai@6.0.64(zod@4.6.7))(react@19.2.8)(rolldown@1.3.2)(vite@6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))(zod@4.6.7) ai: specifier: 'catalog:' version: 6.0.64(zod@4.6.7) @@ -729,16 +920,16 @@ importers: version: 19.2.8(react@19.2.8) react-markdown: specifier: 'catalog:' - version: 9.1.0(@types/react@19.1.8)(react@19.2.8) + version: 9.1.0(@types/react@19.1.8)(react@19.2.8)(supports-color@10.1.0) react-router-dom: specifier: ^7.18.2 version: 7.18.5(react-dom@19.2.8(react@19.2.8))(react@19.2.8) react-scroll-to-bottom: specifier: ^4.2.0 - version: 4.2.0(@babel/core@7.29.13)(react@19.2.8) + version: 4.2.0(@babel/core@7.29.13(supports-color@10.1.0))(react@19.2.8)(supports-color@10.1.0) remark-gfm: specifier: 'catalog:' - version: 4.0.1 + version: 4.0.1(supports-color@10.1.0) tailwind-merge: specifier: 'catalog:' version: 3.3.1 @@ -751,10 +942,10 @@ importers: devDependencies: '@cloudflare/vite-plugin': specifier: 'catalog:' - version: 1.67.0(@types/node@24.13.5)(vite@6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))(workerd@1.20261101.1)(wrangler@4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@24.13.5)) + version: 1.67.0(@types/node@22.20.3)(vite@6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))(workerd@1.20261101.1)(wrangler@4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@22.20.3)) '@cloudflare/vitest-plugin': specifier: 'catalog:' - version: 1.4.12(@cloudflare/workers-types@4.20260405.1)(@types/node@24.13.5)(vitest@5.0.5) + version: 1.4.12(@cloudflare/workers-types@4.20260405.1)(@types/node@22.20.3)(vitest@5.0.5) '@cloudflare/workers-types': specifier: 'catalog:' version: 4.20260405.1 @@ -775,7 +966,10 @@ importers: version: 0.5.16(tailwindcss@4.3.3) '@tailwindcss/vite': specifier: 'catalog:' - version: 4.3.3(vite@6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0)) + version: 4.3.3(vite@6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0)) + '@types/node': + specifier: 'catalog:' + version: 22.20.3 '@types/react': specifier: 'catalog:' version: 19.1.8 @@ -787,10 +981,10 @@ importers: version: 4.2.5 '@vitejs/plugin-react': specifier: 'catalog:' - version: 4.6.0(vite@6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0)) + version: 4.6.0(supports-color@10.1.0)(vite@6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0)) miniflare: specifier: 'catalog:' - version: 5.20261101.0-beta(@types/node@24.13.5) + version: 5.20261101.0-beta(@types/node@22.20.3) tailwindcss: specifier: 'catalog:' version: 4.3.3 @@ -802,13 +996,13 @@ importers: version: 10.1.0 vite: specifier: 'catalog:' - version: 6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0) + version: 6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0) vitest: specifier: 'catalog:' - version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@24.13.5)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@24.13.5)(typescript@5.9.3))(vite@6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0)) + version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.3)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0(supports-color@10.1.0))(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0)) wrangler: specifier: 'catalog:' - version: 4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@24.13.5) + version: 4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@22.20.3) packages/mcp-core: dependencies: @@ -832,7 +1026,7 @@ importers: version: 2.4.0 '@sentry/api': specifier: 'catalog:' - version: 2.15.0(typescript@5.9.3)(valibot@1.4.2(typescript@5.9.3))(zod@4.6.7) + version: 2.15.0(valibot@1.4.2(typescript@7.0.2))(zod@4.6.7) '@sentry/core': specifier: 'catalog:' version: 11.12.0 @@ -866,13 +1060,13 @@ importers: version: 4.0.40(zod@4.6.7) '@modelcontextprotocol/sdk': specifier: 1.32.2 - version: 1.32.2(@cfworker/json-schema@4.1.1)(zod@4.6.7) + version: 1.32.2(@cfworker/json-schema@4.1.1)(supports-color@10.1.0)(zod@4.6.7) '@sentry/mcp-server-mocks': specifier: workspace:* version: link:../mcp-server-mocks msw: specifier: 'catalog:' - version: 2.10.2(@types/node@24.13.5)(typescript@5.9.3) + version: 2.15.0(@types/node@22.20.3)(typescript@7.0.2) tiktoken: specifier: ^1.0.18 version: 1.0.22 @@ -908,13 +1102,13 @@ importers: version: 16.6.1 msw: specifier: 'catalog:' - version: 2.10.2(@types/node@24.13.5)(typescript@5.9.3) + version: 2.15.0(@types/node@22.20.3)(typescript@7.0.2) typescript: specifier: 'catalog:' - version: 5.9.3 + version: 7.0.2 vitest: specifier: 'catalog:' - version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@24.13.5)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@24.13.5)(typescript@5.9.3))(vite@8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.3)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0(supports-color@10.1.0))(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) vitest-evals: specifier: 'catalog:' version: 0.18.0(ai@6.0.64(zod@4.6.7))(tinyrainbow@3.2.0)(vitest@5.0.5)(zod@4.6.7) @@ -930,12 +1124,14 @@ importers: dependencies: msw: specifier: 'catalog:' - version: 2.10.2(@types/node@24.13.5)(typescript@5.9.3) + version: 2.15.0(@types/node@22.20.3)(typescript@7.0.2) devDependencies: + '@types/node': + specifier: 'catalog:' + version: 22.20.3 tsdown: specifier: 'catalog:' - version: 0.12.9(typescript@5.9.3) - + version: 0.23.7(tsx@4.23.13)(typescript@7.0.2) packages/mcp-test-client: dependencies: @@ -947,7 +1143,7 @@ importers: version: 3.0.23(zod@4.6.7) '@modelcontextprotocol/sdk': specifier: 1.32.2 - version: 1.32.2(@cfworker/json-schema@4.1.1)(zod@4.6.7) + version: 1.32.2(@cfworker/json-schema@4.1.1)(supports-color@10.1.0)(zod@4.6.7) '@sentry/core': specifier: 'catalog:' version: 11.12.0 @@ -978,32 +1174,35 @@ importers: devDependencies: tsdown: specifier: 'catalog:' - version: 0.12.9(typescript@5.9.3) + version: 0.23.7(tsx@4.23.13)(typescript@7.0.2) typescript: specifier: 'catalog:' - version: 5.9.3 + version: 7.0.2 vitest: specifier: 'catalog:' - version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@24.13.5)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@24.13.5)(typescript@5.9.3))(vite@8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.3)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0(supports-color@10.1.0))(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) packages/smoke-tests: devDependencies: '@types/node': specifier: 'catalog:' - version: 22.16.0 + version: 22.20.3 vitest: specifier: 'catalog:' - version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.16.0)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@22.16.0)(typescript@5.9.3))(vite@8.3.8(@types/node@22.16.0)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.3)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0(supports-color@10.1.0))(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) packages/toolkit-core: dependencies: '@sentry/api': specifier: 'catalog:' - version: 2.15.0(typescript@5.9.3)(valibot@1.4.2(typescript@5.9.3))(zod@4.6.7) + version: 2.15.0(valibot@1.4.2(typescript@7.0.2))(zod@4.6.7) '@sentry/search-syntax': specifier: 'catalog:' version: 1.0.0 devDependencies: + '@types/node': + specifier: 'catalog:' + version: 22.20.3 fast-check: specifier: ^4.8.0 version: 4.10.1 @@ -1012,19 +1211,19 @@ importers: version: 15.0.12 mdast-util-from-markdown: specifier: 'catalog:' - version: 2.0.2 + version: 2.0.2(supports-color@10.1.0) mdast-util-gfm: specifier: 'catalog:' - version: 3.1.0 + version: 3.1.0(supports-color@10.1.0) micromark-extension-gfm: specifier: 'catalog:' version: 3.0.0 typescript: specifier: 'catalog:' - version: 5.9.3 + version: 7.0.2 vitest: specifier: 'catalog:' - version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@24.13.5)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@24.13.5)(typescript@5.9.3))(vite@8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + version: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.3)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0(supports-color@10.1.0))(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) packages: @@ -1128,54 +1327,78 @@ packages: '@asamuzakjp/nwsapi@2.3.9': resolution: {integrity: sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==} - '@ast-grep/cli-darwin-arm64@0.43.0': - resolution: {integrity: sha512-0i63gSBbgriPaRpFsbP3yETxolHPK2JAZbpcGbFOytB7QTnKAguwhlKmIOkUGKfsCzYiEq1awY0EBmvjMONXOg==} - engines: {node: '>= 10'} + '@ast-grep/cli-darwin-arm64@0.51.3': + resolution: {integrity: sha512-IZW3KCIX2GNGcy/2JAIIfg6q6ubK3B7N1jd/uw7xcAOhE76bquooOYI+V1+r3QdCL3UXb5DK/quv9wNpxWdACg==} + engines: {node: '>= 20.0.0'} cpu: [arm64] os: [darwin] - '@ast-grep/cli-darwin-x64@0.43.0': - resolution: {integrity: sha512-SPkj00HGKpYdqReUmso2ftG5Xgd+bWNFH4i9fubLxsWzn4ey2G6sotPruaOtcrzxb9xH+8kmhN7KJfm1k8Atzg==} - engines: {node: '>= 10'} + '@ast-grep/cli-darwin-x64@0.51.3': + resolution: {integrity: sha512-qp9xFUX3g95L/9jHoxP0m7KTFRoHxo0SSLwSyIEqh8/2rxox+iJDLl+iVV4exIpfmlk7G2QtBSFsGx7CQe2fsg==} + engines: {node: '>= 20.0.0'} cpu: [x64] os: [darwin] - '@ast-grep/cli-linux-arm64-gnu@0.43.0': - resolution: {integrity: sha512-U8+2fkcY8sBxNHHBYZ33vTa7C97GFAB+Kj6gFzVMSqK8Ve1Aw+DxhVWD4i/PBryDdmWb4/erjGSkTQtdhVa2vg==} - engines: {node: '>= 10'} + '@ast-grep/cli-linux-arm64-gnu@0.51.3': + resolution: {integrity: sha512-a/nx/DvXUERIV+vEcdfeHLUsYG+/oTWZFdLBsmMhz5IQKwTTvMWNQDj1uDx6ReqJNYpcZhjn8TBq9erTHiiRSw==} + engines: {node: '>= 20.0.0'} cpu: [arm64] os: [linux] libc: [glibc] - '@ast-grep/cli-linux-x64-gnu@0.43.0': - resolution: {integrity: sha512-r/o9Mag6OZmGevY9OJjatuUKDOX1rSvgo29qSfxpMbIciiH3hkzEW/2w1xTPZI8xnM7iC+k+CkGoknmoXVTYGg==} - engines: {node: '>= 10'} + '@ast-grep/cli-linux-arm64-musl@0.51.3': + resolution: {integrity: sha512-3jwGiJLFhRf0RnhwJAAfo0o7LgpJJK8byJEXvP7SdeGAlAX5pxovTvIJ9ND9WTV20HLhU8qEAUJtvCzBnRG3RA==} + engines: {node: '>= 20.0.0'} + cpu: [arm64] + os: [linux] + libc: [musl] + + '@ast-grep/cli-linux-x64-gnu@0.51.3': + resolution: {integrity: sha512-7mKLyI664ntH+/U/a0KVopsSKxUFwz6YT80FW0kMt5reMoBqeEJdkO3p1Ub1p25Usv2EWHz6FbCxipHO2MZerg==} + engines: {node: '>= 20.0.0'} cpu: [x64] os: [linux] libc: [glibc] - '@ast-grep/cli-win32-arm64-msvc@0.43.0': - resolution: {integrity: sha512-oHa4ruD87xccnqFuR+Pmx6F/suHV0YtibuyZ6SxUqgpNJAFZiUNAiFblzhEgQ5gp03e8B012P/Yy/7GYOvxOLg==} - engines: {node: '>= 10'} + '@ast-grep/cli-linux-x64-musl@0.51.3': + resolution: {integrity: sha512-KRr8Kxo7eaDPA1mJUE+kyjYAMOyVrTpKbP/3qUgZmNopNAkkyPaHxjihDsnrMvQzyUr7Q3Z7tLUr09Po+3xS4g==} + engines: {node: '>= 20.0.0'} + cpu: [x64] + os: [linux] + libc: [musl] + + '@ast-grep/cli-win32-arm64-msvc@0.51.3': + resolution: {integrity: sha512-l5Zm3AX6A23NqmEN90+9YqDvOqR/Nye0BYlGWAPAyBHhsBXKQlkpPP9gfWXUe23NVPfeoBTcqDcrzQEnArJijw==} + engines: {node: '>= 20.0.0'} cpu: [arm64] os: [win32] - '@ast-grep/cli-win32-ia32-msvc@0.43.0': - resolution: {integrity: sha512-RSzz9bKzSEutWgX7/g84guudEp75Q990CYpG/TBasdJP+U27zX8aA9d5p1+o/lF0hw3UoTYuFCGG8PU/QelfNQ==} - engines: {node: '>= 10'} + '@ast-grep/cli-win32-ia32-msvc@0.51.3': + resolution: {integrity: sha512-zXH0oxdLl0/VvBAX9Cvp2VUlzjSgj7fPeSbcEbAtRCGOe5m//+yC05mcde68wcJOiaZE3oGis2PYrMCSc6xIrw==} + engines: {node: '>= 20.0.0'} cpu: [ia32] os: [win32] - '@ast-grep/cli-win32-x64-msvc@0.43.0': - resolution: {integrity: sha512-/5dDD9B65vVuHCdVHN5+tIDquhE5s43S5CgEn88w1BgQaoayf+nRnUO4ZFez6SqyCGqAfa/yZdoaOQ9N2ySa1w==} - engines: {node: '>= 10'} + '@ast-grep/cli-win32-x64-msvc@0.51.3': + resolution: {integrity: sha512-gd1o0An798IaJvsVbv5nSe2mxFsNqetW8owxijOw5KSb70mbLgyZnCV0fdm5cYmVG9QBabn3iyXzcNv8C7B+tw==} + engines: {node: '>= 20.0.0'} cpu: [x64] os: [win32] - '@ast-grep/cli@0.43.0': - resolution: {integrity: sha512-DGi6xXAOBJubGg9QWqTeW8PzKSGHWEOa3uxXspEfYf532yb3lHmNJAcKMl1d+O9Xs9bTcNeDLC8se+O+tirEFQ==} - engines: {node: '>= 12.0.0'} + '@ast-grep/cli@0.51.3': + resolution: {integrity: sha512-fjdWDDZcTCiUYt0yrHoZNmCRAP8QHKp++xKSLr0PrMqvk/m3v+543IWVvnJ5IcY9Lp0Z7bKSjP2/APZeypT/1g==} + engines: {node: '>= 20.0.0'} + hasBin: true + + '@astrojs/astro2tsx@0.1.4': + resolution: {integrity: sha512-5dJqY4i1AlXxcsSFHkaegnrgdVs9J4U93y/YF0xmvmSOcNYVQnf4db3IhvqHZ5v8biLPlPlFmlYsqHj0c4/ZSA==} + engines: {node: ^20.19.0 || >=22.12.0} + + '@astrojs/check@0.9.12': + resolution: {integrity: sha512-hazpqxIfZWj2VhyPyR0pOEQ/IhFDM/2nIApL96zMXABdD8NrUKYDmhxTy7h+drTDl9MQG/Sd1ET/4amadVJUUA==} hasBin: true + peerDependencies: + typescript: ^5.0.0 || ^6.0.0 '@astrojs/compiler-binding-android-arm64@0.5.3': resolution: {integrity: sha512-ThyoCqtrdp6UwmMvScluDll4vvj4kXwUPKHYozLbXJKPH5zrJ8sr5xQJVOk0YvgBrCvGBA/lPVVLyEp1aLuBYg==} @@ -1254,6 +1477,18 @@ packages: '@astrojs/internal-helpers@0.13.2': resolution: {integrity: sha512-SWiNS+OMrhwWYzJENTekHUyUCMKB+tdU6D4v1ZNIU1ZHh2mScQ8WIs0J6AJ8KPXkIrs9+EZU7Rm2CstfThyVnw==} + '@astrojs/language-server@2.17.3': + resolution: {integrity: sha512-QIAFu1e/4quJMTPdmBOm+ZPXc5NDGZE4/YQjgR3EgjhGLl/tdidaWJDr5WmO2lesVc+BW1qN/xNBURmuePDG2A==} + hasBin: true + peerDependencies: + prettier: ^3.0.0 + prettier-plugin-astro: '>=0.11.0' + peerDependenciesMeta: + prettier: + optional: true + prettier-plugin-astro: + optional: true + '@astrojs/markdown-remark@7.2.4': resolution: {integrity: sha512-MvspGMynWKAjTe4/lTUdmBPHIFKNVLTCF6UlyWGogTGzNrTvjD+D4n48k7h8swxsEPKHK2TwxkZO7uoaCv1Pow==} @@ -1305,6 +1540,9 @@ packages: peerDependencies: vite: ^8.3.3 + '@astrojs/yaml2ts@0.2.4': + resolution: {integrity: sha512-8oddpOae35pJsXPQXhTkM0ypfKPskVsh2bCxRtbf7e+/Epw2nReakFYpLKjZMEr75CsoF203PMnCocpfz0s69A==} + '@babel/code-frame@7.27.1': resolution: {integrity: sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==} engines: {node: '>=6.9.0'} @@ -1702,15 +1940,6 @@ packages: cpu: [x64] os: [win32] - '@bundled-es-modules/cookie@2.0.1': - resolution: {integrity: sha512-8o+5fRPLNbjbdGRRmJj3h6Hh1AQJf2dk3qQ/5ZFb+PXkRNiSoMGGUKlsgLfrxneb72axVJyIYji64E2+nNfYyw==} - - '@bundled-es-modules/statuses@1.0.1': - resolution: {integrity: sha512-yn7BklA5acgcBr+7w064fGV+SGIFySjCKpqjcWgBAIfrAkY+4GQTJJHQMeT3V/sgz23VTEVV8TtOmkvJAhFVfg==} - - '@bundled-es-modules/tough-cookie@0.1.6': - resolution: {integrity: sha512-dvMHbL464C0zI+Yqxbz6kZ5TOEp7GLW+pry/RWndAR8MJQAXZ2rPmIs8tziTZjeIyhSNZgZbCePtfSbdWqStJw==} - '@capsizecss/unpack@4.0.1': resolution: {integrity: sha512-CuNiSqg7+e1cO/GjffyMOm5Tt2jUF9CWHHnvQ/UkqvtkGfHdgwEC0wpmq7fkN3gxwpRnrAN0WzO3vREKmNolMQ==} engines: {node: '>=18'} @@ -1718,10 +1947,6 @@ packages: '@cfworker/json-schema@4.1.1': resolution: {integrity: sha512-gAmrUZSGtKc3AiBL71iNWxDsyUC5uMaKKGdvzYsBoTW/xi42JQHl7eKV2OYzCUqvc+D2RCcf7EXY2iCyFIk6og==} - '@chat-adapter/catalog@4.45.0': - resolution: {integrity: sha512-oP8ySvXTYRVRIusTehLTvpwynMLkEcaFZBASZRDDfNFZzSO02xQX1kVgMAz4VbtiMTMU6k01tjZE4KEDbrmonA==} - engines: {node: '>=20'} - '@clack/core@0.5.0': resolution: {integrity: sha512-p3y0FIOwaYRUPRcMO7+dlmLh8PSRcrjuTndsiA0WAFbWES0mLZlrjVoBRZ9DzkPFJZG6KGkJmoEAY0ZcVWTkow==} @@ -1843,6 +2068,27 @@ packages: resolution: {integrity: sha512-Vh5uy9Y1JBMId6J1f68TMXnZrTCvNdo9Fu2k0d1YnJngR+sM5kWTKl441c/3TFs+cG0NWOjRWgQ/iaWhbYx+7A==} engines: {node: '>=14'} + '@emmetio/abbreviation@2.3.3': + resolution: {integrity: sha512-mgv58UrU3rh4YgbE/TzgLQwJ3pFsHHhCLqY20aJq+9comytTXUDNGG/SMtSeMJdkpxgXSXunBGLD8Boka3JyVA==} + + '@emmetio/css-abbreviation@2.1.8': + resolution: {integrity: sha512-s9yjhJ6saOO/uk1V74eifykk2CBYi01STTK3WlXWGOepyKa23ymJ053+DNQjpFcy1ingpaO7AxCcwLvHFY9tuw==} + + '@emmetio/css-parser@0.4.1': + resolution: {integrity: sha512-2bC6m0MV/voF4CTZiAbG5MWKbq5EBmDPKu9Sb7s7nVcEzNQlrZP6mFFFlIaISM8X6514H9shWMme1fCm8cWAfQ==} + + '@emmetio/html-matcher@1.3.0': + resolution: {integrity: sha512-NTbsvppE5eVyBMuyGfVu2CRrLvo7J4YHb6t9sBFLyY03WYhXET37qA4zOYUjBWFCRHO7pS1B9khERtY0f5JXPQ==} + + '@emmetio/scanner@1.0.4': + resolution: {integrity: sha512-IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA==} + + '@emmetio/stream-reader-utils@0.1.0': + resolution: {integrity: sha512-ZsZ2I9Vzso3Ho/pjZFsmmZ++FWeEd/txqybHTm4OgaZzdS8V9V/YYWQwg5TC38Z7uLWUV1vavpLLbjJtKubR1A==} + + '@emmetio/stream-reader@2.2.0': + resolution: {integrity: sha512-fXVXEyFA5Yv3M3n8sUGT7+fvecGrZP4k6FnWWMSZVQf69kAq0LLpaBQLGcPR30m3zMmKYhECP4k/ZkzvhEW5kw==} + '@emnapi/core@1.11.1': resolution: {integrity: sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==} @@ -2669,35 +2915,35 @@ packages: cpu: [x64] os: [win32] - '@inquirer/ansi@1.0.2': - resolution: {integrity: sha512-S8qNSZiYzFd0wAcyG5AXCvUHC5Sr7xpZ9wZ2py9XR88jUz8wooStVx5M6dRzczbBWjic9NP7+rY0Xi7qqK/aMQ==} - engines: {node: '>=18'} + '@inquirer/ansi@2.1.0': + resolution: {integrity: sha512-63GU5AD9KhNbWM0jlhHoMJTEFck2upFOPxHlnCKf3xYTV3rjTUUQfodihmTnfYQzMLS29oy8lK/gA1eJgu4bhA==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} - '@inquirer/confirm@5.1.21': - resolution: {integrity: sha512-KR8edRkIsUayMXV+o3Gv+q4jlhENF9nMYUZs9PA2HzrXeHI8M5uDag70U7RJn9yyiMZSbtF5/UexBtAVtZGSbQ==} - engines: {node: '>=18'} + '@inquirer/confirm@6.4.0': + resolution: {integrity: sha512-+DCZxrOF01Q/1SzTQkgycAQPS/Jf+Yol0h1P/MVmopukTsxGOu1h/LKqf30y0eHKFZYYrgUMVhGDhEbPmSPi9A==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} peerDependencies: '@types/node': '>=18' peerDependenciesMeta: '@types/node': optional: true - '@inquirer/core@10.3.2': - resolution: {integrity: sha512-43RTuEbfP8MbKzedNqBrlhhNKVwoK//vUFNW3Q3vZ88BLcrs4kYpGg+B2mm5p2K/HfygoCxuKwJJiv8PbGmE0A==} - engines: {node: '>=18'} + '@inquirer/core@12.1.0': + resolution: {integrity: sha512-6H7usRWw4Gdjgpaem10CA5MfZ/xoYPGyInriR1Xubqjv+SVo8LIJ1erpFxW5JgCza6VZVZiKLTko7RtUU3AQMg==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} peerDependencies: '@types/node': '>=18' peerDependenciesMeta: '@types/node': optional: true - '@inquirer/figures@1.0.15': - resolution: {integrity: sha512-t2IEY+unGHOzAaVM5Xx6DEWKeXlDDcNPeDyUpsRc6CUhBfU3VQOEl+Vssh7VNp1dR8MdUJBWhuObjXCsVpjN5g==} - engines: {node: '>=18'} + '@inquirer/figures@2.1.0': + resolution: {integrity: sha512-CR9u2PME23jxy2SOyTb117efwAAPm98Zr+LoWI+PiQ55D6U8Yeu/HyFTxwytKhPa6oxAGzdsm2Kg7oLS6B9z8w==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} - '@inquirer/type@3.0.10': - resolution: {integrity: sha512-BvziSRxfz5Ov8ch0z/n3oijRSEcEsHnhggm4xFZe93DHcUCTlutlq9Ox4SVENAfcRD22UQq7T/atg9Wr3k09eA==} - engines: {node: '>=18'} + '@inquirer/type@4.3.0': + resolution: {integrity: sha512-/IA8q2nyjgyl0NGSjqiRXB8gh3We7Pzx9C0c+6Zoolu905jFc79anerrUG7+n65+qs310DRK43yi2WDI8nY59A==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} peerDependencies: '@types/node': '>=18' peerDependenciesMeta: @@ -2759,8 +3005,8 @@ packages: resolution: {integrity: sha512-rgR9yxSaAJ+bcsi/XroT/S2AfPiIWloXAnrdfYSCms9ivVju0ishu/wW0J21Ho6+ZOR1r7RyeRbjiRuF87ix5Q==} engines: {node: '>=20'} - '@mswjs/interceptors@0.39.8': - resolution: {integrity: sha512-2+BzZbjRO7Ct61k8fMNHEtoKjeWI9pIlHFTqBwZ5icHpqszIgEZbjb1MW5Z0+bITTCTl3gk4PDBxs9tA/csXvA==} + '@mswjs/interceptors@0.41.9': + resolution: {integrity: sha512-VVPPgHyQ6ShqnrmDWuxjmUIsO9gWyOZFmuOfLd9LfBGQJwZfy0gvv9pbHSJuoFNIYC7ZDX9aoFwowjcdSC4E8w==} engines: {node: '>=18'} '@napi-rs/lzma-linux-x64-gnu@1.5.1': @@ -2770,9 +3016,6 @@ packages: os: [linux] libc: [glibc] - '@napi-rs/wasm-runtime@0.2.12': - resolution: {integrity: sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==} - '@napi-rs/wasm-runtime@1.2.4': resolution: {integrity: sha512-AJxoUD2/15ESHbvpcyjU274nsAPLuOtPHCk0vKJM5pj//Fg/B1FXNWjPnXTT9PymCYYiHo4zPj0ZomXBKhoy7g==} engines: {node: ^20.19.0 || ^22.13.0 || >=23.5.0} @@ -2797,6 +3040,9 @@ packages: '@open-draft/deferred-promise@2.2.0': resolution: {integrity: sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==} + '@open-draft/deferred-promise@3.0.0': + resolution: {integrity: sha512-XW375UK8/9SqUVNVa6M0yEy8+iTi4QN5VZ7aZuRFQmy76LRwI9wy5F4YIBU6T+eTe2/DNDo8tqu8RHlwLHM6RA==} + '@open-draft/logger@0.3.0': resolution: {integrity: sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==} @@ -2946,10 +3192,6 @@ packages: cpu: [x64] os: [win32] - '@oxc-project/runtime@0.75.0': - resolution: {integrity: sha512-gzRmVI/vorsPmbDXt7GD4Uh2lD3rCOku/1xWPB4Yx48k0EP4TZmzQudWapjN4+7Vv+rgXr0RqCHQadeaMvdBuw==} - engines: {node: '>=6.9.0'} - '@oxc-project/types@0.152.0': resolution: {integrity: sha512-oM/5rLBm2tPkg0iBgkH/FOeR3PCDpY19GTgAZjMFM8h9WI9VW7cLgzp6nwtarYKmovavIQZ+Fe/RKX/8C8O/Rw==} @@ -2959,279 +3201,279 @@ packages: '@oxc-project/types@0.156.0': resolution: {integrity: sha512-1Duyg48TdJNdyhEB8Xn1L36bT9Pv6GUtlKjHxOys8xkaF/rQq3XJE+bAurSK/AgIz5mGFsb77cn9Pb20+WCScw==} - '@oxc-project/types@0.75.0': - resolution: {integrity: sha512-QMW+06WOXs7+F301Y3X0VpmWhwuQVc/X/RP2zF9OIwvSMmsif3xURS2wxbakFIABYsytgBcHpUcFepVS0Qnd3A==} + '@oxc-project/types@0.158.0': + resolution: {integrity: sha512-xZ66qA4WmLbTLlxH3mqMd8f9UKbaOzOT0ATwFf4DH/14pMgpUrtqtjyYzOQmgfl2a0iRAAMbQ9G1th/67jRzGw==} - '@oxfmt/binding-android-arm-eabi@0.72.0': - resolution: {integrity: sha512-u4U1uaDOVBuorGNC/07NLm48nECHOiJJka002YGML16Md2DRvf38RGBt01lH60EOGvNlFVmbLoksQedNBoZHKw==} + '@oxfmt/binding-android-arm-eabi@0.78.0': + resolution: {integrity: sha512-1x9NPGQG5WMOOT8spRP4hPbeqwB/P9ayxFo4EUDSle6mLmtYRqE6suXgHr93/S2nnszy77LlIa8klkKdWtHbMw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [android] - '@oxfmt/binding-android-arm64@0.72.0': - resolution: {integrity: sha512-GCnM+Ae2mWOKC+92y3FOb6eZJeVnBAVz82e3lITUUg+kxukYKzBNAvJ/hhHIfa2A0md55SYYhdWPddSSy3KPVA==} + '@oxfmt/binding-android-arm64@0.78.0': + resolution: {integrity: sha512-1muYaW9SiPEq8NIPGX0B20oUwCx6HWiCsZem/2jU7UsOzoXLT4YxWq6ybdhwKSKl0PyAfvyMyPF7FsI1To7AdA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [android] - '@oxfmt/binding-darwin-arm64@0.72.0': - resolution: {integrity: sha512-LjQ8tlevdtwraFlWC6AnQ1Forzde0clRmnsP3QmK+ydSElDt/J+5Jc+m+//Ly1G97aP7WCNUw110QMIUw2K7xA==} + '@oxfmt/binding-darwin-arm64@0.78.0': + resolution: {integrity: sha512-jl4KJdo8HrVpLmcSYS/7oDXPH8Hzd6VrzgUFRAbY0j6cSRjcDkUnpuAStuNLoqvMtZEi7Rdy68BBriCgWJcy2g==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [darwin] - '@oxfmt/binding-darwin-x64@0.72.0': - resolution: {integrity: sha512-+ZbcxhB1C34RQR5IldSyY6Z/yalJIxHXhP36PGE4sEq0f/lgL5jCLmOKoDeVm8dqd9gFGDsd1bNWHSGCAwdSkw==} + '@oxfmt/binding-darwin-x64@0.78.0': + resolution: {integrity: sha512-RwOhQgAQi1qV3TeuTfrgGkCWEL3eDFIql/lo4rt2xpGHqyolKa+W5cFbb+M9IvwMwQbplii5Gbv1ZQQPTJlNug==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [darwin] - '@oxfmt/binding-freebsd-x64@0.72.0': - resolution: {integrity: sha512-yGPhA8sePEBFV9iGcprhyOk3Bz3fZshswMH3DpYIPZFLT1DG5LjiZ0j6AJQpSueaL6bUK0av1K+5+fe+ldy5EQ==} + '@oxfmt/binding-freebsd-x64@0.78.0': + resolution: {integrity: sha512-MAXydj01mLjMUlnmo7sYVm+7kdBdU9Nwaux2Q1f9oLNqt3CCdego1oMoZ30qDyZQGQXfVJZEU1yRV7mSzwKDVA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [freebsd] - '@oxfmt/binding-linux-arm-gnueabihf@0.72.0': - resolution: {integrity: sha512-/g5axuqFMcAtoQrFLR5EJEMDjR5Ea4GuzpdDmMpPWAgrF1DmL4kD1NPNVlpXEOxpFJnD6lPvLKYj1lzdlrfifA==} + '@oxfmt/binding-linux-arm-gnueabihf@0.78.0': + resolution: {integrity: sha512-rz6FVZRiWsq3O2YQgCoqZRwaQQaPQ70NBks4+KINjjPJOjBTd8g/iq6ynS97ode+qKGlhXtpc/xCl8LHzfOjyQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] - '@oxfmt/binding-linux-arm-musleabihf@0.72.0': - resolution: {integrity: sha512-InVitdHbS09PM+w+WinIiyX37rC9R3L7lUP9mKy9uKTEDSUFaLjWsLoreRIxKivnv7Ndqc6Trvi+K+b6ZzhiJg==} + '@oxfmt/binding-linux-arm-musleabihf@0.78.0': + resolution: {integrity: sha512-lIK0XJi4JP1FnhuLjR/JWhQHGghZc+ghFNnbZTQC8kxsmrkW3ex8CeF7fp0FT+rEP0Nm6voCYkasL8poVWA9sQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] - '@oxfmt/binding-linux-arm64-gnu@0.72.0': - resolution: {integrity: sha512-WKjlyRAxpPjXoqeuwFBim5LscgvY+RNEiZ971C9JlRQZONhJTsXDki/oHFYQE+fzzRpzXh3owZvOdT3kNL2g+g==} + '@oxfmt/binding-linux-arm64-gnu@0.78.0': + resolution: {integrity: sha512-o2LJIHfW3ZADOjDVk5c7MM1M8CiAG43GTc4mlJAK23fOHgru4CvnqWedCoCXpIsKokoRdEa7XdQywPGZv1BAiA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] libc: [glibc] - '@oxfmt/binding-linux-arm64-musl@0.72.0': - resolution: {integrity: sha512-poafnbsPpJhR+5Mbwpf8CscugTyiRAzjTOxRVn8ra3X2jnURs2xL5Du2xl5g2iW85lICMglpmLf8jDjZEbNgzQ==} + '@oxfmt/binding-linux-arm64-musl@0.78.0': + resolution: {integrity: sha512-G+lUaQk94Vo+4byyd8X2+pPXtd7wObpdbvBC8xyozZD0ROSVBI3XpNNR6HECkJq4Q51AwLuJG81f4x+4eqvSrw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] libc: [musl] - '@oxfmt/binding-linux-ppc64-gnu@0.72.0': - resolution: {integrity: sha512-zNUi0gKRsO7S3IfPzsTbnm88OedPuX32hmZFWZRWHvWJlAoZRwVbeO6Nb3hng4vDgL7qUKp4TGqzPz1mhsycYg==} + '@oxfmt/binding-linux-ppc64-gnu@0.78.0': + resolution: {integrity: sha512-r76PAZf9/ZgF/iDRaIf8nLsr4x6ZHe/j2QLmWUjoQ46Sa11qMO68a5u5iux3y8vLzqYTS/xtKO9PjjMfyk5png==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ppc64] os: [linux] libc: [glibc] - '@oxfmt/binding-linux-riscv64-gnu@0.72.0': - resolution: {integrity: sha512-qTY7z/iyF/rWI2HWwWMevXqZW5PZUOofUy2afK7v6rseXnpld3yjgyIk6pCux3DqWQ0lB+f5atvLJNBwzLvFsw==} + '@oxfmt/binding-linux-riscv64-gnu@0.78.0': + resolution: {integrity: sha512-SQiXTt/c4aVoRXkJvhf4Y/sA1XYe3XjSMDbdX5PiAssBuHERoGtncQXz0KKWkXPejWTKlAL4mZSQZdHOCiw7TA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [riscv64] os: [linux] libc: [glibc] - '@oxfmt/binding-linux-riscv64-musl@0.72.0': - resolution: {integrity: sha512-w18qfo8vEMD6EKEHtzTvjc6jH8yCyXIT1Bn7PFWJd0PpZyzH/VQDx4xvjCh0LGz6GRzqiezbisTdG9AoXtpkZQ==} + '@oxfmt/binding-linux-riscv64-musl@0.78.0': + resolution: {integrity: sha512-VNB3wFUx/rAqwVNW+uyXxb+c0HUrmcS51UPkFMDWJY95c6Tck6u6HOyVLsqiYoC8kh2mGlwanYmjb/R2McvN0A==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [riscv64] os: [linux] libc: [musl] - '@oxfmt/binding-linux-s390x-gnu@0.72.0': - resolution: {integrity: sha512-grW8HwEir+vK7fCcq1ZgL3NHQCfZ1PidiERE9Hbf+24xGys+DoDaoqTht4ccfn0PcBwbViLkwkda/KNpJu2KRQ==} + '@oxfmt/binding-linux-s390x-gnu@0.78.0': + resolution: {integrity: sha512-1nbI0Y7SXwx2f4mJmKt58MaDdjAcoaYM90pBMGdcZCsTW2taFW1/MUi3uQGRPAN2n+3PldCdO9m+D6x+gU/heg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [s390x] os: [linux] libc: [glibc] - '@oxfmt/binding-linux-x64-gnu@0.72.0': - resolution: {integrity: sha512-wQJRQfWBRIn88Pkr449EUViwRayrYUScg7ty+Ihiem21mQ9BUA6S9e/4RAgyNk9lMag0KBouyKskjq61rOC0WQ==} + '@oxfmt/binding-linux-x64-gnu@0.78.0': + resolution: {integrity: sha512-I2z2ISPjrl3CSRF5fmQkNnoh46UVU1GjM1V0+COJyNZcj0SDNM4DrPP2/gXCX38YJ1P2BL6sF2VdsJ+pEYEbJQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] libc: [glibc] - '@oxfmt/binding-linux-x64-musl@0.72.0': - resolution: {integrity: sha512-T1B0uQzafxuGPjjaPrZJ497nxoi1BiI65JfsYc56nNpmev3msfb/iaTmH2kQuNFqa8PKxpMlf3GhWrWBvBPORQ==} + '@oxfmt/binding-linux-x64-musl@0.78.0': + resolution: {integrity: sha512-YHt5nKKFxT4SruI57FHnEhGRSDuoFqNoAM3moYCClg70mjjS39gBBbdzaZv+N0otdzvQVuHTPu3jFu5tpqC3XQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] libc: [musl] - '@oxfmt/binding-openharmony-arm64@0.72.0': - resolution: {integrity: sha512-OKxxgTurl7+hypVplO8QRAbbQlwEs0j1Y6FZv+ZN2qNbdxQk2muMlzuJNBGTCWwxQ0rkkOD1uK/DW1fvzoUSJA==} + '@oxfmt/binding-openharmony-arm64@0.78.0': + resolution: {integrity: sha512-WH21lBMU+LYzF7aMeozTZlyc44oa2F+I5OtQ7RwuidCDoAxgTyN1s34rx0PBYrio56+2G88U9VOnYJsyV7VMHQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [openharmony] - '@oxfmt/binding-win32-arm64-msvc@0.72.0': - resolution: {integrity: sha512-L78TKzURqvjuZOCo88ixMbPXf/RP7u31Y0cmjJ/KEmrHmfYhmhEvsDaTYPiyTRne64jUgCbADfY0YeoQk4/Xyw==} + '@oxfmt/binding-win32-arm64-msvc@0.78.0': + resolution: {integrity: sha512-uNQqHJrtHIiSl8pMbhDktmGpA1hqwldWNO8kbNpNFhVt+BYk4C3Ge8nlJgkRtGjtMam0+542G5UQJJG6lLePbg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [win32] - '@oxfmt/binding-win32-ia32-msvc@0.72.0': - resolution: {integrity: sha512-gQtFW+Ii8BWgtJTAD17TY/WsdNS5gUfAPov8iI1jeq4r9lRRYImmxPL08UU00/RLaCfBJwh2UgINnDY0iOiZ+A==} + '@oxfmt/binding-win32-ia32-msvc@0.78.0': + resolution: {integrity: sha512-W6omURRT39EHBPH4Z8sUPIOzWVjMbhCCCWcfT0sa6aeC+vOXNyBAJmpQRh5//KfPDX96jJlNith9i4N65wxB+Q==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ia32] os: [win32] - '@oxfmt/binding-win32-x64-msvc@0.72.0': - resolution: {integrity: sha512-uhooIN+DCzWX5uH7mQkSVCsODqsGluGJ4n3ch4+mITtWKpESMDjUJUSDBAVFuYQDwqY2McPDKdKJbM0oZVW/Qw==} + '@oxfmt/binding-win32-x64-msvc@0.78.0': + resolution: {integrity: sha512-r9rWKeDVc7lIrj0Us9kP08W7FudYAoWyEdO40qnKk20bHiTbW/z2v4LoIxxUENQyFfApbeV2Gl9XsEgY/tY1dA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [win32] - '@oxlint-tsgolint/darwin-arm64@7.0.2004': - resolution: {integrity: sha512-uJk3ttju7Lz+Nv8WG4CsLyewoL1qf/Ny8S8OksJ7Bm/F14Tc9gMfW6arM1PCc57IzH/X/I79YsCWTgxX1FKibQ==} + '@oxlint-tsgolint/darwin-arm64@7.0.2007': + resolution: {integrity: sha512-bjNxPFyu1wNK74epHzXrtVLrj7oEuB8jQvJZDSia2d5EZ/0YgnyhI37E9U530IUZlNCqlTWjko1iT3CKAYF9+A==} cpu: [arm64] os: [darwin] - '@oxlint-tsgolint/darwin-x64@7.0.2004': - resolution: {integrity: sha512-0BFfHTzDxNDFPcu0UZAXT6CyCJHAXM0dZveyDb4KEHa2qF/DSnOKOrmvK/wFuFol9kvijbGM9JfuOsor+zWXRw==} + '@oxlint-tsgolint/darwin-x64@7.0.2007': + resolution: {integrity: sha512-dCd7mzk2FeTaU46LLeXy5mQyEFICaPqlew/LpehNzEuL86D0jTYlwZHbibRqdRrvkSNgq1szz/7014FIHgyV1g==} cpu: [x64] os: [darwin] - '@oxlint-tsgolint/linux-arm64@7.0.2004': - resolution: {integrity: sha512-TAehQc+qdRXyDN3nl/r/3/oPrBVrbtrDeGMkFyG6mf+XphpoJ2lAMVFLclyvrVZCw02RbKROjyw8h72XwQQHcw==} + '@oxlint-tsgolint/linux-arm64@7.0.2007': + resolution: {integrity: sha512-qb0XUQXuTmQ8H++zsx/tQitG0/fU3BE16KGp1qXExeDgRzEc7WIlCuN1i+rmA40lty9gQs+x3a73BFODVhTZqA==} cpu: [arm64] os: [linux] - '@oxlint-tsgolint/linux-x64@7.0.2004': - resolution: {integrity: sha512-LPunZvm6ZbWPfHMAyfZf9ci3HHvNEzLejO8zdqO3GoVGoSEHqqufHUD7+OgeatVSaJP7uXDJ2HaNOHIoH7go4Q==} + '@oxlint-tsgolint/linux-x64@7.0.2007': + resolution: {integrity: sha512-75vx0067HSgxq/HEZzlHwqhcujn3bshg43fVLTx604jZdZZMQfPVCcxTh2RTEShP7ACT1PRty6vboZlWh5RtEA==} cpu: [x64] os: [linux] - '@oxlint-tsgolint/win32-arm64@7.0.2004': - resolution: {integrity: sha512-FVWplzDImWhiuawnIZVETaQecv4GWom6Jv4Fx2xj7hhXXDZ5okEgiw1gTCImHTIQsi2ycC5oSxVwrn69bMh7iw==} + '@oxlint-tsgolint/win32-arm64@7.0.2007': + resolution: {integrity: sha512-6zl7I+BvScfOPtnPtSEP5JA+z8NkDPGd47YnQChL5lLF/Dzs7Rasr1G+q0zGlQcP8OEgW43hW4QlUTXxPfD13Q==} cpu: [arm64] os: [win32] - '@oxlint-tsgolint/win32-x64@7.0.2004': - resolution: {integrity: sha512-7PsxuUx11Ry9DYTWcljTzRbmZY9B6O9fFFfZV+aodQEMy6pfRT3fhoQRv9PtGN/89z1pPz3nFKrsFm6WqNtX7w==} + '@oxlint-tsgolint/win32-x64@7.0.2007': + resolution: {integrity: sha512-VptFHYhBm0SIWCUkx89hmTrKVOQsDg0iB1YE3EBlvRRtCHGUd3pU1kMxPBg1wOd83ZMmIn7zB6maBROtpmrP5g==} cpu: [x64] os: [win32] - '@oxlint/binding-android-arm-eabi@1.87.0': - resolution: {integrity: sha512-22tVIHlB9898OYsBKmYB6He1MCSqdTmK1BVWuSNUTVrpS0KWNege+U9uEYqGJ+KatQag0r/oU44i3OOs46z7HQ==} + '@oxlint/binding-android-arm-eabi@1.93.0': + resolution: {integrity: sha512-KKw70pbD5Pvq3G2lJ+WQ71XPMjCmg37rkSe2+mDqCRP3PoTSdDMuEi4UOnE8JBtyNM7bek61EC2s0Jt7S7u+Sg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [android] - '@oxlint/binding-android-arm64@1.87.0': - resolution: {integrity: sha512-JfZQ3MWf74n8ov0DojZpkOduIubYJvZL5tbTMMhDutsal6u1xH1QuNpN+lK+EQwF8AeAfgwTR2fgh5U2br27XA==} + '@oxlint/binding-android-arm64@1.93.0': + resolution: {integrity: sha512-fvr1fTUZGelwRxKDt64pf28aL1WaWgviwz3X+E/FcRYvrlEahH0NECRz/c1SY+K+KWmZk5uAf6h1kQnyBkp/2A==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [android] - '@oxlint/binding-darwin-arm64@1.87.0': - resolution: {integrity: sha512-rkx6Xvvw93z2GImVOyvbZwAZcoY0Z6MJW177XNsSB+i/CBsH7ANyelTp01VZyIkM3iSXtqKVb4+ptBgPHap5pQ==} + '@oxlint/binding-darwin-arm64@1.93.0': + resolution: {integrity: sha512-VdvSN9JRf4Es6ZzoAdvEeh8tgKdw8L4H82WmA8MMPVfPdZGCwE/nI27Z1HrRHYQhPxOh4kmnxQEioSUFrOvDaw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [darwin] - '@oxlint/binding-darwin-x64@1.87.0': - resolution: {integrity: sha512-cw5nYw7L/pQ2SgGBgOcg/Qo89llQre3vIc/kuBLhSICzu1r5s8L76H3ug6AIFsD98WpROj8/z5JVzkf4daxHaQ==} + '@oxlint/binding-darwin-x64@1.93.0': + resolution: {integrity: sha512-QR1V890Ml0YGRG0F/iV0K9igG+pOhe+VWd+aZnxY849rRHZf3F2gEoQks5+GVHf105X9Mh/6HdShTP5juekG2g==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [darwin] - '@oxlint/binding-freebsd-x64@1.87.0': - resolution: {integrity: sha512-x/SuznE6loRZK9gz9AS4ZmzNzSu+5KdeoCS+sVHhnrE8HM6AD8UyTjwldQTTqlXGvkwHASgB0NiTNOc3o3PdAg==} + '@oxlint/binding-freebsd-x64@1.93.0': + resolution: {integrity: sha512-jDfIbi30zZaKi+rTvig3sge+Xhi8pFFSgHxb0jzovc4qh8ETm/irKV9c7N/JsuwnYc5sbvf4IC8w1vQQ0IL+BA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [freebsd] - '@oxlint/binding-linux-arm-gnueabihf@1.87.0': - resolution: {integrity: sha512-+JEDmCAXiiFmKhAjZhgAOwaHWY6WENOQ5QA+lFuY59tgsUCDOTRi46B+lENK6CWvtxsXpwkZXNOgpjAQcpIpnA==} + '@oxlint/binding-linux-arm-gnueabihf@1.93.0': + resolution: {integrity: sha512-qtxZ714ND/koFgVH00QgxlzZiIbRPmguaPhnHRU5DFFtrtEdOrSnZD4U/H2AzXrXkZ59eQbMBnJwbum5XohrIQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] - '@oxlint/binding-linux-arm-musleabihf@1.87.0': - resolution: {integrity: sha512-/uC9XqXLAC9AHFLNycwmSQEvKqGrOCgU+uXALI7gNW0DG81TJ/3T2eHnKdRvcb5R1gFEfjxDwI4e4zIa29rICQ==} + '@oxlint/binding-linux-arm-musleabihf@1.93.0': + resolution: {integrity: sha512-5pJ9NjMvH7WMUqXB6bTTOSemBm39w2cod27Hu3+Yom/GhbTeNXlYcpDx1o4CgBP6fhp0YHG66TNdVaUm6sHjsA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm] os: [linux] - '@oxlint/binding-linux-arm64-gnu@1.87.0': - resolution: {integrity: sha512-FTRYPsBy/M728vnUv7l+KAwSAa3Qi4BQbhVvy7NYuMTZ0sUa/OWsbMx79HVFw6u/5KWcaYayDsoOiv7xbevzDg==} + '@oxlint/binding-linux-arm64-gnu@1.93.0': + resolution: {integrity: sha512-pRf+7jtbt2fHE23SX7qBxRgnBZicUgsoCK1PVIjnOk+t3a6UBkpt/GrKI99WlxsKUxftz/5nv/kfKvScmYywkw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] libc: [glibc] - '@oxlint/binding-linux-arm64-musl@1.87.0': - resolution: {integrity: sha512-6sC+N7IY0h1egd8SrYUGNN7CUyKJZ4bIZakKa7V7hfinf4jfi8Kq4+klJvFp5DqXcwMn44I5MeBwmJluO1odFg==} + '@oxlint/binding-linux-arm64-musl@1.93.0': + resolution: {integrity: sha512-zM8Fd/K8sqGvsBcJBZ3oVZ3ctGWbszA08IaGt5gFFF5RcunppAI/ZnAXbouABvnWeJ//S44KKlfPZnDDbeiphg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] libc: [musl] - '@oxlint/binding-linux-ppc64-gnu@1.87.0': - resolution: {integrity: sha512-d5Mnn+ICbhoJPi37Ccjy+86T5qfH2+mSTrTMBXNPfB+wqSWOayBBLLIrCXdUy1YssluCVdGkl+DO9w5r5ODmUA==} + '@oxlint/binding-linux-ppc64-gnu@1.93.0': + resolution: {integrity: sha512-7qKCnvhZKDXJG2pdbLazd2hw4FxjJHbZOFrrbzyy5PdHfPLH9vnNUa1le01A8uItZuYKPBPncH+HCoEiFT4SgA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ppc64] os: [linux] libc: [glibc] - '@oxlint/binding-linux-riscv64-gnu@1.87.0': - resolution: {integrity: sha512-sf5YWuUo1Dx9loqWCgF8P278MycfcD4JHjDC/LV5j11L3Lqa4PFiwCjD6B8kP4AjsgZZkLn3xbpJEtZBaccs4Q==} + '@oxlint/binding-linux-riscv64-gnu@1.93.0': + resolution: {integrity: sha512-2pgulxC6G8V5wE750NJE/fRkf9aO6i6yoj10wyaR2EdiNtan4OemsOtsQ0ZTXGdY8Q3IoTmlND3GYvjJsvikYg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [riscv64] os: [linux] libc: [glibc] - '@oxlint/binding-linux-riscv64-musl@1.87.0': - resolution: {integrity: sha512-+aCraYbmK3uU3P0rFojjeaK9pGY6JvBDXh/0CM+gPyWKmNmXmnFe0qj4qj02U4ibFpbd9Pa9CmDvIdjJUd29rA==} + '@oxlint/binding-linux-riscv64-musl@1.93.0': + resolution: {integrity: sha512-yWsn6Gg2PnGG5jlyDz5+pHGiMTMiy4adaa4WRMzDgzB8efaShk1JMmTHIBSVLQMh0tYXRs4CN5uJCO79r4Mi4g==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [riscv64] os: [linux] libc: [musl] - '@oxlint/binding-linux-s390x-gnu@1.87.0': - resolution: {integrity: sha512-7rzbZQIljo6VLWVPqUyLa2P/WV3VFsJB4M52R4NCUJn1A50yjtUsHxiMHFL9opEKGFIiTbZ3VQzmtcJOPUq4NQ==} + '@oxlint/binding-linux-s390x-gnu@1.93.0': + resolution: {integrity: sha512-WCn5plwp/ezS2RDPQKp0/EXEVRr9/dDexUdRKmsMFqzNM5xBSZ1wbsi3PuMk1VfkMRnI5BuazCsziCWMXRDOlw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [s390x] os: [linux] libc: [glibc] - '@oxlint/binding-linux-x64-gnu@1.87.0': - resolution: {integrity: sha512-Dry46Fa+AXE/xt9J/YriujU1pU9mzfNWHGQwtOYibAFH8HLrKWCi93AhIGnuUMiwn2JbuBkRyz51f50Ly4r4ow==} + '@oxlint/binding-linux-x64-gnu@1.93.0': + resolution: {integrity: sha512-F2CGjb9LAkzH+IYTZSzd1klQ1vk5z6Utjax64WeLByCkYXbVDbsun+Oy2hLfW2MDSKCvW+jwy/9ld0EPgdeu+A==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] libc: [glibc] - '@oxlint/binding-linux-x64-musl@1.87.0': - resolution: {integrity: sha512-f/HMZez74gJvnRpGz+b5sdGyWrEgRLmFTXg9sNoqjPWogGxYHUhXKTKyMiYsu9rUGR2ciYqL3fk+Ua4JhMJbRA==} + '@oxlint/binding-linux-x64-musl@1.93.0': + resolution: {integrity: sha512-plf5DE2objcG8Tf7mXRuRa8tT8rzDkpjqXQtKoGsKHWkpgsialbON1+cCtoSEUTVbQUjXvuAm8vV9+3rR0yCBw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] libc: [musl] - '@oxlint/binding-openharmony-arm64@1.87.0': - resolution: {integrity: sha512-lEC6ZfPZm/07JlB7FsOWX9o1RiHlXiBW594LSUGuXmekC8LZmvUPP9XzE2WZcNxJi5cHA/Fw56o02c3JxgMA5g==} + '@oxlint/binding-openharmony-arm64@1.93.0': + resolution: {integrity: sha512-Kp2yJrKvoTe9FfKdO/xwLNUbs2bYTMKx0+aoQD1s0h/Tx0kSgtHSdGmrk8tTKdluosjFbo88qYRIaNIX43AfFw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [openharmony] - '@oxlint/binding-win32-arm64-msvc@1.87.0': - resolution: {integrity: sha512-afBWKOD36dUiA9AenaiWpCg8xfyUVPYznyAAVXu413brK4RA5UI/Xoc4yfeGIT8G1a44MV+JR7hioryerBDzGQ==} + '@oxlint/binding-win32-arm64-msvc@1.93.0': + resolution: {integrity: sha512-vigjcHCFsR6KjnWTEVfaCxcMYapEuaK9FZa1MpewwQ1S+Xud3v0okfkj1RySsD6RF1NRHIjSlQSalTnKIaj3nA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [win32] - '@oxlint/binding-win32-ia32-msvc@1.87.0': - resolution: {integrity: sha512-daptNsEOuru4/nJTxV4DBHNJ5GepzmaBVQf+jjgKQGi9NRlZKik+RFq4hUL7ewsF1pwjKM+SkYaMbF82UwFGnw==} + '@oxlint/binding-win32-ia32-msvc@1.93.0': + resolution: {integrity: sha512-0Ot3BEe/AAr2/uQhe55r8CmPlperYk2mQmxdutOru7oU0kir6IiEVHb1TG3GORRlfra97lPHVDLhgmihiKzLrg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ia32] os: [win32] - '@oxlint/binding-win32-x64-msvc@1.87.0': - resolution: {integrity: sha512-k+m/EShyXE29J/r1fjk0HlAzhN5JhIvj044oSJkXTEkCLrWZQgXb/3r4q5LTw/eaKW/4GuMXG2xmiJs3s5rPNw==} + '@oxlint/binding-win32-x64-msvc@1.93.0': + resolution: {integrity: sha512-ZzzIIVs/Qkm8trUWYKF0OYub5ALlv50/3gsEZbKAvWgz+yNJX6uRmQ8ySPXU2Q0/Y9m4JCOjhpmC8XUYbPHX5Q==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [win32] @@ -3287,9 +3529,8 @@ packages: '@poppinss/exception@1.2.2': resolution: {integrity: sha512-m7bpKCD4QMlFCjA/nKTs23fuvoVFoA83brRKmObCUNmi/9tVu8Ve3w4YQAnJu4q3Tjf5fr685HYIC/IA2zHRSg==} - '@quansync/fs@0.1.3': - resolution: {integrity: sha512-G0OnZbMWEs5LhDyqy2UL17vGhSVHkQIfVojMtEWVenvj0V5S84VBgy86kJIuNsGDp2p7sTKlpSIpBUWdC35OKg==} - engines: {node: '>=20.0.0'} + '@quansync/fs@1.1.0': + resolution: {integrity: sha512-qAPG/t3HqML1TlN7sY/pTbEjzFVAKsMjNNMGheyDosro+kT4iw2KCUoHcVdmliwWjorm4elZbgNQyU2eD97eDg==} '@radix-ui/primitive@1.1.7': resolution: {integrity: sha512-rqWnm76nYT8HoNNqEjpgJ7Pw/DrBj5iBTrmEPo6HTX5+VJyBNOqTdv4g89G63HuR5g0AaENoAcH7Is5fF2kZ8Q==} @@ -3699,6 +3940,12 @@ packages: cpu: [arm] os: [android] + '@rolldown/binding-android-arm-eabi@1.3.2': + resolution: {integrity: sha512-kqR2xcygEx3WwDY69LsKeyf7SVmx4yzMtKZRknyaHieVJdRvvnAM97L0Gq6tUFc9T2YXcW/Ghij2+Um6He0LTw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] + os: [android] + '@rolldown/binding-android-arm64@1.2.14': resolution: {integrity: sha512-QiVxHofl6A8lQU7WAtOUY4QMVZXohxwz7WJJoeh8NBEUyKfIkMRKhYyq8az/1RypNiIXzNTtiS6KwHz0erxYRQ==} engines: {node: ^20.19.0 || >=22.12.0} @@ -3711,10 +3958,11 @@ packages: cpu: [arm64] os: [android] - '@rolldown/binding-darwin-arm64@1.0.0-beta.23': - resolution: {integrity: sha512-rppgXFU4+dNDPQvPsfovUuYfDgMoATDomKGjIRR5bIU98BYkQF1fm+87trApilfWSosLQP9JsXOoUJO/EMrspQ==} + '@rolldown/binding-android-arm64@1.3.2': + resolution: {integrity: sha512-gXM4GAAvvIZA7qUuSCQS+Zz91H2fagKa5MNppUdjzysJ8LXMWm9D/gQj4nfOKo6okquDQ5pkjsuo2SUMXNW0Rw==} + engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] - os: [darwin] + os: [android] '@rolldown/binding-darwin-arm64@1.2.14': resolution: {integrity: sha512-lTQOzHuBIooh3jIr5XINQkjPGEuGy+Dsy0meXDr6Sjty0b99kYgGh4uBC/8mJX1T0kC8d6S0aPP1Y+bHkh6aBw==} @@ -3728,9 +3976,10 @@ packages: cpu: [arm64] os: [darwin] - '@rolldown/binding-darwin-x64@1.0.0-beta.23': - resolution: {integrity: sha512-aFo1v7GKysuwSAfsyNcBb9mj3M+wxMCu3N+DcTD5eAaz3mFex6l+2b/vLGaTWNrCMoWhRxV8rTaI1eFoMVdSuQ==} - cpu: [x64] + '@rolldown/binding-darwin-arm64@1.3.2': + resolution: {integrity: sha512-OBs5hp3W+LwMEUmDMMMnu08ncG0t6DDgnFU+6TAucKtAfNgerYLZSr2jtREKb/JuPQ1J7bJnWIgKKkxvjuAw1g==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] os: [darwin] '@rolldown/binding-darwin-x64@1.2.14': @@ -3745,10 +3994,11 @@ packages: cpu: [x64] os: [darwin] - '@rolldown/binding-freebsd-x64@1.0.0-beta.23': - resolution: {integrity: sha512-/NzbXIFIR5KR+fZ351K1qONekakXpiPhUX55ydP6ok8iKdG7bTbgs6dlMg7Ow0E2DKlQoTbZbPTUY3kTzmNrsQ==} + '@rolldown/binding-darwin-x64@1.3.2': + resolution: {integrity: sha512-X0VGYd4v/gdjfa/IP6uHuMhofPoUDYvK/byk3bC0jQ1pKKgt6RZ4B4puMqP0AHkjmIHAsxA471mM6AxZ39IaTA==} + engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] - os: [freebsd] + os: [darwin] '@rolldown/binding-freebsd-x64@1.2.14': resolution: {integrity: sha512-u371GbXoVXrEgP20PwzoGNOdAOqAMhzo19JzzY+V4YmmnC+DTOoqdbMu+O+54emM59Mik/UdrtWgcuEDKWRPKA==} @@ -3762,10 +4012,11 @@ packages: cpu: [x64] os: [freebsd] - '@rolldown/binding-linux-arm-gnueabihf@1.0.0-beta.23': - resolution: {integrity: sha512-vPnCHxjyR4ZVj9x6sLJMCAdBY99RPe6Mnwxb5BSaE6ccHzvy015xtsIEG7H9E9pVj3yfI/om77jrP+YA5IqL3w==} - cpu: [arm] - os: [linux] + '@rolldown/binding-freebsd-x64@1.3.2': + resolution: {integrity: sha512-mr04K4cp9J/fj9fknrX8e4QvI/V48Sp+4v64PoLwhoirIH8b8L8EBrF/0bTjV1It2IL91hoNG13GblnWLglkxA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [freebsd] '@rolldown/binding-linux-arm-gnueabihf@1.2.14': resolution: {integrity: sha512-BqwKsdZQf6EqVWr8fv2MrDYzAvOZ7+NYFSJESRGs87fkseEhs0TU9TXgRJTkZoRRkxTizyEg1LKUXfU3/78uqg==} @@ -3779,11 +4030,11 @@ packages: cpu: [arm] os: [linux] - '@rolldown/binding-linux-arm64-gnu@1.0.0-beta.23': - resolution: {integrity: sha512-PFBBnj9JqLOL8gjZtoVGfOXe0PSpnPUXE+JuMcWz568K/p4Zzk7lDDHl7guD95wVtV89TmfaRwK2PWd9vKxHtg==} - cpu: [arm64] + '@rolldown/binding-linux-arm-gnueabihf@1.3.2': + resolution: {integrity: sha512-VgWy02HU9Tiy6tU8U+kF3Fd4TQwTNdIBvs2MlgViP1ksMtAnQQTIPAj0ZsJzIQXKIOugqQSpqxQgELJ3fkuL5w==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm] os: [linux] - libc: [glibc] '@rolldown/binding-linux-arm64-gnu@1.2.14': resolution: {integrity: sha512-SD9kY8M009x/7s57Z1dgUVlP5+uYBgKQK0Tkr1WIWngrtUJmRCW1RJFMY7QDla2khXhmg2i5Io7MUjcmZNZ/KQ==} @@ -3799,11 +4050,12 @@ packages: os: [linux] libc: [glibc] - '@rolldown/binding-linux-arm64-musl@1.0.0-beta.23': - resolution: {integrity: sha512-KyQRLofVP78yUCXT90YmEzxK6I9VCBeOTSyOrs40Qx0Q0XwaGVwxo7sKj2SmnqxribdcouBA3CfNZC4ZNcyEnQ==} + '@rolldown/binding-linux-arm64-gnu@1.3.2': + resolution: {integrity: sha512-0wloJFYqV844gv6boiERbHpErxbxHbmlgnMX5VxP1Ux+DLBqGrUOn0cIpBmCZEcTITes3QUelxya4u8c9ziQvQ==} + engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] - libc: [musl] + libc: [glibc] '@rolldown/binding-linux-arm64-musl@1.2.14': resolution: {integrity: sha512-BJ2CL19M6uuWesMgnqJzgxoI+N+eV7b0A9O9vLV42y+gitC41fNa8KElau1tHVzuLWX5GzEuxMPhAO0tQXQMkg==} @@ -3819,6 +4071,13 @@ packages: os: [linux] libc: [musl] + '@rolldown/binding-linux-arm64-musl@1.3.2': + resolution: {integrity: sha512-Kys8wgFQy8H8vua0MNpC0akMBFoNO8455RHk2yycBM0iayMIAtVAL6xmV9TWAkehFgrrlImTL2fZdX5LXfYtAA==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [linux] + libc: [musl] + '@rolldown/binding-linux-ppc64-gnu@1.2.14': resolution: {integrity: sha512-4+Kl8daPV8NDHaD7mfCcc1pRM+Qg7ab8DyMm5FG5WoZgv4h2i3KFN1CybYBNbQqmuYm7ftJLvmMI1eHYJ22S/Q==} engines: {node: ^20.19.0 || >=22.12.0} @@ -3833,6 +4092,13 @@ packages: os: [linux] libc: [glibc] + '@rolldown/binding-linux-ppc64-gnu@1.3.2': + resolution: {integrity: sha512-L8eej7+/StRxUHHOPsOVl7Fzx/3tumuGB4hGQZKT73xRI16KZhaSJr0gi3C3WBjNRxeJRKKps2UD4lQukP+oBw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [ppc64] + os: [linux] + libc: [glibc] + '@rolldown/binding-linux-s390x-gnu@1.2.14': resolution: {integrity: sha512-V/h8ePq1fKDrmtFMz6xcCN3DKvuvMRrwwD1q0PkBeeo4DpK64biaKvqWGVxqCeYKqeRk7gE7/iKPxLCn08O97A==} engines: {node: ^20.19.0 || >=22.12.0} @@ -3847,9 +4113,10 @@ packages: os: [linux] libc: [glibc] - '@rolldown/binding-linux-x64-gnu@1.0.0-beta.23': - resolution: {integrity: sha512-EubfEsJyjQbKK9j3Ez1hhbIOsttABb07Z7PhMRcVYW0wrVr8SfKLew9pULIMfcSNnoz8QqzoI4lOSmezJ9bYWw==} - cpu: [x64] + '@rolldown/binding-linux-s390x-gnu@1.3.2': + resolution: {integrity: sha512-MV5CEb/nV8neQOj7l6945q1vy62HXtWO8zPDvfySPusoUzdBoLoJ/DfXXwaYThGTXZCniF+5bCf253WTPPK7Yw==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [s390x] os: [linux] libc: [glibc] @@ -3867,11 +4134,12 @@ packages: os: [linux] libc: [glibc] - '@rolldown/binding-linux-x64-musl@1.0.0-beta.23': - resolution: {integrity: sha512-MUAthvl3I/+hySltZuj5ClKiq8fAMqExeBnxadLFShwWCbdHKFd+aRjBxxzarPcnqbDlTaOCUaAaYmQTOTOHSg==} + '@rolldown/binding-linux-x64-gnu@1.3.2': + resolution: {integrity: sha512-3qssvvVvkwQookZ1/1avlKWc5orAR85vgKdzDd5noZS8nnHiI/ejOAEt0xfNYvtBBF7/DZmP8dANWkRBJVOBCA==} + engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] - libc: [musl] + libc: [glibc] '@rolldown/binding-linux-x64-musl@1.2.14': resolution: {integrity: sha512-3G3tnAmTpdk9jO3GQtyHXqeFD2SlecfTws/Y3M2mmj9nMBwwuLT4kur8sZKeu7ENUHSpVO3cIsm5A52LEWWwlg==} @@ -3887,6 +4155,13 @@ packages: os: [linux] libc: [musl] + '@rolldown/binding-linux-x64-musl@1.3.2': + resolution: {integrity: sha512-rJqoFTm/bCZFKKgaT4NzWn/TuJkFDToZ/rzYFnYVBL28jH1nIfg6snx2mDri30nal9H+wcYfKpoPR9jrMQgQQg==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [linux] + libc: [musl] + '@rolldown/binding-openharmony-arm64@1.2.14': resolution: {integrity: sha512-qyr5XiNGxm2ytx17vvtcJ9nXn6v1gENETi503bJx3OGwZ1tSonj7BosxbMa/xeAfSl5iS9X6KjEWYXLu6v1L7Q==} engines: {node: ^20.19.0 || >=22.12.0} @@ -3899,20 +4174,21 @@ packages: cpu: [arm64] os: [openharmony] - '@rolldown/binding-wasm32-wasi@1.0.0-beta.23': - resolution: {integrity: sha512-YI7QMQU01QFVNTEaQt3ysrq+wGBwLdFVFEGO64CoZ3gTsr/HulU8gvgR+67coQOlQC9iO/Hm1bvkBtceLxKrnA==} - engines: {node: '>=14.21.3'} - cpu: [wasm32] + '@rolldown/binding-openharmony-arm64@1.3.2': + resolution: {integrity: sha512-ozdbCjHfh0N//wJNExjJlSlcDaeIKo8k1ktzkLUyESr2Gu/Qw7nBYxKe3jgtoaxda570vg10WdYosre82263hQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] + os: [openharmony] '@rolldown/binding-wasm32-wasi@1.2.19': resolution: {integrity: sha512-7EH+skOsl5qpWnK0vzamgJFhOv1cwxQpsxm8tI883K9fur5c27p8q87fzEO6BbBPabA2/+s/zR63/pLc137iOg==} engines: {node: ^20.19.0 || ^22.13.0 || >=23.5.0} cpu: [wasm32] - '@rolldown/binding-win32-arm64-msvc@1.0.0-beta.23': - resolution: {integrity: sha512-JdHx6Hli53etB/QsZL1tjpf4qa87kNcwPdx4iVicP/kL7po6k5bHoS5/l/nRRccwPh7BlPlB2uoEuTwJygJosQ==} - cpu: [arm64] - os: [win32] + '@rolldown/binding-wasm32-wasi@1.3.2': + resolution: {integrity: sha512-p5VA6Vk/2cXZPVWf+dDbuE0dkhrcoAo6pISTJmzUnsSdQqNJdusyR8lZgHku095+r27zrYISNLZnJoqrcePW0A==} + engines: {node: ^20.19.0 || ^22.13.0 || >=23.5.0} + cpu: [wasm32] '@rolldown/binding-win32-arm64-msvc@1.2.14': resolution: {integrity: sha512-oA4o5o0S2yB199YyYXDzKUv1Z56Rc+mgOjwm7Z/vJ9Z8igiDPYvoOuDyo6g7AK/ZaF09nPhDKVnGBcYHO11GXA==} @@ -3926,14 +4202,10 @@ packages: cpu: [arm64] os: [win32] - '@rolldown/binding-win32-ia32-msvc@1.0.0-beta.23': - resolution: {integrity: sha512-rMZ0QBmcDND97+5unXxquKvSudV8tz6S7tBY3gOYlqMFEDIRX0BAgxaqQBQbq34ZxB9bXwGdjuau3LZHGreB6g==} - cpu: [ia32] - os: [win32] - - '@rolldown/binding-win32-x64-msvc@1.0.0-beta.23': - resolution: {integrity: sha512-0PqE7vGIpA+XT+qxAYJQKTrB5zz8vJiuCOInfY/ks/QOs6ZZ9Os8bdNkcpCy4rYo+GMZn0Q8CwyPu4uexWB1aA==} - cpu: [x64] + '@rolldown/binding-win32-arm64-msvc@1.3.2': + resolution: {integrity: sha512-XDb2U14Orf4r76SwzvJ7avePL00w4gHBmi1Ig4B/itYFEUTmYMNDHVU0dcYuBa0LgNBqyREoJOrQKxQlyYJA7A==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [arm64] os: [win32] '@rolldown/binding-win32-x64-msvc@1.2.14': @@ -3948,6 +4220,12 @@ packages: cpu: [x64] os: [win32] + '@rolldown/binding-win32-x64-msvc@1.3.2': + resolution: {integrity: sha512-lEsKzKJqIUDZVCBhS4lkZuyQUhV1oRg5UHkI72qlOAqJn7qEXcoVdTridFS7PHNWdZknBl95EAF/4P1Xv0K1eQ==} + engines: {node: ^20.19.0 || >=22.12.0} + cpu: [x64] + os: [win32] + '@rolldown/plugin-babel@0.2.3': resolution: {integrity: sha512-+zEk16yGlz1F9STiRr6uG9hmIXb6nprjLczV/htGptYuLoCuxb+itZ03RKCEeOhBpDDd1NU7qF6x1VLMUp62bw==} engines: {node: '>=22.12.0 || ^24.0.0'} @@ -3965,12 +4243,26 @@ packages: vite: optional: true + '@rolldown/plugin-babel@0.3.1': + resolution: {integrity: sha512-NVChbrs6m9iEEOqOdreNHRgmwq6KPNCrbzzQw+Eqtp3pPQgXSpiWrQwB8lUObZX+lXqmWAbpo9Q/Mp6yFgy8yg==} + engines: {node: '>=22.12.0 || ^24.0.0'} + peerDependencies: + '@babel/core': ^7.29.6 + '@babel/plugin-transform-runtime': ^7.29.0 || ^8.0.0-rc.1 + '@babel/runtime': ^7.27.0 || ^8.0.0-rc.1 + rolldown: ^1.0.0-rc.5 + vite: ^8.0.0 + peerDependenciesMeta: + '@babel/plugin-transform-runtime': + optional: true + '@babel/runtime': + optional: true + vite: + optional: true + '@rolldown/pluginutils@1.0.0-beta.19': resolution: {integrity: sha512-3FL3mnMbPu0muGOCaKAhhFEYmqv9eTfPSJRJmANrCwtgK8VuxpsZDGK+m0LYAGoyO8+0j5uRe4PeyPDK1yA/hA==} - '@rolldown/pluginutils@1.0.0-beta.23': - resolution: {integrity: sha512-lLCP4LUecUGBLq8EfkbY2esGYyvZj5ee+WZG12+mVnQH48b46SVbwp+0vJkD+6Pnsc+u9SWarBV9sQ5mVwmb5g==} - '@rolldown/pluginutils@1.0.1': resolution: {integrity: sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==} @@ -4116,12 +4408,9 @@ packages: resolution: {integrity: sha512-y/i2vNAYCFELvHC0n+c8BmCG3nId2UKWEA0w0VDc6iXJZCFDRu2eZ6M5a0/shUVOEvMo6ktan1wXrnJLZTcS8A==} engines: {node: '>=22'} peerDependencies: - typescript: '*' valibot: '*' zod: ^4.6.6 peerDependenciesMeta: - typescript: - optional: true valibot: optional: true zod: @@ -4495,8 +4784,8 @@ packages: '@types/chai@5.2.2': resolution: {integrity: sha512-8kB30R7Hwqf40JPiKhVzodJs2Qc1ZJ5zuT3uzw5Hq/dhNCl3G3l83jfpdI1e20BP348+fV7VIL/+FxaXkqBmWg==} - '@types/cookie@0.6.0': - resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==} + '@types/convert-source-map@2.0.3': + resolution: {integrity: sha512-ag0BfJLZf6CQz8VIuRIEYQ5Ggwk/82uvTQf27RcpyDNbY0Vw49LIPqAxk5tqYfrCs9xDaIMvl4aj7ZopnYL8bA==} '@types/debug@4.1.12': resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==} @@ -4549,12 +4838,6 @@ packages: '@types/node@18.19.130': resolution: {integrity: sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==} - '@types/node@22.16.0': - resolution: {integrity: sha512-B2egV9wALML1JCpv3VQoQ+yesQKAmNMBIAY7OteVrikcOcAkWm+dGL6qpeCktPjAv6N1JLnhbNiqS35UpFyBsQ==} - - '@types/node@22.20.1': - resolution: {integrity: sha512-EANqOCF9QFyra+4pfxUcX9STKJpCLjMbObVzljIJomAWSnuSIEAvyzEU53GaajbXJEgdh0iEcPL+DGvpUd4k1Q==} - '@types/node@22.20.3': resolution: {integrity: sha512-DZmzkmwHzXrLPAXPyKNDzlIwMMUZCVacoD25ywdy5YTKGbOx/2ld+Q38Im2zJ0vBuZP5Prd3VZutKZyXwkOS8A==} @@ -4598,12 +4881,12 @@ packages: '@types/semver@7.8.0': resolution: {integrity: sha512-1mAINjtQCXXeLkJ9ehXkwOcBpqtLxiVtKhpUf83DdRNdQKV0iXZpaHYqRr7nj+wvxuJzoAmAwXI+sCNMv1CzLQ==} + '@types/set-cookie-parser@2.4.10': + resolution: {integrity: sha512-GGmQVGpQWUe5qglJozEjZV/5dyxbOOZ0LHe/lqyWssB88Y4svNfst0uqBVscdDeIKl5Jy5+aPSvy7mI9tYRguw==} + '@types/statuses@2.0.6': resolution: {integrity: sha512-xMAgYwceFhRA2zY+XbEA7mxYbA093wdiW8Vu6gZPGWy9cmOyU9XesH1tNcEWsKFd5Vzrqx5T3D38PWx1FIIXkA==} - '@types/tough-cookie@4.0.5': - resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==} - '@types/unist@2.0.11': resolution: {integrity: sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==} @@ -4613,6 +4896,130 @@ packages: '@types/yauzl@3.4.0': resolution: {integrity: sha512-NRPn5w6h8dhcnmx3YIRQcqMywY/+nND/uOkJessedcrowO3C0AssHp3tMJpxKAwOhFOo0OV1y9VtsC5hbKKBAw==} + '@typescript/typescript-aix-ppc64@7.0.2': + resolution: {integrity: sha512-MTKKkWB7p/0E9xi1d1tHtZ5PiLkGEMIq88pK2CubZjOsLtYTLqhgIgi6zepFa+9GHZ6h05NMCkQxGKiPXMxXtQ==} + engines: {node: '>=16.20.0'} + cpu: [ppc64] + os: [aix] + + '@typescript/typescript-darwin-arm64@7.0.2': + resolution: {integrity: sha512-gowzar9MwS/aRWp6f3a4KUqzRjAZjOsmGNCM6LcTgXum+dBfgsBVMN+AgvOCCbguXyick6LJhpBszxMebJ8syA==} + engines: {node: '>=16.20.0'} + cpu: [arm64] + os: [darwin] + + '@typescript/typescript-darwin-x64@7.0.2': + resolution: {integrity: sha512-SZ9xZInqApNlNGc9s0W1VSsktYSOe9cFqNOIqmN1Gs8SmkjKZYFt017G4VwPxASInODuAdbTW7sXiFUf893RgA==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [darwin] + + '@typescript/typescript-freebsd-arm64@7.0.2': + resolution: {integrity: sha512-W5NH4y/J0plIIS5b2xvTEkU7JFxyqdMAOgf+Ilhl0vHQXKO5dZoxd+C/jEtq56c4F3wk71RB4BMRQ2XdI+bwYQ==} + engines: {node: '>=16.20.0'} + cpu: [arm64] + os: [freebsd] + + '@typescript/typescript-freebsd-x64@7.0.2': + resolution: {integrity: sha512-UMGDx5sTpzNw3WiPebH7l90IWfJggEd+egHt/q6p7/Cm3zqoV7VxkGXt+3DxPIw8CcmvAB0j3sVVfbhX+M4Tpw==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [freebsd] + + '@typescript/typescript-linux-arm64@7.0.2': + resolution: {integrity: sha512-Qh4eU4/y3yDjnfjjyPYihMj5/ODIlmt+Bzu17OI+fiSRDW57QmU5SiN63exPRNJPKUzcc1INa1NXdrJ+MqHjUQ==} + engines: {node: '>=16.20.0'} + cpu: [arm64] + os: [linux] + + '@typescript/typescript-linux-arm@7.0.2': + resolution: {integrity: sha512-gffT3xPz9sR7j/YJExkyPntrI0P2EP9XbOyWzth2/Gs0RstK+90RBcO0ncXoXy/beYll1SXw846Nf2zdnEz0QQ==} + engines: {node: '>=16.20.0'} + cpu: [arm] + os: [linux] + + '@typescript/typescript-linux-loong64@7.0.2': + resolution: {integrity: sha512-uEHck9i8hoAzXPiYRib1O7miOnz23SxIeVl6F4LXox+qov1K35jHcEW6VHKvZI+pyvl7fZEP4MCU5LYvIq1GuQ==} + engines: {node: '>=16.20.0'} + cpu: [loong64] + os: [linux] + + '@typescript/typescript-linux-mips64el@7.0.2': + resolution: {integrity: sha512-R4KvAMnE43W5Qeqb0Ly56O3mWMWIAgsMyz36DCaycd5nbg/9kzm0liw3JocfRqyJY0KPmzFjbswozXyW0DnIYA==} + engines: {node: '>=16.20.0'} + cpu: [mips64el] + os: [linux] + + '@typescript/typescript-linux-ppc64@7.0.2': + resolution: {integrity: sha512-DORx5b3sd/4S7eayxm4FQv+A7CrkUIGRaHiwI8oiHTAI1fAPWhF4J0vAlkC8biAlHSVVwxMQ3tjZ2/DVbnQiiA==} + engines: {node: '>=16.20.0'} + cpu: [ppc64] + os: [linux] + + '@typescript/typescript-linux-riscv64@7.0.2': + resolution: {integrity: sha512-wf0jqEDOjrPRnKwYRyyJDRo11KMbvMFrU+q4zqKyChODBzvlkbhNQfKvLxQCcwTpdDaXSHZTVuh0JoCrKCUMHQ==} + engines: {node: '>=16.20.0'} + cpu: [riscv64] + os: [linux] + + '@typescript/typescript-linux-s390x@7.0.2': + resolution: {integrity: sha512-IkwJc3L7yhytWd/ewjyxNDfOmswCm9GWMJT/ue/dU4aZNbwZeYAetq42VyLmsmSjvoX7z74X6ZaYCtzAr0EuGw==} + engines: {node: '>=16.20.0'} + cpu: [s390x] + os: [linux] + + '@typescript/typescript-linux-x64@7.0.2': + resolution: {integrity: sha512-EYdf2cNg7rgCWJnxCdJ+F3V39O8ihb37eHAu1LK8oAFizgTQbPOK7zHHXbPt8rX24COqODXeI3sIf0fCXG7H/A==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [linux] + + '@typescript/typescript-netbsd-arm64@7.0.2': + resolution: {integrity: sha512-+polYF4MF04aPpO5FTkHran9yUQDSXqy5GiSDKpsll5jy3l3+g9QLhpf39T+ePtefhXLOGrLl0QIjkQP6VnelA==} + engines: {node: '>=16.20.0'} + cpu: [arm64] + os: [netbsd] + + '@typescript/typescript-netbsd-x64@7.0.2': + resolution: {integrity: sha512-8YIT0EHM/3dq10ZOVF/A7pc/YSMtbcecct4rWtexrnSCHOPcpC2KTLXfTCR6vDpnSiY12heNb1GiN/wu+T/FyA==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [netbsd] + + '@typescript/typescript-openbsd-arm64@7.0.2': + resolution: {integrity: sha512-APT8+ClYnuYm1u9+kgGXoMj2VzWzcymwh2gNSQVySHfkRDGOTVkoWLjCmOQSaO+PoqQ57B0flRp9SA+7GnnkzQ==} + engines: {node: '>=16.20.0'} + cpu: [arm64] + os: [openbsd] + + '@typescript/typescript-openbsd-x64@7.0.2': + resolution: {integrity: sha512-yX7s+Q0Dln0Dt9tEzZsAjXXR/+ytBM7AlglaqyeMPxQszJ1JhlJdZ6jLA+IzldHtflX81em7lDao1xXu+aRRkg==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [openbsd] + + '@typescript/typescript-sunos-x64@7.0.2': + resolution: {integrity: sha512-dLJDGaLZ1D4HPQn62u1n8mBDkJREwMsAkCdkwd4Ieqw+x3TUyTsqY0YiBCtE6H6OzzgGk3iuZ3vFWRS+E8/d1g==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [sunos] + + '@typescript/typescript-win32-arm64@7.0.2': + resolution: {integrity: sha512-Gyl1Vy6OsWesLzmq+EP0Fb7b4Nid5232AvcA2SFcdYreldpNtYFFofPjnt62y9hQy7VTaZp65ICJjuAQRaVcIQ==} + engines: {node: '>=16.20.0'} + cpu: [arm64] + os: [win32] + + '@typescript/typescript-win32-x64@7.0.2': + resolution: {integrity: sha512-0BQ3HkAHHlKLSp1qRvf3SUhGpGsDuhB/jgFw75guyqbxJqEaS0Cw/VFO8i2nHglJUzQCRtMMR/IBAKE3ETMC4g==} + engines: {node: '>=16.20.0'} + cpu: [x64] + os: [win32] + + '@typescript/typescript6@6.0.2': + resolution: {integrity: sha512-mbCddXd+jm7hfx7w2YU64/Av4/NqqeG3GoRZgxPcgoTxYjhrcfJRw9ULch71SS4G+Q3bOXFhRvPqjguN0Hyp5w==} + hasBin: true + '@uidotdev/usehooks@2.4.1': resolution: {integrity: sha512-1I+RwWyS+kdv3Mv0Vmc+p0dPYH0DTRAo04HLyXReYBL9AeseDWUJyi4THuksBJcu9F0Pih69Ak150VDnqbVnXg==} engines: {node: '>=16'} @@ -4693,13 +5100,13 @@ packages: peerDependencies: vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0-beta.0 - '@vitejs/plugin-react@6.1.2': - resolution: {integrity: sha512-fhJNGUdscQa4HkI0xFxwonWyhnVReCPDbXI7FH7jmzpnVCrFQI7PRrhWecO263610vOrs9tr2Y4xcf8uAdFxbw==} + '@vitejs/plugin-react@6.3.0': + resolution: {integrity: sha512-H9E955aVvD2F4zNHCw4eIZbIfF6xKldlh7MNu+hSU7xwQzh65lI/N+CJWqmfhi0PEjDXIt/H7T7J/4wU63KJiw==} engines: {node: ^20.19.0 || >=22.12.0} peerDependencies: - '@rolldown/plugin-babel': ^0.1.7 || ^0.2.0 + '@rolldown/plugin-babel': ^0.1.7 || ^0.2.0 || ^0.3.0 babel-plugin-react-compiler: ^1.0.0 - oxc-transform-react: ^0.152.0 + oxc-transform-react: '>=0.152.0 <0.157.0' vite: ^8.0.0 peerDependenciesMeta: '@rolldown/plugin-babel': @@ -4746,8 +5153,76 @@ packages: '@vitest/spy@5.0.5': resolution: {integrity: sha512-lwJRExuH417257Q5wv9QYugN9IMJkoxcrKrYxGPQkBzl7wlNpTUxD/5yNX4ESKVUIShKPgkGchYPFMWOOk0wzw==} - '@workflow/serde@4.1.0-beta.2': - resolution: {integrity: sha512-8kkeoQKLDaKXefjV5dbhBj2aErfKp1Mc4pb6tj8144cF+Em5SPbyMbyLCHp+BVrFfFVCBluCtMx+jjvaFVZGww==} + '@volar/kit@2.4.31': + resolution: {integrity: sha512-pQgvegC28dfdNcs/iDNZVHkMs+dG7rpD9Aj+sNU2hildv1QuH7/MIoff/cSJW/IR25AGOeHWbJXWWFKDXXWtVw==} + peerDependencies: + typescript: <7 + + '@volar/language-core@2.4.31': + resolution: {integrity: sha512-OM+OZfynHa1/4WlC8klqvwTQVmhYUZuwpAKdfl/rlvK8jaIozMD5qwXsOkxcRJA2tC+TEFsG1K81lNP4s/IAzQ==} + + '@volar/language-server@2.4.31': + resolution: {integrity: sha512-PI/3CLcoHzb3RUNuh3ecWEf3d3doGnJ7/dYTvvE+8Y9dnV2SjVXp6BP7G2S5mdq9L1yFYP5yhoEHXc1OIfmX0A==} + peerDependencies: + typescript: <7 + peerDependenciesMeta: + typescript: + optional: true + + '@volar/language-service@2.4.31': + resolution: {integrity: sha512-LM9HFsBVhHZ7RbFUZK9P23FvamK8XCDcN0kNgOTts02wVgnygo3ReLbmBmUZ3GuYnrYn6HHoQvqk/eHIzzTnrg==} + peerDependencies: + typescript: <7 + peerDependenciesMeta: + typescript: + optional: true + + '@volar/source-map@2.4.31': + resolution: {integrity: sha512-odi31S3mKm57aO7Pd5P624FmGIB49U4lUPnYRUKvCDa8WZy5N5Yb+GMp2WJNaeIr4+q0ijNpuHsJLrfEiWvHtA==} + + '@volar/typescript@2.4.31': + resolution: {integrity: sha512-OBHLLAi03AmaRWqzytdFhgtW2B3HM+2/vXFkvnZAlEKltalUTyu+No7g9aZx7e9efrDLOtHsd/3PgCHSfgVJ/Q==} + peerDependencies: + typescript: <7 + peerDependenciesMeta: + typescript: + optional: true + + '@vscode/emmet-helper@2.11.0': + resolution: {integrity: sha512-QLxjQR3imPZPQltfbWRnHU6JecWTF1QSWhx3GAKQpslx7y3Dp6sIIXhKjiUJ/BR9FX8PVthjr9PD6pNwOJfAzw==} + + '@vscode/l10n@0.0.18': + resolution: {integrity: sha512-KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==} + + '@yuku-toolchain/darwin-arm64@0.28.1': + resolution: {integrity: sha512-xMtZUwiGvJH90ogLjRrnG5+YEhinKti8qMPF18bd5z0ahSoaHWyBoe16evT7cSUxid0JEaZvh6H3daDPwDw4+g==} + cpu: [arm64] + os: [darwin] + + '@yuku-toolchain/darwin-x64@0.28.1': + resolution: {integrity: sha512-aI60ScUkZgVEX5GHZfpiAAfTb9e7L6NUxfSU7Ucn+34GyrtswvBapEntbYKPzUuy5ubtVcD9vSWgptm/mlyTxQ==} + cpu: [x64] + os: [darwin] + + '@yuku-toolchain/linux-arm64@0.28.1': + resolution: {integrity: sha512-JYDBUtSI4CHfR9VxSvoJvcD8MS4qhuOk4MAMAqoouHq9Hky/fQbvGkN1VxTiwRtEcYtMp3JUs7vtsSZmbGk4lw==} + cpu: [arm64] + os: [linux] + + '@yuku-toolchain/linux-x64@0.28.1': + resolution: {integrity: sha512-lEWh0UkCr195bQj4DNlpww/B7hPeuotE0hpKbC2oz4STHqYxCEoaMzNOf9vr5Ydjwr9egEDepA0XRsu5xP+z8w==} + cpu: [x64] + os: [linux] + + '@yuku-toolchain/win32-arm64@0.28.1': + resolution: {integrity: sha512-CUiumoJIwNiH9Utm5SbG5GaEaJRUatEXgG5HcPj2yEWh4kxTmEbigB346C3HEmtc+zbRLY0T0XsFO5RGSZaj2A==} + cpu: [arm64] + os: [win32] + + '@yuku-toolchain/win32-x64@0.28.1': + resolution: {integrity: sha512-CSTUi/ya58q2PuWTpk//BNSpXgOz7ol45T+SDuU7QfD/vN1FcLjSh99KDQzLf4AbIy43ORUw5UFehhfMGPNj9w==} + cpu: [x64] + os: [win32] abort-controller@3.0.0: resolution: {integrity: sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==} @@ -4855,6 +5330,14 @@ packages: peerDependencies: zod: ^4.6.6 + ajv-draft-04@1.0.0: + resolution: {integrity: sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==} + peerDependencies: + ajv: ^8.5.0 + peerDependenciesMeta: + ajv: + optional: true + ajv-formats@3.0.1: resolution: {integrity: sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==} peerDependencies: @@ -4863,6 +5346,11 @@ packages: ajv: optional: true + ajv-i18n@4.2.0: + resolution: {integrity: sha512-v/ei2UkCEeuKNXh8RToiFsUclmU+G57LO1Oo22OagNMENIw+Yb8eMwvHu7Vn9fmkjJyv6XclhJ8TbuigSglPkg==} + peerDependencies: + ajv: ^8.0.0-beta.0 + ajv@8.20.0: resolution: {integrity: sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==} @@ -4894,14 +5382,6 @@ packages: resolution: {integrity: sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==} engines: {node: '>=12'} - ansis@4.1.0: - resolution: {integrity: sha512-BGcItUBWSMRgOCe+SVZJ+S7yTRG0eGt9cXAHev72yuGcY23hnLA7Bky5L/xLyPINoSN95geovfBkqoTlNZYa7w==} - engines: {node: '>=14'} - - ansis@4.3.1: - resolution: {integrity: sha512-BJ8/l4R5LRE7hW9WdSuGYrLSHi2ynxeFpDFbH0K/CgNeY/tyhk+vO6TYxXC5r5CpUhNVX310xzPsN/H9lCdfOA==} - engines: {node: '>=14'} - any-promise@1.3.0: resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==} @@ -4929,13 +5409,13 @@ packages: array-iterate@2.0.1: resolution: {integrity: sha512-I1jXZMjAgCMmxT4qxXfPXa6SthSoE8h6gkSI9BGGNv8mP8G/v0blc+qFnZu6K42vTOiuME596QaLO0TP3Lk0xg==} + artichokie@0.4.5: + resolution: {integrity: sha512-ma9643oYgSgA6CeDvKIU0zxL1eKOkbgH8/v83xFpFYB2VOPFoEmmg1iC+ooHFjLIJ3qdtfwPbEKpIW3/YxPovg==} + engines: {node: ^18.0.0 || >=20.0.0} + asciinema-player@3.18.1: resolution: {integrity: sha512-H3blHwZYerDkjUVNABB0zjIzZhZu+JT0/FXT7Skc+4cpa2i7bDab49uOztsIguej4Ppfw6JS0V8J5/6VNqIIkQ==} - ast-kit@2.1.1: - resolution: {integrity: sha512-mfh6a7gKXE8pDlxTvqIc/syH/P3RkzbOF6LeHdcKztLEzYe6IMsRCL7N8vI7hqTGWNxpkCuuRTpT21xNWqhRtQ==} - engines: {node: '>=20.18.0'} - ast-v8-to-istanbul@1.0.7: resolution: {integrity: sha512-kFL68AG6ajd8fg248zwM9GQrUWEp79gsmjum34OEXjs4yHuUMZfYKwOLW9GMmB4oNvVrj+EAGxsP7ye2UR9UlA==} @@ -5044,9 +5524,6 @@ packages: engines: {node: '>=18'} hasBin: true - birpc@2.4.0: - resolution: {integrity: sha512-5IdNxTyhXHv2UlgnPHQ0h+5ypVmkrYHzL8QT+DwFZ//2N/oNV8Ch+BCRmTJ3x6/z9Axo/cXYBc9eprsUVK/Jsg==} - blake3-wasm@2.1.5: resolution: {integrity: sha512-F1+K8EbfOZE49dtoPtmxUQrpXaBIl3ICvasLh+nJta0xkz+9kF/7uet9fLnwKqhDrmj6g+6K3Tw9yQPUg2ka5g==} @@ -5061,10 +5538,6 @@ packages: resolution: {integrity: sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==} engines: {node: 20 || >=22} - braces@3.0.3: - resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} - engines: {node: '>=8'} - browserslist@4.29.5: resolution: {integrity: sha512-khTmKu5NGYTotqcYo8Bew2k4RAE9PuXRSFRXG2lQBrCEQHyeQ/vX6gKMxfokwywBsLiXZMnHsmWMG1pnO8J7uQ==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} @@ -5078,9 +5551,9 @@ packages: resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==} engines: {node: '>= 0.8'} - cac@6.7.14: - resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==} - engines: {node: '>=8'} + cac@7.1.0: + resolution: {integrity: sha512-LMDU/U2yA4IPIY8KT0NsNPWEYZvAMkbgyspxJ6btJaYV+WMDOHAZCmB0lsTObiHaRS1V/ztKAl7+TSkTqXyeoA==} + engines: {node: '>=20.19.0'} call-bind-apply-helpers@1.0.2: resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==} @@ -5131,25 +5604,6 @@ packages: character-reference-invalid@2.0.1: resolution: {integrity: sha512-iBZ4F4wRbyORVsu0jPV7gXkOsGYjGHPmAyv+HiHG8gi5PtC9KI2j1+v8/tlibRvjoWX027ypmG/n0HtO5t7unw==} - chat@4.45.0: - resolution: {integrity: sha512-7p1fkEupHEqYhXmSxLnHcK4hWEg93182/F2YxHSwqc7xtF4mekmG9EuJjRYX3aNEJJa2Rvu48A1f3ulOxxHIrA==} - engines: {node: '>=20'} - peerDependencies: - ai: ^6.0.182 || ^7.0.0 - workflow: ^5.0.0-beta.35 - zod: ^4.6.6 - peerDependenciesMeta: - ai: - optional: true - workflow: - optional: true - zod: - optional: true - - chokidar@4.0.3: - resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==} - engines: {node: '>= 14.16.0'} - chokidar@5.0.0: resolution: {integrity: sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==} engines: {node: '>= 20.19.0'} @@ -5176,9 +5630,9 @@ packages: engines: {node: '>=8.0.0', npm: '>=5.0.0'} hasBin: true - cli-truncate@4.0.0: - resolution: {integrity: sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==} - engines: {node: '>=18'} + cli-truncate@5.2.0: + resolution: {integrity: sha512-xRwvIOMGrfOAnM1JYtqQImuaNtDEv9v6oIYAs4LIHwTiKee8uwvIi363igssOC0O5U04i4AlENs79LQLu9tEMw==} + engines: {node: '>=20'} cli-width@4.1.0: resolution: {integrity: sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==} @@ -5191,6 +5645,10 @@ packages: resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} engines: {node: '>=12'} + cliui@9.0.1: + resolution: {integrity: sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==} + engines: {node: '>=20'} + clsx@2.1.1: resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==} engines: {node: '>=6'} @@ -5225,10 +5683,6 @@ packages: resolution: {integrity: sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==} engines: {node: '>=16'} - commander@13.1.0: - resolution: {integrity: sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==} - engines: {node: '>=18'} - commander@14.0.0: resolution: {integrity: sha512-2uM9rYjPvyq39NwLRqaiLtWHyDC1FvryJDa2ATTVims5YAS4PupsEQsDvP14FqhFr0P49CYDugi59xaxJlTXRA==} engines: {node: '>=20'} @@ -5278,6 +5732,10 @@ packages: resolution: {integrity: sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==} engines: {node: '>=18'} + cookie@1.1.1: + resolution: {integrity: sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==} + engines: {node: '>=18'} + cookie@2.0.2: resolution: {integrity: sha512-SL0cVuEdETEp7pN0FuZb01toc3vnODEfVUCooxG1SJN0yIirh7JMb9X9bvfCFf0vzzbT68RdbKDHYTiWy7a7iw==} engines: {node: '>=22'} @@ -5347,15 +5805,6 @@ packages: resolution: {integrity: sha512-23XHcCF+coGYevirZceTVD7NdJOqVn+49IHyxgszm+JIiHLoB2TkmPtsYkNWT1pvRSGkc35L6NHs0yHkN2SumA==} engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0} - debug@4.4.1: - resolution: {integrity: sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - debug@4.4.3: resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==} engines: {node: '>=6.0'} @@ -5415,10 +5864,6 @@ packages: devlop@1.1.0: resolution: {integrity: sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==} - diff@8.0.4: - resolution: {integrity: sha512-DPi0FmjiSU5EvQV0++GFDOJ9ASQUVFh5kD+OzOnYdi7n3Wpm9hWWGfB/O2blfHcMVTL5WkQXSnRiK9makhrcnw==} - engines: {node: '>=0.3.1'} - diff@9.0.0: resolution: {integrity: sha512-svtcdpS8CgJyqAjEQIXdb3OjhFVVYjzGAPO8WGCmRbrml64SPw/jJD4GoE98aR7r25A0XcgrK3F02yw9R/vhQw==} engines: {node: '>=0.3.1'} @@ -5463,9 +5908,9 @@ packages: resolution: {integrity: sha512-2QF/g9/zTaPDc3BjNcVTGoBbXBgYfMTTceLaYcFJ/W9kggFUkhxD/hMEeuLKbugyef9SqAx8cpgwlIP/jinUTA==} engines: {node: '>=4'} - dts-resolver@2.1.1: - resolution: {integrity: sha512-3BiGFhB6mj5Kv+W2vdJseQUYW+SKVzAFJL6YNP6ursbrwy1fXHRotfHi3xLNxe4wZl/K8qbAFeCDjZLjzqxxRw==} - engines: {node: '>=20.18.0'} + dts-resolver@3.0.0: + resolution: {integrity: sha512-1T1f+z+4tl9XD+m+0HBgWoL/nm0bOIffyWaUuUSBlFg/86IWvfx+wjNaO/ybU0AJzG9/Mi5hBUgGV6zCmWEN7Q==} + engines: {node: ^22.18.0 || >=24.0.0} peerDependencies: oxc-resolver: '>=11.0.0' peerDependenciesMeta: @@ -5482,14 +5927,17 @@ packages: electron-to-chromium@1.5.486: resolution: {integrity: sha512-rpybw4Ac4ak/An6G1Me2+61xzwobowDGyuJe71QHHOVpkZv4fPVobsLl7WH6zHSKusAMpaHxGKTpOvpy7+r3dQ==} + emmet@2.4.11: + resolution: {integrity: sha512-23QPJB3moh/U9sT4rQzGgeyyGIrcM+GH5uVYg2C6wZIxAIJq7Ng3QLT79tl8FUwDXhyq9SusfknOrofAKqvgyQ==} + emoji-regex@10.4.0: resolution: {integrity: sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==} emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} - empathic@2.0.0: - resolution: {integrity: sha512-i6UzDscO/XfAcNYD75CfICkmfLedpyPDdozrLMmQc5ORaQcdMoc21OnlEylMIqI7U8eniKrPMxxtj8k0vhmJhA==} + empathic@2.1.0: + resolution: {integrity: sha512-AnfC1ATldl49/cvZdLPDjBfrRNwbDO05aibiOtzQu3qtlbJtomNLhF30HEtn/7iBz50dlMECqATo3fG0LrdEgw==} engines: {node: '>=14'} encodeurl@2.0.0: @@ -5630,10 +6078,6 @@ packages: resolution: {integrity: sha512-D6bTRWh6KahHTK/m4WnjPQyEinNPf9eFLEZSEoj7d6fTibspnAVYfzHvirL7u/aoX5d9YYfIkBVAhmigUELk9w==} engines: {node: '>=20.0.0'} - execa@8.0.1: - resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} - engines: {node: '>=16.17'} - expect-type@1.4.0: resolution: {integrity: sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA==} engines: {node: '>=12.0.0'} @@ -5691,10 +6135,6 @@ packages: fflate@0.8.3: resolution: {integrity: sha512-tbZNuJrLwGUp3zshBtdy4W+ORxZuIh8a5ilyIEQDC5rY1f3U20JMry0Ll3WBzU58EZKsEuJFXhb5gwv8CsPvgA==} - fill-range@7.1.1: - resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==} - engines: {node: '>=8'} - finalhandler@2.1.1: resolution: {integrity: sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==} engines: {node: '>= 18.0.0'} @@ -5756,10 +6196,6 @@ packages: resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} engines: {node: 6.* || 8.* || >= 10.*} - get-east-asian-width@1.3.0: - resolution: {integrity: sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==} - engines: {node: '>=18'} - get-east-asian-width@1.7.0: resolution: {integrity: sha512-XjH1AECxf0giL2V1aU8vKyRR2ppRUb5c0EvT7zuJTokQ74bNo52zOtghqdWIqrhUD79fo3x0WfKZdOqxF6LG1Q==} engines: {node: '>=18'} @@ -5776,13 +6212,6 @@ packages: resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==} engines: {node: '>= 0.4'} - get-stream@8.0.1: - resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==} - engines: {node: '>=16'} - - get-tsconfig@4.10.1: - resolution: {integrity: sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==} - get-tsconfig@5.0.0-beta.6: resolution: {integrity: sha512-X6fBC0pmImC70gvX2zm56go9hx0MyoGVdG0tUCkg/D+Xnh5TJsOZ7iDbOdI3PvmtrDxnu1YdDufpK2QJX1Meqw==} engines: {node: '>=20.20.0'} @@ -5891,8 +6320,8 @@ packages: hastscript@9.0.1: resolution: {integrity: sha512-g7df9rMFX/SPi34tyGCyUBREQoKkapwdY/T04Qn9TDWfHhAYt4/I0gMVirzK5wEzeUqIjEB+LXC/ypb7Aqno5w==} - headers-polyfill@4.0.3: - resolution: {integrity: sha512-IScLbePpkvO846sIwOtOTDjutRMWdXdJmXdMvk6gCBHxFO8d+QKOQedyZSxFTTFYRSmlgSTDtXqqq4pcenBXLQ==} + headers-polyfill@5.0.1: + resolution: {integrity: sha512-1TJ6Fih/b8h5TIcv+1+Hw0PDQWJTKDKzFZzcKOiW1wJza3XoAQlkCuXLbymPYB8+ZQyw8mHvdw560e8zVFIWyA==} highlight.js@10.7.3: resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==} @@ -5906,8 +6335,8 @@ packages: resolution: {integrity: sha512-H9q/E1XizaWstJxUW881dmLxEj+t/TrGGnyxINkm4+sK0qUwsMtFdo2BWI9Vs3cIS19MU6b6iCijoUoEf4f3DA==} engines: {node: '>=16.9.0'} - hookable@5.5.3: - resolution: {integrity: sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==} + hookable@6.1.2: + resolution: {integrity: sha512-+abwxtiEA52GCVIsQqut3S/uKTbUwYIp4Pe/vv+6py5XiXBCqMZHg6pA6Y5qhgLSEys0/cYuPbO0z1QFj5ZCmg==} html-encoding-sniffer@6.0.0: resolution: {integrity: sha512-CV9TW3Y3f8/wT0BRFc1/KAVQ3TUHiXmaAb6VW9vtiMFf7SLoMd1PdAc4W3KFOFETBJUb90KatHqlsZMWV+R9Gg==} @@ -5943,10 +6372,6 @@ packages: resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==} engines: {node: '>= 14'} - human-signals@5.0.0: - resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==} - engines: {node: '>=16.17.0'} - humanize-ms@1.2.1: resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==} @@ -5970,6 +6395,10 @@ packages: resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==} engines: {node: '>=6'} + import-without-cache@0.4.1: + resolution: {integrity: sha512-vXoV9PjKHEednCUu01e98TkImxy67e3BJXbTIOmIq4Hyzw3IAwYRcuPkfeTzJzwyyts4kjuA73x+pWJLc4f86A==} + engines: {node: ^22.18.0 || >=24.0.0} + inherits@2.0.4: resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} @@ -6020,14 +6449,14 @@ packages: resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==} engines: {node: '>=8'} - is-fullwidth-code-point@4.0.0: - resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==} - engines: {node: '>=12'} - is-fullwidth-code-point@5.0.0: resolution: {integrity: sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==} engines: {node: '>=18'} + is-fullwidth-code-point@5.1.0: + resolution: {integrity: sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==} + engines: {node: '>=18'} + is-hexadecimal@2.0.1: resolution: {integrity: sha512-DgZQp241c8oO6cA1SbTEWiXeoxV42vlcJxgH+B3hi1AiqqKruZR3ZGF8In3fj4+/y/7rHvlOZLZtgJ/4ttYGZg==} @@ -6039,10 +6468,6 @@ packages: is-node-process@1.2.0: resolution: {integrity: sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==} - is-number@7.0.0: - resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} - engines: {node: '>=0.12.0'} - is-plain-obj@4.1.0: resolution: {integrity: sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==} engines: {node: '>=12'} @@ -6053,10 +6478,6 @@ packages: is-promise@4.0.0: resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==} - is-stream@3.0.0: - resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - is-wsl@3.1.0: resolution: {integrity: sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==} engines: {node: '>=16'} @@ -6064,10 +6485,6 @@ packages: isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - jiti@2.4.2: - resolution: {integrity: sha512-rg9zJN+G4n2nfJl5MW3BMygZX56zKPNVEYYqq7adpmMh4Jn2QNEwhvQlFy6jPVdcod7txZtKHWnyZiA3a0zP7A==} - hasBin: true - jiti@2.7.0: resolution: {integrity: sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ==} hasBin: true @@ -6122,6 +6539,9 @@ packages: engines: {node: '>=6'} hasBin: true + jsonc-parser@2.3.1: + resolution: {integrity: sha512-H8jvkz1O50L3dMZCsLqiuB2tA7muqbSg1AtGEkN0leAqGjsUzDJir3Zwr02BhqdcITPg3ei3mZ+HjMocAknhhg==} + jsonc-parser@3.3.1: resolution: {integrity: sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==} @@ -6281,21 +6701,17 @@ packages: resolution: {integrity: sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==} engines: {node: '>= 12.0.0'} - lilconfig@3.1.3: - resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==} - engines: {node: '>=14'} - lines-and-columns@1.2.4: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} - lint-staged@15.5.2: - resolution: {integrity: sha512-YUSOLq9VeRNAo/CTaVmhGDKG+LBtA8KF1X4K5+ykMSwWST1vDxJRB2kv2COgLb1fvpCo+A/y9A0G0znNVmdx4w==} - engines: {node: '>=18.12.0'} + lint-staged@16.4.0: + resolution: {integrity: sha512-lBWt8hujh/Cjysw5GYVmZpFHXDCgZzhrOm8vbcUdobADZNOK/bRshr2kM3DfgrrtR1DQhfupW9gnIXOfiFi+bw==} + engines: {node: '>=20.17'} hasBin: true - listr2@8.3.3: - resolution: {integrity: sha512-LWzX2KsqcB1wqQ4AHgYb4RsDXauQiqhjLk+6hjbaeHG4zpjjVAB6wC/gz6X0l+Du1cN3pUB5ZlrvTbhGSNnUQQ==} - engines: {node: '>=18.0.0'} + listr2@9.0.5: + resolution: {integrity: sha512-ME4Fb83LgEgwNw96RKNvKV4VTLuXfoKudAmm2lP8Kk87KaMK0/Xrx/aAkMWmT8mDb+3MlFDspfbCs7adjRxA2g==} + engines: {node: '>=20.0.0'} lodash.castarray@4.4.0: resolution: {integrity: sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==} @@ -6447,9 +6863,6 @@ packages: resolution: {integrity: sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==} engines: {node: '>=18'} - merge-stream@2.0.0: - resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==} - micromark-core-commonmark@2.0.3: resolution: {integrity: sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==} @@ -6558,10 +6971,6 @@ packages: micromark@4.0.2: resolution: {integrity: sha512-zpe98Q6kvavpCr1NPVSCMebCKfD7CA2NqZ+rykeNhONIJBpc1tFKt9hucLGwha3jNTNI8lHpctWJWoimVF4PfA==} - micromatch@4.0.8: - resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==} - engines: {node: '>=8.6'} - mime-db@1.52.0: resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==} engines: {node: '>= 0.6'} @@ -6581,10 +6990,6 @@ packages: mimetext@3.0.28: resolution: {integrity: sha512-eQXpbNrtxLCjUtiVbR/qR09dbPgZ2o+KR1uA7QKqGhbn8QV7HIL16mXXsobBL4/8TqoYh1us31kfz+dNfCev9g==} - mimic-fn@4.0.0: - resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==} - engines: {node: '>=12'} - mimic-function@5.0.1: resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==} engines: {node: '>=18'} @@ -6615,8 +7020,8 @@ packages: ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - msw@2.10.2: - resolution: {integrity: sha512-RCKM6IZseZQCWcSWlutdf590M8nVfRHG1ImwzOtwz8IYxgT4zhUO0rfTcTvDGiaFE0Rhcc+h43lcF3Jc9gFtwQ==} + msw@2.15.0: + resolution: {integrity: sha512-2wQAmKkQKxRuXvYJxVhPGG0wZNBQyD06oJvxqw90XqLvptdqxdlHrFUfEteKkpaNORX3Xzc+HtEl/q0nfmN2wQ==} engines: {node: '>=18'} hasBin: true peerDependencies: @@ -6625,9 +7030,12 @@ packages: typescript: optional: true - mute-stream@2.0.0: - resolution: {integrity: sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==} - engines: {node: ^18.17.0 || >=20.5.0} + muggle-string@0.4.1: + resolution: {integrity: sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==} + + mute-stream@4.0.0: + resolution: {integrity: sha512-gSrprq0fJ3EiOErzjdIZrjysVVmJ4uu1QWfCDss5LypA5OXvrMje5Ym5z6V6RLyJ2eF87lasX7t6a0AnFvZblg==} + engines: {node: ^22.22.2 || ^24.15.0 || >=26.0.0} mz@2.7.0: resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==} @@ -6695,10 +7103,6 @@ packages: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} - npm-run-path@5.3.0: - resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - nth-check@2.1.1: resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==} @@ -6748,10 +7152,6 @@ packages: once@1.4.0: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} - onetime@6.0.0: - resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==} - engines: {node: '>=12'} - onetime@7.0.0: resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==} engines: {node: '>=18'} @@ -6773,29 +7173,32 @@ packages: resolution: {integrity: sha512-ZztsZgaCWmPeKYMdoTT5e0oV/oxD1NeLWNR3kAtr/G707cUPYaaozRlVDHLCGnszHJRszN9mJwmPNpqgwloC0A==} engines: {node: ^20.19.0 || >=22.12.0} - oxfmt@0.72.0: - resolution: {integrity: sha512-16OQeL0uhPZbfmT9S9WWM0Nv9+BmVi8Ra1uTYaSKj/qSCs6FB30KOhz9JoNYw6thT+K5bVxsk/tSEOu497i34g==} + oxfmt@0.78.0: + resolution: {integrity: sha512-uagX+70mKqh/YqxB6ON/lkxVPH6E1Z7pfP2x6XVRPPyiDCZtX6o1xIEeXAIXJ/2wA5ViX4RFuW+IAQn85yJdWg==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: + '@astrojs/compiler-rs': ^0.5.0 svelte: ^5.0.0 vite-plus: '*' peerDependenciesMeta: + '@astrojs/compiler-rs': + optional: true svelte: optional: true vite-plus: optional: true - oxlint-tsgolint@7.0.2004: - resolution: {integrity: sha512-vQ9WDF3fiZJvRdSDosNOflerOCOpwol6vWzVDxW76RcU19cjTh7engvkHLvmv+tzedR8fAiJUVUGr6IVZdkzXQ==} + oxlint-tsgolint@7.0.2007: + resolution: {integrity: sha512-i8X2qf6VVqFzoNVP34joMKuZpO6T2uXMOgKJaSPFc6p+E3FTnbIGPRbI8K4ZApmtDTMu2CIeGfpzeK1zzGwfnA==} hasBin: true - oxlint@1.87.0: - resolution: {integrity: sha512-drxVlaW7Oqq7wSy1CN25znRu00aRq8n57Q2wniJRxCmtYVz07ufCm7EVDPQFZURrTgQIjzKrVEHAD/HcvJXObg==} + oxlint@1.93.0: + resolution: {integrity: sha512-19JMsQFX+YvEbcUTFQxjTwhvs0Ibg0D6CFneSLgpwnACWcY/6LjhpGpkPodh0T5aIT1pjMTLlYaeBFzaVgugTA==} engines: {node: ^20.19.0 || >=22.12.0} hasBin: true peerDependencies: - oxlint-tsgolint: '>=7.0.2003' + oxlint-tsgolint: '>=7.0.2005' vite-plus: '*' peerDependenciesMeta: oxlint-tsgolint: @@ -6871,14 +7274,13 @@ packages: react: optional: true + path-browserify@1.0.1: + resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==} + path-key@3.1.1: resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} engines: {node: '>=8'} - path-key@4.0.0: - resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==} - engines: {node: '>=12'} - path-parse@1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} @@ -6925,11 +7327,6 @@ packages: resolution: {integrity: sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==} engines: {node: '>=12'} - pidtree@0.6.0: - resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==} - engines: {node: '>=0.10'} - hasBin: true - pixelmatch@7.2.0: resolution: {integrity: sha512-xhcb4yHu9sM/G7foGzoLtXYcC0zHEaOXXjRKhGup0fw78Nf2Tkiapv4EQyMzrbcmQPsllAI7DbFY2UT7PlI9Pg==} hasBin: true @@ -6976,6 +7373,11 @@ packages: engines: {node: '>=14.0.0'} hasBin: true + prettier@3.10.1: + resolution: {integrity: sha512-70vp3ZUYoPlFbF9uiTdXHUUCGEIp7d4+6p+8DYbkm2jP7x/3i/paXVF6dopSI3zd/CEitrZN1rc4i85xWmmXlg==} + engines: {node: '>=14'} + hasBin: true + pretty-format@27.5.1: resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -7002,9 +7404,6 @@ packages: resolution: {integrity: sha512-5nnx0yGyVUcY6t9RnWcARWtwT9F1D8O9rt08htPvnd49W1IgZtmLkhu9WfMzQj1cFxjHIO6connUNVW5k7AVyQ==} engines: {node: '>= 0.10'} - psl@1.15.0: - resolution: {integrity: sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==} - punycode@2.3.1: resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} @@ -7020,11 +7419,8 @@ packages: resolution: {integrity: sha512-5Px6J7rfHBAGUhNQ3es4YzcOdBBw0SDcVtThJml4RdnKw4tKs2epA0kPZ+K8X+WiHktT93RHVcQ/3ym5aTCgtg==} engines: {node: '>=0.6'} - quansync@0.2.10: - resolution: {integrity: sha512-t41VRkMYbkHyCYmOvx/6URnN80H7k4X0lLdBMGsz+maAwrJQYB1djpV6vHrQIBE0WBSGqhtEHrK9U3DWWH8v7A==} - - querystringify@2.2.0: - resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==} + quansync@1.0.0: + resolution: {integrity: sha512-5xZacEEufv3HSTPQuchrvV6soaiACMFnq1H8wkVioctoH3TRha9Sz66lOxRwPK/qZj7HPiSveih9yAyh98gvqA==} radix3@1.1.2: resolution: {integrity: sha512-b484I/7b8rDEdSDKckSSBA8knMpcdsXudlE/LNL639wFoHKwLbEkQFZHWEYwDC0wa0FKUcCY+GAF73Z7wxNVFA==} @@ -7134,10 +7530,6 @@ packages: resolution: {integrity: sha512-PWaYA1L/q9u2u7xYQi+Y3L3Yfnie7XyLeaJICV1MGD6LprsBxcAqGjYyr0eY3p+QdsA+x/Irkt4Qif8D63+Sbw==} engines: {node: '>=0.10.0'} - readdirp@4.1.2: - resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==} - engines: {node: '>= 14.18.0'} - readdirp@5.1.1: resolution: {integrity: sha512-Kko+Y5XQ6fM+Ce3dq3m9YGxnacYZYl9cA1wZjaF3Vbry2L3i1qVg8+CAgNPsXRArPMUMCaOR7oa9Nqntc43JKA==} engines: {node: '>= 20.19.0'} @@ -7208,8 +7600,11 @@ packages: remark-stringify@11.0.0: resolution: {integrity: sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==} - remend@1.3.1: - resolution: {integrity: sha512-N3DiY5qbRPoa5vkxn1oDLMyXOVTeo6Hp+XOj6SIqJAYUgLS0Q587gILPMom/qm86AQ/ZrcOdwEIzCz8V3J0nxQ==} + request-light@0.5.8: + resolution: {integrity: sha512-3Zjgh+8b5fhRJBQZoy+zbVKpAQGLyka0MPgW3zruTF4dFFJ8Fqcfu9YsAvi/rvdcaTeWG3MkbZv4WKxAn/84Lg==} + + request-light@0.7.0: + resolution: {integrity: sha512-lMbBMrDoxgsyO+yB3sDcrDuX85yYt7sS8BfQd11jtbW/z5ZWgLZRcEGLsLoYw7I0WSUGQBs8CC8ScIxkTX1+6Q==} require-directory@2.1.1: resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} @@ -7219,9 +7614,6 @@ packages: resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==} engines: {node: '>=0.10.0'} - requires-port@1.0.0: - resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==} - resolve-from@4.0.0: resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==} engines: {node: '>=4'} @@ -7250,29 +7642,34 @@ packages: retext@9.0.0: resolution: {integrity: sha512-sbMDcpHCNjvlheSgMfEcVrZko3cDzdbe1x/e7G66dFp0Ff7Mldvi2uv6JkJQzdRcvLYE8CA8Oe8siQx8ZOgTcA==} + rettime@0.11.12: + resolution: {integrity: sha512-5ExtR1ppiDBQkVoPw5NAqdbfH4Iq2VOmQKHMtUoaFxA9bo2krzFYBtyq6K40xxbYp+2w/YOr6D+1ToF6tTN53A==} + rfdc@1.4.1: resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==} - rolldown-plugin-dts@0.13.13: - resolution: {integrity: sha512-Nchx9nQoa4IpfQ/BJzodKMvtJ3H3dT322siAJSp3uvQJ+Pi1qgEjOp7hSQwGSQRhaC5gC+9hparbWEH5oiAL9Q==} - engines: {node: '>=20.18.0'} + rolldown-plugin-dts@0.30.2: + resolution: {integrity: sha512-Q3wRlwawifZeN1llb1BaeZfimmJMF/WHzm7z5ieZ8g2CWHQM0gvVWLYPbgBglsXJqcd405gc+3LS2NzSevbYNQ==} + engines: {node: ^22.18.0 || ^24.11.0 || >=26.0.0} peerDependencies: - '@typescript/native-preview': '>=7.0.0-dev.20250601.1' - rolldown: ^1.0.0-beta.9 - typescript: ^5.0.0 - vue-tsc: ~2.2.0 + '@volar/typescript': ~2.4.0 + '@vue/language-core': ~3.2.0 || ~3.3.0 + rolldown: ^1.2.0 + tsrs: '*' + typescript: ^5.0.0 || ^6.0.0 || ~7.0.0 || ~7.1.0-0 + vue-tsc: ~3.2.0 || ~3.3.0 peerDependenciesMeta: - '@typescript/native-preview': + '@volar/typescript': + optional: true + '@vue/language-core': + optional: true + tsrs: optional: true typescript: optional: true vue-tsc: optional: true - rolldown@1.0.0-beta.23: - resolution: {integrity: sha512-+/TR2YSZxLTtDAfG9LHlYqsHO6jtvr9qxaRD77E+PCAQi5X47bJkgiZsjDmE1jGR19NfYegWToOvSe6E+8NfwA==} - hasBin: true - rolldown@1.2.14: resolution: {integrity: sha512-eTBTTqMR6uHKLgcUqpJP8ntzDI6V4LYA8negAMBEI7gkgVvOdrx6VsvS2Ym+83KhOPdLCHWJu0w7UQFJZhHKNw==} engines: {node: ^20.19.0 || >=22.12.0} @@ -7283,6 +7680,11 @@ packages: engines: {node: ^20.19.0 || >=22.12.0} hasBin: true + rolldown@1.3.2: + resolution: {integrity: sha512-EFHqbVkXiYZA6akmYm2bvJhNbEGdUwAResRhYwl/BO8QhB5KxsG+t3RVHJSIOy5jBEb0XCACvrIGnnl6Z8sMGA==} + engines: {node: ^20.19.0 || >=22.12.0} + hasBin: true + rollup@4.62.4: resolution: {integrity: sha512-RXOqwaPsBGjMNMa4sQjDjHieHEZDFoj/Rdr46l2MU5DfEs16wHJPC2RPTPHWhNl+M3aI472LLqFkFKut4SblOg==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} @@ -7359,6 +7761,9 @@ packages: set-cookie-parser@2.7.2: resolution: {integrity: sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==} + set-cookie-parser@3.2.3: + resolution: {integrity: sha512-bDO7NdAkLprNt3BNl3LAh0oVnOS5+WspzxOxiboo7vRIyTqj2pvFmNWYEFynSGQgpJ+7yG/9nc/aSG20UDBUpg==} + setprototypeof@1.2.0: resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} @@ -7414,8 +7819,8 @@ packages: resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} engines: {node: '>=14'} - simple-git-hooks@2.13.1: - resolution: {integrity: sha512-WszCLXwT4h2k1ufIXAgsbiTOazqqevFCIncOuUBZJ91DdvWcC5+OFkluWRQPrcuSYd8fjq+o2y1QfWqYMoAToQ==} + simple-git-hooks@2.14.0: + resolution: {integrity: sha512-kkTORPAuxQz2g1QUuN0J8yGWT28tjGBfPOdJ4xT7Vbeu30veKUZQIoID2qGgCDAakaQn59UeZJJ4cFGB8PVP2A==} hasBin: true simple-update-in@2.2.0: @@ -7429,14 +7834,14 @@ packages: engines: {node: '>=20.19.5', npm: '>=10.8.2'} hasBin: true - slice-ansi@5.0.0: - resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==} - engines: {node: '>=12'} - slice-ansi@7.1.0: resolution: {integrity: sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==} engines: {node: '>=18'} + slice-ansi@8.0.0: + resolution: {integrity: sha512-stxByr12oeeOyY2BlviTNQlYV5xOj47GirPr4yA1hE9JCtxfQN0+tVbkxwCtYDQWhEKWFHsEK48ORg5jrouCAg==} + engines: {node: '>=20'} + smol-toml@1.9.1: resolution: {integrity: sha512-j7WyPdf0CJoutMzMoPLF/bVXHtKZIT9Rb4eGeEbWw8X2t5oirjPgpL+OpaENZrILYaXqYwnVH+qgUwVbl+pUJQ==} engines: {node: '>= 18'} @@ -7503,10 +7908,6 @@ packages: resolution: {integrity: sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==} engines: {node: '>=12'} - strip-final-newline@3.0.0: - resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==} - engines: {node: '>=12'} - style-to-js@1.1.17: resolution: {integrity: sha512-xQcBGDxJb6jjFCTzvQtfiPn6YvvP2O8U1MDIPNfJQlWMYfktPy+iGsHE7cssjs7y84d9fQaK4UF3RIJaAHSoYA==} @@ -7541,6 +7942,10 @@ packages: symbol-tree@3.2.4: resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==} + tagged-tag@1.0.0: + resolution: {integrity: sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==} + engines: {node: '>=20'} + tailwind-merge@3.3.1: resolution: {integrity: sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==} @@ -7588,18 +7993,10 @@ packages: resolution: {integrity: sha512-nTv2raKFMzGG6JJp0lpNDsRPdfFE6UHlu2rVEjXo8vkx1ZS3LW2CVXqIaLu8xZlu+6tbFs9V58Qc/Jmk/Ii7wA==} engines: {node: ^16.14.0 || >= 17.3.0} - tinyexec@1.0.4: - resolution: {integrity: sha512-u9r3uZC0bdpGOXtlxUIdwf9pkmvhqJdrVCH9fapQtgy/OeTTMZ1nqH7agtvEfmGui6e1XxjcdrlxvxJvc3sMqw==} - engines: {node: '>=18'} - tinyexec@1.3.1: resolution: {integrity: sha512-GCvB3aoys96IuDFBMcTB46JOR6mdMtAToqwiW8JlWhsoh1mhHi/xn9ss/Dg7N555GiJyEt2qzoG/NHCwM6h1EA==} engines: {node: '>=18'} - tinyglobby@0.2.15: - resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==} - engines: {node: '>=12.0.0'} - tinyglobby@0.2.17: resolution: {integrity: sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==} engines: {node: '>=12.0.0'} @@ -7622,18 +8019,10 @@ packages: resolution: {integrity: sha512-somxA8xKAUzlAxl0TX/jMSYIbRNFIVGnI96pVGJPeMc5BsHmfVXn6mOJT6U++ELnl04eGfzpfcEuZe8WiASkXg==} hasBin: true - to-regex-range@5.0.1: - resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} - engines: {node: '>=8.0'} - toidentifier@1.0.1: resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==} engines: {node: '>=0.6'} - tough-cookie@4.1.4: - resolution: {integrity: sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==} - engines: {node: '>=6'} - tough-cookie@6.0.2: resolution: {integrity: sha512-exgYmnmL/sJpR3upZfXG5PoatXQii55xAiXGXzY+sROLZ/Y+SLcp9PgJNI9Vz37HpQ74WvDcLT8eqm+kV3FzrA==} engines: {node: '>=16'} @@ -7651,27 +8040,39 @@ packages: trough@2.2.0: resolution: {integrity: sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==} - tsdown@0.12.9: - resolution: {integrity: sha512-MfrXm9PIlT3saovtWKf/gCJJ/NQCdE0SiREkdNC+9Qy6UHhdeDPxnkFaBD7xttVUmgp0yUHtGirpoLB+OVLuLA==} - engines: {node: '>=18.0.0'} + tsdown@0.23.7: + resolution: {integrity: sha512-w9nmWyEimfqQ7/HpVeKTldAeBvWGXiaWyNP7xaxSrr0GhKxsngEyTWqk1nOruRqvqRSkdpMMkpV2BcoWfLB4Uw==} + engines: {node: ^22.18.0 || ^24.11.0 || >=26.0.0} hasBin: true peerDependencies: '@arethetypeswrong/core': ^0.18.1 - publint: ^0.3.0 - typescript: ^5.0.0 - unplugin-lightningcss: ^0.4.0 - unplugin-unused: ^0.5.0 + '@tsdown/css': 0.23.7 + '@tsdown/exe': 0.23.7 + '@vitejs/devtools': '*' + publint: ^0.3.8 + tsx: '*' + typescript: ^5.0.0 || ^6.0.0 || ^7.0.0 + unplugin-unused: '>=0.5.0' + unrun: '*' peerDependenciesMeta: '@arethetypeswrong/core': optional: true + '@tsdown/css': + optional: true + '@tsdown/exe': + optional: true + '@vitejs/devtools': + optional: true publint: optional: true - typescript: + tsx: optional: true - unplugin-lightningcss: + typescript: optional: true unplugin-unused: optional: true + unrun: + optional: true tslib@2.8.1: resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} @@ -7684,27 +8085,38 @@ packages: tw-animate-css@1.3.5: resolution: {integrity: sha512-t3u+0YNoloIhj1mMXs779P6MO9q3p3mvGn4k1n3nJPqJw/glZcuijG2qTSN4z4mgNRfW5ZC3aXJFLwDtiipZXA==} - type-fest@4.41.0: - resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==} - engines: {node: '>=16'} + type-fest@5.10.0: + resolution: {integrity: sha512-NoSdpq/WEiAg5sjmBkmV/hfxv6HJH4NqPNrqjtSO5CwRmpsDfaf4begxW34KdJykH/l1yHtwBWQkCRdoXO8mPA==} + engines: {node: '>=20'} type-is@2.1.0: resolution: {integrity: sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA==} engines: {node: '>= 18'} - typescript@5.9.3: - resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==} + typesafe-path@0.2.2: + resolution: {integrity: sha512-OJabfkAg1WLZSqJAJ0Z6Sdt3utnbzr/jh+NAHoyWHJe8CMSy79Gm085094M9nvTPy22KzTVn5Zq5mbapCI/hPA==} + + typescript-auto-import-cache@0.3.6: + resolution: {integrity: sha512-RpuHXrknHdVdK7wv/8ug3Fr0WNsNi5l5aB8MYYuXhq2UH5lnEB1htJ1smhtD5VeCsGr2p8mUDtd83LCQDFVgjQ==} + + typescript@6.0.3: + resolution: {integrity: sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==} engines: {node: '>=14.17'} hasBin: true + typescript@7.0.2: + resolution: {integrity: sha512-8FYau96o3NKOhbjKi/qNvG/W5jhzxkbdm5sj9AbZ/5T5sWqn3hJgLfGx27sRKZWTvyzCP8dLRBTf5tBTSRVUNA==} + engines: {node: '>=16.20.0'} + hasBin: true + ufo@1.6.4: resolution: {integrity: sha512-JFNbkD1Svwe0KvGi8GOeLcP4kAWQ609twvCdcHxq1oSL8svv39ZuSvajcD8B+5D0eL4+s1Is2D/O6KN3qcTeRA==} ultrahtml@1.7.0: resolution: {integrity: sha512-2xRd0VHoAQE4M+vF/DvFFB7pUV0ZxTW1TLi7lHQWnF/Sb5TPeEUV/l+hxcNnGO00ZXGnR0voCMmYRKQf+rvJ2g==} - unconfig@7.3.2: - resolution: {integrity: sha512-nqG5NNL2wFVGZ0NA/aCFw0oJ2pxSf1lwg4Z5ill8wd7K4KX/rQbHlwbh+bjctXL5Ly1xtzHenHGOK0b+lG6JVg==} + unconfig-core@7.5.0: + resolution: {integrity: sha512-Su3FauozOGP44ZmKdHy2oE6LPjk51M/TRRjHv2HNCWiDvfvCoxC2lno6jevMA91MYAdCdwP05QnWdWpSbncX/w==} uncrypto@0.1.3: resolution: {integrity: sha512-Ql87qFHB3s/De2ClA9e0gsnS6zXG27SkTiSJwjCc9MebbfapQfuPzumMIUMi38ezPZVNFcHI9sUIepeQfw8J8Q==} @@ -7767,10 +8179,6 @@ packages: unist-util-visit@5.1.0: resolution: {integrity: sha512-m+vIdyeCOpdr/QeQCu2EzxX/ohgS8KbnPDgFni4dQsfSCtpz8UqDyY5GjRru8PDKuYn7Fq19j1CQ+nJSsGKOzg==} - universalify@0.2.0: - resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==} - engines: {node: '>= 4.0.0'} - unpipe@1.0.0: resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} engines: {node: '>= 0.8'} @@ -7837,6 +8245,9 @@ packages: uploadthing: optional: true + until-async@3.0.2: + resolution: {integrity: sha512-IiSk4HlzAMqTUseHHe3VhIGyuFmN90zMTpD3Z3y8jeQbzLIq500MVM7Jq2vUAnTKAFPJrqwkzr6PoTcPhGcOiw==} + update-browserslist-db@1.3.4: resolution: {integrity: sha512-t8wonIOdQyOjtPd2VktlBu6QjTVTks6v8bSi7kd0r2Vll8TK1JYDZtRRdbmCHOAMphkZgrzK+L+vXK4pyZ8t4A==} hasBin: true @@ -7847,9 +8258,6 @@ packages: resolution: {integrity: sha512-8tzwTeXFPuX/5PHuCDQE5Dd9Ts4rwoq2t9aIT+HS4iAVpmj5l4Ao7Q+BuuFjvWRqrLswBhQDk8O96ZicgCqQqw==} engines: {node: '>=20'} - url-parse@1.5.10: - resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==} - urlpattern-polyfill@10.1.0: resolution: {integrity: sha512-IGjKp/o0NL3Bso1PymYURCJxMPNAf/ILOpendP9f5B6e1rTJgdgiOvgfoT8VxCAdY+Wisb9uhGaJJf3yZ2V9nw==} @@ -8099,6 +8507,114 @@ packages: jsdom: optional: true + volar-service-css@0.0.71: + resolution: {integrity: sha512-wRRFt9BpjMKCazcgOh67MSjUjiWUCAh99DyYSDIOTuxaRjEtDC7PpB0k1Y1wbJIW/pVtMUSVbpPo3UGSm0Byxw==} + peerDependencies: + '@volar/language-service': ~2.4.0 + peerDependenciesMeta: + '@volar/language-service': + optional: true + + volar-service-emmet@0.0.71: + resolution: {integrity: sha512-zqjzt6bN95e3CUstBm0PBFAJnrfz0ZAARka87fart46/gNCLLuP3Vujy8V/J8HEziTFLnfkgIASLFYPUhonJcA==} + peerDependencies: + '@volar/language-service': ~2.4.0 + peerDependenciesMeta: + '@volar/language-service': + optional: true + + volar-service-html@0.0.71: + resolution: {integrity: sha512-e8tHPhgQ7ooLfudAEIku+kgd9pWkq3SSz8RbnQDI1+Eb8wbenkLGHqoirLqz5ORLV6wIMr2Iv08RWBG5eOcgpw==} + peerDependencies: + '@volar/language-service': ~2.4.0 + peerDependenciesMeta: + '@volar/language-service': + optional: true + + volar-service-prettier@0.0.71: + resolution: {integrity: sha512-Rz7JVH3qD108UCdmIEiZvOBNljMt2nLFdbN8AXcDfn7xD9F5I2aCIsDVqBbXw21PsnxG0b7MfwtNF+zPS/NKUg==} + peerDependencies: + '@volar/language-service': ~2.4.0 + prettier: ^2.2 || ^3.0 + peerDependenciesMeta: + '@volar/language-service': + optional: true + prettier: + optional: true + + volar-service-typescript-twoslash-queries@0.0.71: + resolution: {integrity: sha512-9K2k72s4n7rV9s4bX0MyjbX9iBribvKZbBJKuEmTCZfeWJXs6Yh7bGpY4eoc7UufAjvpheBqwyZCOIPBvxCv0A==} + peerDependencies: + '@volar/language-service': ~2.4.0 + typescript: '*' + peerDependenciesMeta: + '@volar/language-service': + optional: true + typescript: + optional: true + + volar-service-typescript@0.0.71: + resolution: {integrity: sha512-yTtM/BVT6hoyEYnDtaCyAtNhdNeS/mhTTABlBOdw3NNiRBUin3IznFJpgfjer4c6RYopiPjjQjc9VFhxVl1mLw==} + peerDependencies: + '@volar/language-service': ~2.4.0 + typescript: '*' + peerDependenciesMeta: + '@volar/language-service': + optional: true + typescript: + optional: true + + volar-service-yaml@0.0.71: + resolution: {integrity: sha512-qYGWGuVpUTnZGu5P/CR4KLK4aIR8RrcVnmfZ2eRcj9q/I8VZCoC5yy9FtEvfNvnDp4MU17yhdJcvpQPIqhJS2Q==} + peerDependencies: + '@volar/language-service': ~2.4.0 + peerDependenciesMeta: + '@volar/language-service': + optional: true + + vscode-css-languageservice@6.3.10: + resolution: {integrity: sha512-eq5N9Er3fC4vA9zd9EFhyBG90wtCCuXgRSpAndaOgXMh1Wgep5lBgRIeDgjZBW9pa+332yC9+49cZMW8jcL3MA==} + + vscode-html-languageservice@5.6.2: + resolution: {integrity: sha512-ulCrSnFnfQ16YzvwnYUgEbUEl/ZG7u2eV27YhvLObSHKkb8fw1Z9cgsnUwjTEeDIdJDoTDTDpxuhQwoenoLNMg==} + + vscode-json-languageservice@4.1.8: + resolution: {integrity: sha512-0vSpg6Xd9hfV+eZAaYN63xVVMOTmJ4GgHxXnkLCh+9RsQBkWKIghzLhW2B9ebfG+LQQg8uLtsQ2aUKjTgE+QOg==} + engines: {npm: '>=7.0.0'} + + vscode-jsonrpc@10.0.0: + resolution: {integrity: sha512-USSfxg0vDIpTQqlQBGxF3mBARyoS8cU7LHLpbYNh6dOJt32dlskxPWB0Irrh5TllTmyf7oNLAvqDqzklbwwnpA==} + engines: {node: '>=14.17.0'} + + vscode-jsonrpc@8.2.0: + resolution: {integrity: sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==} + engines: {node: '>=14.0.0'} + + vscode-languageserver-protocol@3.17.5: + resolution: {integrity: sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==} + + vscode-languageserver-protocol@3.18.5: + resolution: {integrity: sha512-FW4fBMzZ99N8xeob4py0l050wgCoRgTpEq5Xcsb9lM1bc29UKGR/wSV+4knaqFxssFHajy7OzNiKP/m3U1ZEuA==} + + vscode-languageserver-textdocument@1.0.16: + resolution: {integrity: sha512-qeNEuOi9a3qkqRf7Gfez2WL2VwlBTLCNekHBGO9kxPVUp9XuY15yfTJ9jwvOwKI0I2MhUUfZq95NSp+LK1CLQg==} + + vscode-languageserver-types@3.17.5: + resolution: {integrity: sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==} + + vscode-languageserver-types@3.18.5: + resolution: {integrity: sha512-kPd6+JQNz3HMJvjKlqUxERSlZHAntl/aGpsk7ImwIh0ewDKDcjgAEyVSYciPiOJD3ftbK9IrfiqUeTZLSbCizw==} + + vscode-languageserver@9.0.1: + resolution: {integrity: sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==} + hasBin: true + + vscode-nls@5.2.0: + resolution: {integrity: sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==} + + vscode-uri@3.2.0: + resolution: {integrity: sha512-m2gXo3bn0G1kT9InzMf07fTbqMbGtyckj3bH5ktLO+1Ssv+yiATZ4dhwaQv9UZWxJh6E9IFGnQyjgWVDWVBDrg==} + w3c-xmlserializer@5.0.0: resolution: {integrity: sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==} engines: {node: '>=18'} @@ -8160,10 +8676,6 @@ packages: resolution: {integrity: sha512-M0N4xzyzosiIok3svYlEo1sdLZts/8FPgYH/GPC3wvlmPoRvnoManGMrE54waYj3tISA8w6lsdesfVv67qSr8Q==} engines: {node: '>=20'} - wrap-ansi@6.2.0: - resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==} - engines: {node: '>=8'} - wrap-ansi@7.0.0: resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==} engines: {node: '>=10'} @@ -8220,6 +8732,10 @@ packages: yallist@3.1.1: resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==} + yaml-language-server@1.23.0: + resolution: {integrity: sha512-3qVyCOexLCWw06PQa5kRPwvMWMZ/eZeCRWUvgD6a0OkqL/4iCnxy2WumbWifa937Uo5xhyWJ0uxlU39ljhNh7A==} + hasBin: true + yaml@1.10.3: resolution: {integrity: sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==} engines: {node: '>= 6'} @@ -8247,6 +8763,10 @@ packages: resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} engines: {node: '>=12'} + yargs-parser@22.0.0: + resolution: {integrity: sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==} + engines: {node: ^20.19.0 || ^22.12.0 || >=23} + yargs@16.2.2: resolution: {integrity: sha512-Nt9ZJjXTv5R8MHbqby/wXQ6Gi0Bb3TcYZkR1bzuL4yB2OxWPkXknz513gEF0GoA6tn00UpbPvERW8rzCuWCA6w==} engines: {node: '>=10'} @@ -8255,6 +8775,10 @@ packages: resolution: {integrity: sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==} engines: {node: '>=12'} + yargs@18.2.0: + resolution: {integrity: sha512-9OpKOLeaoNFecEp7P6iYbzze/5CqWoH7N3SMs/6y1XF4nMvFMspEGZzJ6uFi9MmQwXhyzqYoSEKO3tvA3Z/o2w==} + engines: {node: ^20.19.0 || ^22.12.0 || >=23} + yauzl@3.4.0: resolution: {integrity: sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==} engines: {node: '>=12'} @@ -8263,16 +8787,21 @@ packages: resolution: {integrity: sha512-4LCcse/U2MHZ63HAJVE+v71o7yOdIe4cZ70Wpf8D/IyjDKYQLV5GD46B+hSTjJsvV5PztjvHoU580EftxjDZFQ==} engines: {node: '>=12.20'} - yoctocolors-cjs@2.1.3: - resolution: {integrity: sha512-U/PBtDf35ff0D8X8D0jfdzHYEPFxAI7jJlxZXwCSez5M3190m+QobIfh+sWDWSHMCWWJN2AWamkegn6vr6YBTw==} - engines: {node: '>=18'} - youch-core@0.3.3: resolution: {integrity: sha512-ho7XuGjLaJ2hWHoK8yFnsUGy2Y5uDpqSTq1FkHLK4/oqKtyUU1AFbOOxY4IpC9f0fTLjwYbslUz0Po5BpD1wrA==} youch@4.1.0-beta.10: resolution: {integrity: sha512-rLfVLB4FgQneDr0dv1oddCVZmKjcJ6yX6mS4pU82Mq/Dt9a3cLZQ62pDBL4AUO+uVrCvtWz3ZFUL2HFAFJ/BXQ==} + yuku@0.28.1: + resolution: {integrity: sha512-l899L8rSywcq9OLHf8JNQKpgyrBUL7UNJ7JqefoSVy0oYaFpdf3HoF72EVQFNWYr9HqMw0nGw1r1DefNujOnLQ==} + engines: {node: '>=16.4.0'} + peerDependencies: + '@yuku-toolchain/wasm': 0.28.1 + peerDependenciesMeta: + '@yuku-toolchain/wasm': + optional: true + zod-to-json-schema@3.25.2: resolution: {integrity: sha512-O/PgfnpT1xKSDeQYSCfRI5Gy3hPf91mKVDuYLUHZJMiDFptvP41MSnWofm8dnCm0256ZNfZIM7DSzuSMAFnjHA==} peerDependencies: @@ -8413,38 +8942,63 @@ snapshots: '@asamuzakjp/nwsapi@2.3.9': {} - '@ast-grep/cli-darwin-arm64@0.43.0': + '@ast-grep/cli-darwin-arm64@0.51.3': + optional: true + + '@ast-grep/cli-darwin-x64@0.51.3': + optional: true + + '@ast-grep/cli-linux-arm64-gnu@0.51.3': optional: true - '@ast-grep/cli-darwin-x64@0.43.0': + '@ast-grep/cli-linux-arm64-musl@0.51.3': optional: true - '@ast-grep/cli-linux-arm64-gnu@0.43.0': + '@ast-grep/cli-linux-x64-gnu@0.51.3': optional: true - '@ast-grep/cli-linux-x64-gnu@0.43.0': + '@ast-grep/cli-linux-x64-musl@0.51.3': optional: true - '@ast-grep/cli-win32-arm64-msvc@0.43.0': + '@ast-grep/cli-win32-arm64-msvc@0.51.3': optional: true - '@ast-grep/cli-win32-ia32-msvc@0.43.0': + '@ast-grep/cli-win32-ia32-msvc@0.51.3': optional: true - '@ast-grep/cli-win32-x64-msvc@0.43.0': + '@ast-grep/cli-win32-x64-msvc@0.51.3': optional: true - '@ast-grep/cli@0.43.0': + '@ast-grep/cli@0.51.3': dependencies: detect-libc: 2.1.2 optionalDependencies: - '@ast-grep/cli-darwin-arm64': 0.43.0 - '@ast-grep/cli-darwin-x64': 0.43.0 - '@ast-grep/cli-linux-arm64-gnu': 0.43.0 - '@ast-grep/cli-linux-x64-gnu': 0.43.0 - '@ast-grep/cli-win32-arm64-msvc': 0.43.0 - '@ast-grep/cli-win32-ia32-msvc': 0.43.0 - '@ast-grep/cli-win32-x64-msvc': 0.43.0 + '@ast-grep/cli-darwin-arm64': 0.51.3 + '@ast-grep/cli-darwin-x64': 0.51.3 + '@ast-grep/cli-linux-arm64-gnu': 0.51.3 + '@ast-grep/cli-linux-arm64-musl': 0.51.3 + '@ast-grep/cli-linux-x64-gnu': 0.51.3 + '@ast-grep/cli-linux-x64-musl': 0.51.3 + '@ast-grep/cli-win32-arm64-msvc': 0.51.3 + '@ast-grep/cli-win32-ia32-msvc': 0.51.3 + '@ast-grep/cli-win32-x64-msvc': 0.51.3 + + '@astrojs/astro2tsx@0.1.4': + dependencies: + '@emnapi/core': 1.11.3 + '@emnapi/runtime': 1.11.3 + '@napi-rs/wasm-runtime': 1.2.4(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3) + + '@astrojs/check@0.9.12(prettier@3.10.1)(typescript@6.0.3)': + dependencies: + '@astrojs/language-server': 2.17.3(prettier@3.10.1)(typescript@6.0.3) + chokidar: 5.0.0 + kleur: 4.1.5 + typescript: 6.0.3 + yargs: 18.2.0 + transitivePeerDependencies: + - prettier + - prettier-plugin-astro '@astrojs/compiler-binding-android-arm64@0.5.3': optional: true @@ -8519,7 +9073,31 @@ snapshots: unified: 11.0.5 yaml: 2.9.1 - '@astrojs/markdown-remark@7.2.4': + '@astrojs/language-server@2.17.3(prettier@3.10.1)(typescript@6.0.3)': + dependencies: + '@astrojs/astro2tsx': 0.1.4 + '@astrojs/yaml2ts': 0.2.4 + '@volar/kit': 2.4.31(typescript@6.0.3) + '@volar/language-core': 2.4.31 + '@volar/language-server': 2.4.31(typescript@6.0.3) + '@volar/language-service': 2.4.31(typescript@6.0.3) + muggle-string: 0.4.1 + tinyglobby: 0.2.17 + volar-service-css: 0.0.71(@volar/language-service@2.4.31(typescript@6.0.3)) + volar-service-emmet: 0.0.71(@volar/language-service@2.4.31(typescript@6.0.3)) + volar-service-html: 0.0.71(@volar/language-service@2.4.31(typescript@6.0.3)) + volar-service-prettier: 0.0.71(@volar/language-service@2.4.31(typescript@6.0.3))(prettier@3.10.1) + volar-service-typescript: 0.0.71(@volar/language-service@2.4.31(typescript@6.0.3))(typescript@6.0.3) + volar-service-typescript-twoslash-queries: 0.0.71(@volar/language-service@2.4.31(typescript@6.0.3))(typescript@6.0.3) + volar-service-yaml: 0.0.71(@volar/language-service@2.4.31(typescript@6.0.3)) + vscode-html-languageservice: 5.6.2 + vscode-uri: 3.2.0 + optionalDependencies: + prettier: 3.10.1 + transitivePeerDependencies: + - typescript + + '@astrojs/markdown-remark@7.2.4(supports-color@10.1.0)': dependencies: '@astrojs/internal-helpers': 0.10.4 '@astrojs/prism': 4.0.2 @@ -8529,8 +9107,8 @@ snapshots: mdast-util-definitions: 6.0.0 rehype-raw: 7.0.0 rehype-stringify: 10.0.1 - remark-gfm: 4.0.1 - remark-parse: 11.0.0 + remark-gfm: 4.0.1(supports-color@10.1.0) + remark-parse: 11.0.0(supports-color@10.1.0) remark-rehype: 11.1.2 remark-smartypants: 3.0.3 unified: 11.0.5 @@ -8555,19 +9133,19 @@ snapshots: github-slugger: 2.0.0 satteri: 0.11.7 - '@astrojs/mdx@7.0.8(@astrojs/markdown-satteri@0.3.8)(astro@7.4.11(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))': + '@astrojs/mdx@7.0.8(@astrojs/markdown-satteri@0.3.8)(astro@7.4.11(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(supports-color@10.1.0)': dependencies: '@astrojs/internal-helpers': 0.10.4 - '@astrojs/markdown-remark': 7.2.4 - '@mdx-js/mdx': 3.1.1 + '@astrojs/markdown-remark': 7.2.4(supports-color@10.1.0) + '@mdx-js/mdx': 3.1.1(supports-color@10.1.0) acorn: 8.18.0 - astro: 7.4.11(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) + astro: 7.4.11(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) es-module-lexer: 2.3.2 estree-util-visit: 2.0.0 hast-util-to-html: 9.0.5 piccolore: 0.1.3 rehype-raw: 7.0.0 - remark-gfm: 4.0.1 + remark-gfm: 4.0.1(supports-color@10.1.0) remark-smartypants: 3.0.3 source-map: 0.7.6 unist-util-visit: 5.1.0 @@ -8595,33 +9173,33 @@ snapshots: sitemap: 9.0.1 zod: 4.6.7 - '@astrojs/starlight@0.41.11(astro@7.4.11(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(typescript@5.9.3)': + '@astrojs/starlight@0.41.11(astro@7.4.11(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(supports-color@10.1.0)(typescript@6.0.3)': dependencies: '@astrojs/markdown-satteri': 0.3.8 - '@astrojs/mdx': 7.0.8(@astrojs/markdown-satteri@0.3.8)(astro@7.4.11(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + '@astrojs/mdx': 7.0.8(@astrojs/markdown-satteri@0.3.8)(astro@7.4.11(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(supports-color@10.1.0) '@astrojs/sitemap': 3.7.4 '@pagefind/default-ui': 1.5.2 '@types/hast': 3.0.4 '@types/js-yaml': 4.0.9 '@types/mdast': 4.0.4 - astro: 7.4.11(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) - astro-expressive-code: 0.44.2(astro@7.4.11(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + astro: 7.4.11(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) + astro-expressive-code: 0.44.2(astro@7.4.11(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) bcp-47: 2.1.1 hast-util-from-html: 2.0.3 hast-util-select: 6.0.4 hast-util-to-string: 3.0.1 hastscript: 9.0.1 - i18next: 26.4.2(typescript@5.9.3) + i18next: 26.4.2(typescript@6.0.3) js-yaml: 4.3.2 klona: 2.0.6 magic-string: 0.30.21 - mdast-util-directive: 3.1.0 + mdast-util-directive: 3.1.0(supports-color@10.1.0) mdast-util-to-markdown: 2.1.2 mdast-util-to-string: 4.0.0 pagefind: 1.5.2 rehype: 13.0.2 rehype-format: 5.0.1 - remark-directive: 4.0.0 + remark-directive: 4.0.0(supports-color@10.1.0) satteri: 0.9.5 ultrahtml: 1.7.0 unified: 11.0.5 @@ -8638,7 +9216,7 @@ snapshots: is-docker: 4.0.0 package-manager-detector: 1.9.0 - '@astrojs/vite-plugin-astro@0.1.2(vite@8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))': + '@astrojs/vite-plugin-astro@0.1.2(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))': dependencies: '@astrojs/compiler-rs': 0.5.3 '@astrojs/internal-helpers': 0.13.2 @@ -8648,9 +9226,13 @@ snapshots: magic-string: 1.4.5 rolldown: 1.2.19 smol-toml: 1.9.1 - vite: 8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) + vite: 8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) zod: 4.6.7 + '@astrojs/yaml2ts@0.2.4': + dependencies: + yaml: 2.9.1 + '@babel/code-frame@7.27.1': dependencies: '@babel/helper-validator-identifier': 7.29.7 @@ -8670,20 +9252,20 @@ snapshots: '@babel/compat-data@7.29.7': {} - '@babel/core@7.29.13': + '@babel/core@7.29.13(supports-color@10.1.0)': dependencies: '@babel/code-frame': 7.29.7 '@babel/generator': 7.29.14 '@babel/helper-compilation-targets': 7.29.13 - '@babel/helper-module-transforms': 7.29.14(@babel/core@7.29.13) + '@babel/helper-module-transforms': 7.29.14(@babel/core@7.29.13(supports-color@10.1.0))(supports-color@10.1.0) '@babel/helpers': 7.29.14 '@babel/parser': 7.29.14 '@babel/template': 7.29.7 - '@babel/traverse': 7.29.14 + '@babel/traverse': 7.29.14(supports-color@10.1.0) '@babel/types': 7.29.14 '@jridgewell/remapping': 2.3.5 convert-source-map: 2.0.0 - debug: 4.4.3 + debug: 4.4.3(supports-color@10.1.0) gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 @@ -8727,13 +9309,13 @@ snapshots: lru-cache: 5.1.1 semver: 6.3.1 - '@babel/helper-create-class-features-plugin@8.0.1(@babel/core@7.29.13)': + '@babel/helper-create-class-features-plugin@8.0.1(@babel/core@7.29.13(supports-color@10.1.0))': dependencies: - '@babel/core': 7.29.13 + '@babel/core': 7.29.13(supports-color@10.1.0) '@babel/helper-annotate-as-pure': 8.0.0 '@babel/helper-member-expression-to-functions': 8.0.0 '@babel/helper-optimise-call-expression': 8.0.0 - '@babel/helper-replace-supers': 8.0.1(@babel/core@7.29.13) + '@babel/helper-replace-supers': 8.0.1(@babel/core@7.29.13(supports-color@10.1.0)) '@babel/helper-skip-transparent-expression-wrappers': 8.0.0 '@babel/traverse': 8.0.4 semver: 7.8.5 @@ -8749,26 +9331,26 @@ snapshots: '@babel/traverse': 8.0.4 '@babel/types': 8.0.4 - '@babel/helper-module-imports@7.27.1': + '@babel/helper-module-imports@7.27.1(supports-color@10.1.0)': dependencies: - '@babel/traverse': 7.28.0 + '@babel/traverse': 7.28.0(supports-color@10.1.0) '@babel/types': 7.29.8 transitivePeerDependencies: - supports-color - '@babel/helper-module-imports@7.29.7': + '@babel/helper-module-imports@7.29.7(supports-color@10.1.0)': dependencies: - '@babel/traverse': 7.29.14 + '@babel/traverse': 7.29.14(supports-color@10.1.0) '@babel/types': 7.29.14 transitivePeerDependencies: - supports-color - '@babel/helper-module-transforms@7.29.14(@babel/core@7.29.13)': + '@babel/helper-module-transforms@7.29.14(@babel/core@7.29.13(supports-color@10.1.0))(supports-color@10.1.0)': dependencies: - '@babel/core': 7.29.13 - '@babel/helper-module-imports': 7.29.7 + '@babel/core': 7.29.13(supports-color@10.1.0) + '@babel/helper-module-imports': 7.29.7(supports-color@10.1.0) '@babel/helper-validator-identifier': 7.29.7 - '@babel/traverse': 7.29.14 + '@babel/traverse': 7.29.14(supports-color@10.1.0) transitivePeerDependencies: - supports-color @@ -8778,13 +9360,13 @@ snapshots: '@babel/helper-plugin-utils@7.27.1': {} - '@babel/helper-plugin-utils@8.0.1(@babel/core@7.29.13)': + '@babel/helper-plugin-utils@8.0.1(@babel/core@7.29.13(supports-color@10.1.0))': dependencies: - '@babel/core': 7.29.13 + '@babel/core': 7.29.13(supports-color@10.1.0) - '@babel/helper-replace-supers@8.0.1(@babel/core@7.29.13)': + '@babel/helper-replace-supers@8.0.1(@babel/core@7.29.13(supports-color@10.1.0))': dependencies: - '@babel/core': 7.29.13 + '@babel/core': 7.29.13(supports-color@10.1.0) '@babel/helper-member-expression-to-functions': 8.0.0 '@babel/helper-optimise-call-expression': 8.0.0 '@babel/traverse': 8.0.4 @@ -8831,26 +9413,26 @@ snapshots: dependencies: '@babel/types': 8.0.4 - '@babel/plugin-proposal-decorators@8.0.2(@babel/core@7.29.13)': + '@babel/plugin-proposal-decorators@8.0.2(@babel/core@7.29.13(supports-color@10.1.0))': dependencies: - '@babel/core': 7.29.13 - '@babel/helper-create-class-features-plugin': 8.0.1(@babel/core@7.29.13) - '@babel/helper-plugin-utils': 8.0.1(@babel/core@7.29.13) - '@babel/plugin-syntax-decorators': 8.0.1(@babel/core@7.29.13) + '@babel/core': 7.29.13(supports-color@10.1.0) + '@babel/helper-create-class-features-plugin': 8.0.1(@babel/core@7.29.13(supports-color@10.1.0)) + '@babel/helper-plugin-utils': 8.0.1(@babel/core@7.29.13(supports-color@10.1.0)) + '@babel/plugin-syntax-decorators': 8.0.1(@babel/core@7.29.13(supports-color@10.1.0)) - '@babel/plugin-syntax-decorators@8.0.1(@babel/core@7.29.13)': + '@babel/plugin-syntax-decorators@8.0.1(@babel/core@7.29.13(supports-color@10.1.0))': dependencies: - '@babel/core': 7.29.13 - '@babel/helper-plugin-utils': 8.0.1(@babel/core@7.29.13) + '@babel/core': 7.29.13(supports-color@10.1.0) + '@babel/helper-plugin-utils': 8.0.1(@babel/core@7.29.13(supports-color@10.1.0)) - '@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.29.13)': + '@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.29.13(supports-color@10.1.0))': dependencies: - '@babel/core': 7.29.13 + '@babel/core': 7.29.13(supports-color@10.1.0) '@babel/helper-plugin-utils': 7.27.1 - '@babel/plugin-transform-react-jsx-source@7.27.1(@babel/core@7.29.13)': + '@babel/plugin-transform-react-jsx-source@7.27.1(@babel/core@7.29.13(supports-color@10.1.0))': dependencies: - '@babel/core': 7.29.13 + '@babel/core': 7.29.13(supports-color@10.1.0) '@babel/helper-plugin-utils': 7.27.1 '@babel/runtime-corejs3@7.28.0': @@ -8881,7 +9463,7 @@ snapshots: '@babel/parser': 8.0.4 '@babel/types': 8.0.4 - '@babel/traverse@7.28.0': + '@babel/traverse@7.28.0(supports-color@10.1.0)': dependencies: '@babel/code-frame': 7.27.1 '@babel/generator': 7.28.0 @@ -8889,11 +9471,11 @@ snapshots: '@babel/parser': 7.29.8 '@babel/template': 7.27.2 '@babel/types': 7.29.8 - debug: 4.4.3 + debug: 4.4.3(supports-color@10.1.0) transitivePeerDependencies: - supports-color - '@babel/traverse@7.29.14': + '@babel/traverse@7.29.14(supports-color@10.1.0)': dependencies: '@babel/code-frame': 7.29.7 '@babel/generator': 7.29.14 @@ -8901,7 +9483,7 @@ snapshots: '@babel/parser': 7.29.14 '@babel/template': 7.29.7 '@babel/types': 7.29.14 - debug: 4.4.3 + debug: 4.4.3(supports-color@10.1.0) transitivePeerDependencies: - supports-color @@ -9040,28 +9622,12 @@ snapshots: '@bruits/satteri-win32-x64-msvc@0.9.5': optional: true - '@bundled-es-modules/cookie@2.0.1': - dependencies: - cookie: 0.7.2 - - '@bundled-es-modules/statuses@1.0.1': - dependencies: - statuses: 2.0.2 - - '@bundled-es-modules/tough-cookie@0.1.6': - dependencies: - '@types/tough-cookie': 4.0.5 - tough-cookie: 4.1.4 - '@capsizecss/unpack@4.0.1': dependencies: fontkitten: 1.0.3 '@cfworker/json-schema@4.1.1': {} - '@chat-adapter/catalog@4.45.0': - optional: true - '@clack/core@0.5.0': dependencies: picocolors: 1.1.1 @@ -9093,13 +9659,13 @@ snapshots: optionalDependencies: workerd: 1.20261101.1 - '@cloudflare/vite-plugin@1.67.0(@types/node@24.13.5)(vite@6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))(workerd@1.20261101.1)(wrangler@4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@24.13.5))': + '@cloudflare/vite-plugin@1.67.0(@types/node@22.20.3)(vite@6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))(workerd@1.20261101.1)(wrangler@4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@22.20.3))': dependencies: '@cloudflare/unenv-preset': 2.16.2(unenv@2.0.0-rc.24)(workerd@1.20261101.1) - miniflare: 5.20261101.0-beta(@types/node@24.13.5) + miniflare: 5.20261101.0-beta(@types/node@22.20.3) unenv: 2.0.0-rc.24 - vite: 6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0) - wrangler: 4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@24.13.5) + vite: 6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0) + wrangler: 4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@22.20.3) ws: 8.22.0 transitivePeerDependencies: - '@types/node' @@ -9107,13 +9673,13 @@ snapshots: - utf-8-validate - workerd - '@cloudflare/vitest-plugin@1.4.12(@cloudflare/workers-types@4.20260405.1)(@types/node@24.13.5)(vitest@5.0.5)': + '@cloudflare/vitest-plugin@1.4.12(@cloudflare/workers-types@4.20260405.1)(@types/node@22.20.3)(vitest@5.0.5)': dependencies: cjs-module-lexer: 1.2.3 esbuild: 0.28.2 - miniflare: 5.20261101.0-beta(@types/node@24.13.5) - vitest: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@24.13.5)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@24.13.5)(typescript@5.9.3))(vite@6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0)) - wrangler: 4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@24.13.5) + miniflare: 5.20261101.0-beta(@types/node@22.20.3) + vitest: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.3)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0(supports-color@10.1.0))(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0)) + wrangler: 4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@22.20.3) zod: 4.6.7 transitivePeerDependencies: - '@cloudflare/workers-types' @@ -9172,6 +9738,29 @@ snapshots: '@ctrl/tinycolor@4.2.1': {} + '@emmetio/abbreviation@2.3.3': + dependencies: + '@emmetio/scanner': 1.0.4 + + '@emmetio/css-abbreviation@2.1.8': + dependencies: + '@emmetio/scanner': 1.0.4 + + '@emmetio/css-parser@0.4.1': + dependencies: + '@emmetio/stream-reader': 2.2.0 + '@emmetio/stream-reader-utils': 0.1.0 + + '@emmetio/html-matcher@1.3.0': + dependencies: + '@emmetio/scanner': 1.0.4 + + '@emmetio/scanner@1.0.4': {} + + '@emmetio/stream-reader-utils@0.1.0': {} + + '@emmetio/stream-reader@2.2.0': {} + '@emnapi/core@1.11.1': dependencies: '@emnapi/wasi-threads': 1.2.2 @@ -9182,7 +9771,6 @@ snapshots: dependencies: '@emnapi/wasi-threads': 1.2.3 tslib: 2.8.1 - optional: true '@emnapi/core@2.0.0-beta.2': dependencies: @@ -9198,7 +9786,6 @@ snapshots: '@emnapi/runtime@1.11.3': dependencies: tslib: 2.8.1 - optional: true '@emnapi/runtime@2.0.0-beta.2': dependencies: @@ -9213,16 +9800,15 @@ snapshots: '@emnapi/wasi-threads@1.2.3': dependencies: tslib: 2.8.1 - optional: true '@emnapi/wasi-threads@2.2.0': dependencies: tslib: 2.8.1 optional: true - '@emotion/babel-plugin@11.13.5': + '@emotion/babel-plugin@11.13.5(supports-color@10.1.0)': dependencies: - '@babel/helper-module-imports': 7.27.1 + '@babel/helper-module-imports': 7.27.1(supports-color@10.1.0) '@babel/runtime': 7.28.4 '@emotion/hash': 0.9.2 '@emotion/memoize': 0.9.0 @@ -9244,15 +9830,15 @@ snapshots: '@emotion/weak-memoize': 0.4.0 stylis: 4.2.0 - '@emotion/css@11.1.3(@babel/core@7.29.13)': + '@emotion/css@11.1.3(@babel/core@7.29.13(supports-color@10.1.0))(supports-color@10.1.0)': dependencies: - '@emotion/babel-plugin': 11.13.5 + '@emotion/babel-plugin': 11.13.5(supports-color@10.1.0) '@emotion/cache': 11.14.0 '@emotion/serialize': 1.3.3 '@emotion/sheet': 1.4.0 '@emotion/utils': 1.4.2 optionalDependencies: - '@babel/core': 7.29.13 + '@babel/core': 7.29.13(supports-color@10.1.0) transitivePeerDependencies: - supports-color @@ -9558,9 +10144,9 @@ snapshots: '@fontsource/ibm-plex-mono@5.3.0': {} - '@hono/mcp@0.2.5(@modelcontextprotocol/sdk@1.32.2(@cfworker/json-schema@4.1.1)(zod@4.6.7))(hono-rate-limiter@0.4.2(hono@4.13.18))(hono@4.13.18)(zod@4.6.7)': + '@hono/mcp@0.2.5(@modelcontextprotocol/sdk@1.32.2(@cfworker/json-schema@4.1.1)(supports-color@10.1.0)(zod@4.6.7))(hono-rate-limiter@0.4.2(hono@4.13.18))(hono@4.13.18)(zod@4.6.7)': dependencies: - '@modelcontextprotocol/sdk': 1.32.2(@cfworker/json-schema@4.1.1)(zod@4.6.7) + '@modelcontextprotocol/sdk': 1.32.2(@cfworker/json-schema@4.1.1)(supports-color@10.1.0)(zod@4.6.7) hono: 4.13.18 hono-rate-limiter: 0.4.2(hono@4.13.18) pkce-challenge: 5.0.1 @@ -9570,14 +10156,14 @@ snapshots: dependencies: hono: 4.13.18 - '@hookform/resolvers@5.9.1(@standard-schema/spec@1.1.0)(ajv@8.20.0)(react-hook-form@7.90.0(@types/react@19.3.0)(react@19.2.8))(valibot@1.4.2(typescript@5.9.3))(zod@4.6.7)': + '@hookform/resolvers@5.9.1(@standard-schema/spec@1.1.0)(ajv@8.20.0)(react-hook-form@7.90.0(@types/react@19.3.0)(react@19.2.8))(valibot@1.4.2(typescript@7.0.2))(zod@4.6.7)': dependencies: '@standard-schema/utils': 0.3.0 react-hook-form: 7.90.0(@types/react@19.3.0)(react@19.2.8) optionalDependencies: '@standard-schema/spec': 1.1.0 ajv: 8.20.0 - valibot: 1.4.2(typescript@5.9.3) + valibot: 1.4.2(typescript@7.0.2) zod: 4.6.7 '@img/colour@1.1.0': {} @@ -9686,114 +10272,58 @@ snapshots: '@img/sharp-win32-x64@0.35.5': optional: true - '@inquirer/ansi@1.0.2': {} - - '@inquirer/confirm@5.1.21(@types/node@22.16.0)': - dependencies: - '@inquirer/core': 10.3.2(@types/node@22.16.0) - '@inquirer/type': 3.0.10(@types/node@22.16.0) - optionalDependencies: - '@types/node': 22.16.0 - optional: true - - '@inquirer/confirm@5.1.21(@types/node@22.20.1)': - dependencies: - '@inquirer/core': 10.3.2(@types/node@22.20.1) - '@inquirer/type': 3.0.10(@types/node@22.20.1) - optionalDependencies: - '@types/node': 22.20.1 - optional: true + '@inquirer/ansi@2.1.0': {} - '@inquirer/confirm@5.1.21(@types/node@22.20.3)': + '@inquirer/confirm@6.4.0(@types/node@22.20.3)': dependencies: - '@inquirer/core': 10.3.2(@types/node@22.20.3) - '@inquirer/type': 3.0.10(@types/node@22.20.3) + '@inquirer/core': 12.1.0(@types/node@22.20.3) + '@inquirer/type': 4.3.0(@types/node@22.20.3) optionalDependencies: '@types/node': 22.20.3 - optional: true - '@inquirer/confirm@5.1.21(@types/node@24.13.5)': + '@inquirer/confirm@6.4.0(@types/node@24.13.5)': dependencies: - '@inquirer/core': 10.3.2(@types/node@24.13.5) - '@inquirer/type': 3.0.10(@types/node@24.13.5) + '@inquirer/core': 12.1.0(@types/node@24.13.5) + '@inquirer/type': 4.3.0(@types/node@24.13.5) optionalDependencies: '@types/node': 24.13.5 - - '@inquirer/core@10.3.2(@types/node@22.16.0)': - dependencies: - '@inquirer/ansi': 1.0.2 - '@inquirer/figures': 1.0.15 - '@inquirer/type': 3.0.10(@types/node@22.16.0) - cli-width: 4.1.0 - mute-stream: 2.0.0 - signal-exit: 4.1.0 - wrap-ansi: 6.2.0 - yoctocolors-cjs: 2.1.3 - optionalDependencies: - '@types/node': 22.16.0 - optional: true - - '@inquirer/core@10.3.2(@types/node@22.20.1)': - dependencies: - '@inquirer/ansi': 1.0.2 - '@inquirer/figures': 1.0.15 - '@inquirer/type': 3.0.10(@types/node@22.20.1) - cli-width: 4.1.0 - mute-stream: 2.0.0 - signal-exit: 4.1.0 - wrap-ansi: 6.2.0 - yoctocolors-cjs: 2.1.3 - optionalDependencies: - '@types/node': 22.20.1 optional: true - '@inquirer/core@10.3.2(@types/node@22.20.3)': + '@inquirer/core@12.1.0(@types/node@22.20.3)': dependencies: - '@inquirer/ansi': 1.0.2 - '@inquirer/figures': 1.0.15 - '@inquirer/type': 3.0.10(@types/node@22.20.3) + '@inquirer/ansi': 2.1.0 + '@inquirer/figures': 2.1.0 + '@inquirer/type': 4.3.0(@types/node@22.20.3) cli-width: 4.1.0 - mute-stream: 2.0.0 + fast-wrap-ansi: 0.2.2 + mute-stream: 4.0.0 signal-exit: 4.1.0 - wrap-ansi: 6.2.0 - yoctocolors-cjs: 2.1.3 optionalDependencies: '@types/node': 22.20.3 - optional: true - '@inquirer/core@10.3.2(@types/node@24.13.5)': + '@inquirer/core@12.1.0(@types/node@24.13.5)': dependencies: - '@inquirer/ansi': 1.0.2 - '@inquirer/figures': 1.0.15 - '@inquirer/type': 3.0.10(@types/node@24.13.5) + '@inquirer/ansi': 2.1.0 + '@inquirer/figures': 2.1.0 + '@inquirer/type': 4.3.0(@types/node@24.13.5) cli-width: 4.1.0 - mute-stream: 2.0.0 + fast-wrap-ansi: 0.2.2 + mute-stream: 4.0.0 signal-exit: 4.1.0 - wrap-ansi: 6.2.0 - yoctocolors-cjs: 2.1.3 optionalDependencies: '@types/node': 24.13.5 - - '@inquirer/figures@1.0.15': {} - - '@inquirer/type@3.0.10(@types/node@22.16.0)': - optionalDependencies: - '@types/node': 22.16.0 optional: true - '@inquirer/type@3.0.10(@types/node@22.20.1)': - optionalDependencies: - '@types/node': 22.20.1 - optional: true + '@inquirer/figures@2.1.0': {} - '@inquirer/type@3.0.10(@types/node@22.20.3)': + '@inquirer/type@4.3.0(@types/node@22.20.3)': optionalDependencies: '@types/node': 22.20.3 - optional: true - '@inquirer/type@3.0.10(@types/node@24.13.5)': + '@inquirer/type@4.3.0(@types/node@24.13.5)': optionalDependencies: '@types/node': 24.13.5 + optional: true '@isaacs/nonrecursive-glob-match@1.1.0': {} @@ -9828,7 +10358,7 @@ snapshots: '@logtape/logtape': 1.1.1 '@sentry/core': 9.34.0 - '@mdx-js/mdx@3.1.1': + '@mdx-js/mdx@3.1.1(supports-color@10.1.0)': dependencies: '@types/estree': 1.0.9 '@types/estree-jsx': 1.0.5 @@ -9840,14 +10370,14 @@ snapshots: estree-util-is-identifier-name: 3.0.0 estree-util-scope: 1.0.1 estree-walker: 3.0.3 - hast-util-to-jsx-runtime: 2.3.6 + hast-util-to-jsx-runtime: 2.3.6(supports-color@10.1.0) markdown-extensions: 2.0.0 recma-build-jsx: 1.0.0 recma-jsx: 1.0.1(acorn@8.18.0) recma-stringify: 1.0.0 - rehype-recma: 1.0.0 - remark-mdx: 3.1.1 - remark-parse: 11.0.0 + rehype-recma: 1.0.0(supports-color@10.1.0) + remark-mdx: 3.1.1(supports-color@10.1.0) + remark-parse: 11.0.0(supports-color@10.1.0) remark-rehype: 11.1.2 source-map: 0.7.6 unified: 11.0.5 @@ -9872,18 +10402,18 @@ snapshots: dependencies: zod: 4.6.7 - '@modelcontextprotocol/sdk@1.32.2(@cfworker/json-schema@4.1.1)(zod@4.6.7)': + '@modelcontextprotocol/sdk@1.32.2(@cfworker/json-schema@4.1.1)(supports-color@10.1.0)(zod@4.6.7)': dependencies: '@hono/node-server': 2.1.7(hono@4.13.18) ajv: 8.20.0 - ajv-formats: 3.0.1(ajv@8.20.0) + ajv-formats: 3.0.1 content-type: 1.0.5 cors: 2.8.6 cross-spawn: 7.0.6 eventsource: 3.0.7 eventsource-parser: 3.1.1 - express: 5.3.0 - express-rate-limit: 8.7.1(express@5.3.0) + express: 5.3.0(supports-color@10.1.0) + express-rate-limit: 8.7.1(express@5.3.0(supports-color@10.1.0))(supports-color@10.1.0) hono: 4.13.18 jose: 6.2.12 json-schema-typed: 8.0.2 @@ -9901,7 +10431,7 @@ snapshots: '@modelcontextprotocol/core': 2.4.0 zod: 4.6.7 - '@mswjs/interceptors@0.39.8': + '@mswjs/interceptors@0.41.9': dependencies: '@open-draft/deferred-promise': 2.2.0 '@open-draft/logger': 0.3.0 @@ -9913,13 +10443,6 @@ snapshots: '@napi-rs/lzma-linux-x64-gnu@1.5.1': optional: true - '@napi-rs/wasm-runtime@0.2.12': - dependencies: - '@emnapi/core': 1.11.3 - '@emnapi/runtime': 1.11.3 - '@tybys/wasm-util': 0.10.3 - optional: true - '@napi-rs/wasm-runtime@1.2.4(@emnapi/core@1.11.1)(@emnapi/runtime@1.11.1)': dependencies: '@emnapi/core': 1.11.1 @@ -9927,6 +10450,12 @@ snapshots: '@tybys/wasm-util': 0.10.3 optional: true + '@napi-rs/wasm-runtime@1.2.4(@emnapi/core@1.11.3)(@emnapi/runtime@1.11.3)': + dependencies: + '@emnapi/core': 1.11.3 + '@emnapi/runtime': 1.11.3 + '@tybys/wasm-util': 0.10.3 + '@napi-rs/wasm-runtime@1.2.6(@emnapi/core@2.0.0-beta.2)(@emnapi/runtime@2.0.0-beta.2)': dependencies: '@emnapi/core': 2.0.0-beta.2 @@ -9950,6 +10479,8 @@ snapshots: '@open-draft/deferred-promise@2.2.0': {} + '@open-draft/deferred-promise@3.0.0': {} + '@open-draft/logger@0.3.0': dependencies: is-node-process: 1.2.0 @@ -10031,146 +10562,144 @@ snapshots: '@oxc-parser/binding-win32-x64-msvc@0.152.0': optional: true - '@oxc-project/runtime@0.75.0': {} - '@oxc-project/types@0.152.0': {} '@oxc-project/types@0.154.0': {} '@oxc-project/types@0.156.0': {} - '@oxc-project/types@0.75.0': {} + '@oxc-project/types@0.158.0': {} - '@oxfmt/binding-android-arm-eabi@0.72.0': + '@oxfmt/binding-android-arm-eabi@0.78.0': optional: true - '@oxfmt/binding-android-arm64@0.72.0': + '@oxfmt/binding-android-arm64@0.78.0': optional: true - '@oxfmt/binding-darwin-arm64@0.72.0': + '@oxfmt/binding-darwin-arm64@0.78.0': optional: true - '@oxfmt/binding-darwin-x64@0.72.0': + '@oxfmt/binding-darwin-x64@0.78.0': optional: true - '@oxfmt/binding-freebsd-x64@0.72.0': + '@oxfmt/binding-freebsd-x64@0.78.0': optional: true - '@oxfmt/binding-linux-arm-gnueabihf@0.72.0': + '@oxfmt/binding-linux-arm-gnueabihf@0.78.0': optional: true - '@oxfmt/binding-linux-arm-musleabihf@0.72.0': + '@oxfmt/binding-linux-arm-musleabihf@0.78.0': optional: true - '@oxfmt/binding-linux-arm64-gnu@0.72.0': + '@oxfmt/binding-linux-arm64-gnu@0.78.0': optional: true - '@oxfmt/binding-linux-arm64-musl@0.72.0': + '@oxfmt/binding-linux-arm64-musl@0.78.0': optional: true - '@oxfmt/binding-linux-ppc64-gnu@0.72.0': + '@oxfmt/binding-linux-ppc64-gnu@0.78.0': optional: true - '@oxfmt/binding-linux-riscv64-gnu@0.72.0': + '@oxfmt/binding-linux-riscv64-gnu@0.78.0': optional: true - '@oxfmt/binding-linux-riscv64-musl@0.72.0': + '@oxfmt/binding-linux-riscv64-musl@0.78.0': optional: true - '@oxfmt/binding-linux-s390x-gnu@0.72.0': + '@oxfmt/binding-linux-s390x-gnu@0.78.0': optional: true - '@oxfmt/binding-linux-x64-gnu@0.72.0': + '@oxfmt/binding-linux-x64-gnu@0.78.0': optional: true - '@oxfmt/binding-linux-x64-musl@0.72.0': + '@oxfmt/binding-linux-x64-musl@0.78.0': optional: true - '@oxfmt/binding-openharmony-arm64@0.72.0': + '@oxfmt/binding-openharmony-arm64@0.78.0': optional: true - '@oxfmt/binding-win32-arm64-msvc@0.72.0': + '@oxfmt/binding-win32-arm64-msvc@0.78.0': optional: true - '@oxfmt/binding-win32-ia32-msvc@0.72.0': + '@oxfmt/binding-win32-ia32-msvc@0.78.0': optional: true - '@oxfmt/binding-win32-x64-msvc@0.72.0': + '@oxfmt/binding-win32-x64-msvc@0.78.0': optional: true - '@oxlint-tsgolint/darwin-arm64@7.0.2004': + '@oxlint-tsgolint/darwin-arm64@7.0.2007': optional: true - '@oxlint-tsgolint/darwin-x64@7.0.2004': + '@oxlint-tsgolint/darwin-x64@7.0.2007': optional: true - '@oxlint-tsgolint/linux-arm64@7.0.2004': + '@oxlint-tsgolint/linux-arm64@7.0.2007': optional: true - '@oxlint-tsgolint/linux-x64@7.0.2004': + '@oxlint-tsgolint/linux-x64@7.0.2007': optional: true - '@oxlint-tsgolint/win32-arm64@7.0.2004': + '@oxlint-tsgolint/win32-arm64@7.0.2007': optional: true - '@oxlint-tsgolint/win32-x64@7.0.2004': + '@oxlint-tsgolint/win32-x64@7.0.2007': optional: true - '@oxlint/binding-android-arm-eabi@1.87.0': + '@oxlint/binding-android-arm-eabi@1.93.0': optional: true - '@oxlint/binding-android-arm64@1.87.0': + '@oxlint/binding-android-arm64@1.93.0': optional: true - '@oxlint/binding-darwin-arm64@1.87.0': + '@oxlint/binding-darwin-arm64@1.93.0': optional: true - '@oxlint/binding-darwin-x64@1.87.0': + '@oxlint/binding-darwin-x64@1.93.0': optional: true - '@oxlint/binding-freebsd-x64@1.87.0': + '@oxlint/binding-freebsd-x64@1.93.0': optional: true - '@oxlint/binding-linux-arm-gnueabihf@1.87.0': + '@oxlint/binding-linux-arm-gnueabihf@1.93.0': optional: true - '@oxlint/binding-linux-arm-musleabihf@1.87.0': + '@oxlint/binding-linux-arm-musleabihf@1.93.0': optional: true - '@oxlint/binding-linux-arm64-gnu@1.87.0': + '@oxlint/binding-linux-arm64-gnu@1.93.0': optional: true - '@oxlint/binding-linux-arm64-musl@1.87.0': + '@oxlint/binding-linux-arm64-musl@1.93.0': optional: true - '@oxlint/binding-linux-ppc64-gnu@1.87.0': + '@oxlint/binding-linux-ppc64-gnu@1.93.0': optional: true - '@oxlint/binding-linux-riscv64-gnu@1.87.0': + '@oxlint/binding-linux-riscv64-gnu@1.93.0': optional: true - '@oxlint/binding-linux-riscv64-musl@1.87.0': + '@oxlint/binding-linux-riscv64-musl@1.93.0': optional: true - '@oxlint/binding-linux-s390x-gnu@1.87.0': + '@oxlint/binding-linux-s390x-gnu@1.93.0': optional: true - '@oxlint/binding-linux-x64-gnu@1.87.0': + '@oxlint/binding-linux-x64-gnu@1.93.0': optional: true - '@oxlint/binding-linux-x64-musl@1.87.0': + '@oxlint/binding-linux-x64-musl@1.93.0': optional: true - '@oxlint/binding-openharmony-arm64@1.87.0': + '@oxlint/binding-openharmony-arm64@1.93.0': optional: true - '@oxlint/binding-win32-arm64-msvc@1.87.0': + '@oxlint/binding-win32-arm64-msvc@1.93.0': optional: true - '@oxlint/binding-win32-ia32-msvc@1.87.0': + '@oxlint/binding-win32-ia32-msvc@1.93.0': optional: true - '@oxlint/binding-win32-x64-msvc@1.87.0': + '@oxlint/binding-win32-x64-msvc@1.93.0': optional: true '@pagefind/darwin-arm64@1.5.2': @@ -10212,9 +10741,9 @@ snapshots: '@poppinss/exception@1.2.2': {} - '@quansync/fs@0.1.3': + '@quansync/fs@1.1.0': dependencies: - quansync: 0.2.10 + quansync: 1.0.0 '@radix-ui/primitive@1.1.7': {} @@ -10630,13 +11159,16 @@ snapshots: '@rolldown/binding-android-arm-eabi@1.2.19': optional: true + '@rolldown/binding-android-arm-eabi@1.3.2': + optional: true + '@rolldown/binding-android-arm64@1.2.14': optional: true '@rolldown/binding-android-arm64@1.2.19': optional: true - '@rolldown/binding-darwin-arm64@1.0.0-beta.23': + '@rolldown/binding-android-arm64@1.3.2': optional: true '@rolldown/binding-darwin-arm64@1.2.14': @@ -10645,7 +11177,7 @@ snapshots: '@rolldown/binding-darwin-arm64@1.2.19': optional: true - '@rolldown/binding-darwin-x64@1.0.0-beta.23': + '@rolldown/binding-darwin-arm64@1.3.2': optional: true '@rolldown/binding-darwin-x64@1.2.14': @@ -10654,7 +11186,7 @@ snapshots: '@rolldown/binding-darwin-x64@1.2.19': optional: true - '@rolldown/binding-freebsd-x64@1.0.0-beta.23': + '@rolldown/binding-darwin-x64@1.3.2': optional: true '@rolldown/binding-freebsd-x64@1.2.14': @@ -10663,7 +11195,7 @@ snapshots: '@rolldown/binding-freebsd-x64@1.2.19': optional: true - '@rolldown/binding-linux-arm-gnueabihf@1.0.0-beta.23': + '@rolldown/binding-freebsd-x64@1.3.2': optional: true '@rolldown/binding-linux-arm-gnueabihf@1.2.14': @@ -10672,7 +11204,7 @@ snapshots: '@rolldown/binding-linux-arm-gnueabihf@1.2.19': optional: true - '@rolldown/binding-linux-arm64-gnu@1.0.0-beta.23': + '@rolldown/binding-linux-arm-gnueabihf@1.3.2': optional: true '@rolldown/binding-linux-arm64-gnu@1.2.14': @@ -10681,7 +11213,7 @@ snapshots: '@rolldown/binding-linux-arm64-gnu@1.2.19': optional: true - '@rolldown/binding-linux-arm64-musl@1.0.0-beta.23': + '@rolldown/binding-linux-arm64-gnu@1.3.2': optional: true '@rolldown/binding-linux-arm64-musl@1.2.14': @@ -10690,19 +11222,25 @@ snapshots: '@rolldown/binding-linux-arm64-musl@1.2.19': optional: true + '@rolldown/binding-linux-arm64-musl@1.3.2': + optional: true + '@rolldown/binding-linux-ppc64-gnu@1.2.14': optional: true '@rolldown/binding-linux-ppc64-gnu@1.2.19': optional: true + '@rolldown/binding-linux-ppc64-gnu@1.3.2': + optional: true + '@rolldown/binding-linux-s390x-gnu@1.2.14': optional: true '@rolldown/binding-linux-s390x-gnu@1.2.19': optional: true - '@rolldown/binding-linux-x64-gnu@1.0.0-beta.23': + '@rolldown/binding-linux-s390x-gnu@1.3.2': optional: true '@rolldown/binding-linux-x64-gnu@1.2.14': @@ -10711,7 +11249,7 @@ snapshots: '@rolldown/binding-linux-x64-gnu@1.2.19': optional: true - '@rolldown/binding-linux-x64-musl@1.0.0-beta.23': + '@rolldown/binding-linux-x64-gnu@1.3.2': optional: true '@rolldown/binding-linux-x64-musl@1.2.14': @@ -10720,15 +11258,16 @@ snapshots: '@rolldown/binding-linux-x64-musl@1.2.19': optional: true + '@rolldown/binding-linux-x64-musl@1.3.2': + optional: true + '@rolldown/binding-openharmony-arm64@1.2.14': optional: true '@rolldown/binding-openharmony-arm64@1.2.19': optional: true - '@rolldown/binding-wasm32-wasi@1.0.0-beta.23': - dependencies: - '@napi-rs/wasm-runtime': 0.2.12 + '@rolldown/binding-openharmony-arm64@1.3.2': optional: true '@rolldown/binding-wasm32-wasi@1.2.19': @@ -10738,7 +11277,11 @@ snapshots: '@napi-rs/wasm-runtime': 1.2.6(@emnapi/core@2.0.0-beta.2)(@emnapi/runtime@2.0.0-beta.2) optional: true - '@rolldown/binding-win32-arm64-msvc@1.0.0-beta.23': + '@rolldown/binding-wasm32-wasi@1.3.2': + dependencies: + '@emnapi/core': 2.0.0-beta.2 + '@emnapi/runtime': 2.0.0-beta.2 + '@napi-rs/wasm-runtime': 1.2.6(@emnapi/core@2.0.0-beta.2)(@emnapi/runtime@2.0.0-beta.2) optional: true '@rolldown/binding-win32-arm64-msvc@1.2.14': @@ -10747,10 +11290,7 @@ snapshots: '@rolldown/binding-win32-arm64-msvc@1.2.19': optional: true - '@rolldown/binding-win32-ia32-msvc@1.0.0-beta.23': - optional: true - - '@rolldown/binding-win32-x64-msvc@1.0.0-beta.23': + '@rolldown/binding-win32-arm64-msvc@1.3.2': optional: true '@rolldown/binding-win32-x64-msvc@1.2.14': @@ -10759,29 +11299,30 @@ snapshots: '@rolldown/binding-win32-x64-msvc@1.2.19': optional: true - '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.13)(@babel/runtime@7.28.4)(rolldown@1.2.14)(vite@6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))': + '@rolldown/binding-win32-x64-msvc@1.3.2': + optional: true + + '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.13(supports-color@10.1.0))(@babel/runtime@7.28.4)(rolldown@1.3.2)(vite@6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))': dependencies: - '@babel/core': 7.29.13 + '@babel/core': 7.29.13(supports-color@10.1.0) picomatch: 4.0.7 - rolldown: 1.2.14 + rolldown: 1.3.2 optionalDependencies: '@babel/runtime': 7.28.4 - vite: 6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0) + vite: 6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0) - '@rolldown/plugin-babel@0.2.3(@babel/core@7.29.13)(@babel/runtime@7.28.4)(rolldown@1.2.19)(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0))': + '@rolldown/plugin-babel@0.3.1(@babel/core@7.29.13(supports-color@10.1.0))(@babel/runtime@7.28.4)(rolldown@1.3.2)(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0))': dependencies: - '@babel/core': 7.29.13 + '@babel/core': 7.29.13(supports-color@10.1.0) + artichokie: 0.4.5 picomatch: 4.0.7 - rolldown: 1.2.19 + rolldown: 1.3.2 optionalDependencies: '@babel/runtime': 7.28.4 vite: 8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0) - optional: true '@rolldown/pluginutils@1.0.0-beta.19': {} - '@rolldown/pluginutils@1.0.0-beta.23': {} - '@rolldown/pluginutils@1.0.1': {} '@rollup/rollup-android-arm-eabi@4.62.4': @@ -10859,16 +11400,16 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.62.4': optional: true - '@sentry/api@2.15.0(typescript@5.9.3)(valibot@1.4.2(typescript@5.9.3))(zod@4.6.7)': + '@sentry/api@2.15.0(valibot@1.4.2(typescript@7.0.2))(zod@4.6.7)': dependencies: http-cache-semantics: 4.3.0 p-limit: 7.3.3 + typescript: '@typescript/typescript6@6.0.2' optionalDependencies: - typescript: 5.9.3 - valibot: 1.4.2(typescript@5.9.3) + valibot: 1.4.2(typescript@7.0.2) zod: 4.6.7 - '@sentry/astro@11.12.0(astro@7.4.11(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(rollup@4.62.4)': + '@sentry/astro@11.12.0(astro@7.4.11(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(rollup@4.62.4)': dependencies: '@sentry/browser': 11.12.0 '@sentry/bundler-plugins': 11.12.0(rollup@4.62.4) @@ -10877,7 +11418,7 @@ snapshots: '@sentry/node': 11.12.0(rollup@4.62.4) '@sentry/server-runtime-injection': 11.12.0 '@sentry/server-utils': 11.12.0 - astro: 7.4.11(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) + astro: 7.4.11(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) transitivePeerDependencies: - rollup - webpack @@ -10908,7 +11449,7 @@ snapshots: optionalDependencies: rollup: 4.62.4 - '@sentry/cloudflare@11.12.0(@cloudflare/workers-types@4.20260405.1)(vite@6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))(wrangler@4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@24.13.5))': + '@sentry/cloudflare@11.12.0(@cloudflare/workers-types@4.20260405.1)(vite@6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))(wrangler@4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@22.20.3))': dependencies: '@opentelemetry/api': 1.9.1 '@sentry/conventions': 0.32.0 @@ -10918,10 +11459,10 @@ snapshots: magic-string: 0.30.21 optionalDependencies: '@cloudflare/workers-types': 4.20260405.1 - vite: 6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0) - wrangler: 4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@24.13.5) + vite: 6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0) + wrangler: 4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@22.20.3) - '@sentry/cloudflare@11.12.0(@cloudflare/workers-types@4.20260405.1)(vite@8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(wrangler@4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@24.13.5))': + '@sentry/cloudflare@11.12.0(@cloudflare/workers-types@4.20260405.1)(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(wrangler@4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@22.20.3))': dependencies: '@opentelemetry/api': 1.9.1 '@sentry/conventions': 0.32.0 @@ -10931,20 +11472,8 @@ snapshots: magic-string: 0.30.21 optionalDependencies: '@cloudflare/workers-types': 4.20260405.1 - vite: 8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) - wrangler: 4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@24.13.5) - - '@sentry/cloudflare@11.12.0(vite@8.3.8(@types/node@22.20.1)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(wrangler@4.156.1(@types/node@22.20.1))': - dependencies: - '@opentelemetry/api': 1.9.1 - '@sentry/conventions': 0.32.0 - '@sentry/core': 11.12.0 - '@sentry/opentelemetry': 11.12.0(@opentelemetry/api@1.9.1) - '@sentry/server-utils': 11.12.0 - magic-string: 0.30.21 - optionalDependencies: - vite: 8.3.8(@types/node@22.20.1)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) - wrangler: 4.156.1(@types/node@22.20.1) + vite: 8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) + wrangler: 4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@22.20.3) '@sentry/conventions@0.32.0': {} @@ -10998,7 +11527,7 @@ snapshots: '@sentry/roach@0.3.0(vitest@5.0.5)': optionalDependencies: - vitest: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@24.13.5)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@24.13.5)(typescript@5.9.3))(vite@8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + vitest: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.3)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0(supports-color@10.1.0))(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) '@sentry/search-syntax@1.0.0': {} @@ -11017,9 +11546,9 @@ snapshots: optionalDependencies: react: 19.2.8 - '@sentry/starlight-theme@0.8.1(@astrojs/starlight@0.41.11(astro@7.4.11(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(typescript@5.9.3))': + '@sentry/starlight-theme@0.8.1(@astrojs/starlight@0.41.11(astro@7.4.11(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(supports-color@10.1.0)(typescript@6.0.3))': dependencies: - '@astrojs/starlight': 0.41.11(astro@7.4.11(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(typescript@5.9.3) + '@astrojs/starlight': 0.41.11(astro@7.4.11(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))(supports-color@10.1.0)(typescript@6.0.3) '@fontsource-variable/rubik': 5.3.0 '@fontsource/ibm-plex-mono': 5.3.0 marked: 18.0.13 @@ -11157,7 +11686,7 @@ snapshots: dependencies: '@stricli/core': 1.3.0 - '@stricli/core@1.2.8(patch_hash=cbf047581d38be04108d3921321c14a778272c24004da8110d4498d4f2a6b2e1)': {} + '@stricli/core@1.2.8(patch_hash=c1d70807ac8f612d2e942650da25753076478898ece26cbdef5af377bedcbadc)': {} '@stricli/core@1.3.0': {} @@ -11230,12 +11759,12 @@ snapshots: postcss-selector-parser: 6.1.6 tailwindcss: 4.3.3 - '@tailwindcss/vite@4.3.3(vite@6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))': + '@tailwindcss/vite@4.3.3(vite@6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))': dependencies: '@tailwindcss/node': 4.3.3 '@tailwindcss/oxide': 4.3.3 tailwindcss: 4.3.3 - vite: 6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0) + vite: 6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0) '@tailwindcss/vite@4.3.3(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0))': dependencies: @@ -11268,7 +11797,6 @@ snapshots: '@tybys/wasm-util@0.10.3': dependencies: tslib: 2.8.1 - optional: true '@types/aria-query@5.0.4': {} @@ -11297,7 +11825,7 @@ snapshots: dependencies: '@types/deep-eql': 4.0.2 - '@types/cookie@0.6.0': {} + '@types/convert-source-map@2.0.3': {} '@types/debug@4.1.12': dependencies: @@ -11350,14 +11878,6 @@ snapshots: dependencies: undici-types: 5.26.5 - '@types/node@22.16.0': - dependencies: - undici-types: 6.21.0 - - '@types/node@22.20.1': - dependencies: - undici-types: 6.21.0 - '@types/node@22.20.3': dependencies: undici-types: 6.21.0 @@ -11402,9 +11922,11 @@ snapshots: '@types/semver@7.8.0': {} - '@types/statuses@2.0.6': {} + '@types/set-cookie-parser@2.4.10': + dependencies: + '@types/node': 24.13.5 - '@types/tough-cookie@4.0.5': {} + '@types/statuses@2.0.6': {} '@types/unist@2.0.11': {} @@ -11414,6 +11936,70 @@ snapshots: dependencies: '@types/node': 22.20.3 + '@typescript/typescript-aix-ppc64@7.0.2': + optional: true + + '@typescript/typescript-darwin-arm64@7.0.2': + optional: true + + '@typescript/typescript-darwin-x64@7.0.2': + optional: true + + '@typescript/typescript-freebsd-arm64@7.0.2': + optional: true + + '@typescript/typescript-freebsd-x64@7.0.2': + optional: true + + '@typescript/typescript-linux-arm64@7.0.2': + optional: true + + '@typescript/typescript-linux-arm@7.0.2': + optional: true + + '@typescript/typescript-linux-loong64@7.0.2': + optional: true + + '@typescript/typescript-linux-mips64el@7.0.2': + optional: true + + '@typescript/typescript-linux-ppc64@7.0.2': + optional: true + + '@typescript/typescript-linux-riscv64@7.0.2': + optional: true + + '@typescript/typescript-linux-s390x@7.0.2': + optional: true + + '@typescript/typescript-linux-x64@7.0.2': + optional: true + + '@typescript/typescript-netbsd-arm64@7.0.2': + optional: true + + '@typescript/typescript-netbsd-x64@7.0.2': + optional: true + + '@typescript/typescript-openbsd-arm64@7.0.2': + optional: true + + '@typescript/typescript-openbsd-x64@7.0.2': + optional: true + + '@typescript/typescript-sunos-x64@7.0.2': + optional: true + + '@typescript/typescript-win32-arm64@7.0.2': + optional: true + + '@typescript/typescript-win32-x64@7.0.2': + optional: true + + '@typescript/typescript6@6.0.2': + dependencies: + '@typescript/old': typescript@6.0.3 + '@uidotdev/usehooks@2.4.1(react-dom@19.2.8(react@19.2.8))(react@19.2.8)': dependencies: react: 19.2.8 @@ -11433,24 +12019,24 @@ snapshots: optionalDependencies: react: 19.2.8 - '@vitejs/plugin-react@4.6.0(vite@6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))': + '@vitejs/plugin-react@4.6.0(supports-color@10.1.0)(vite@6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))': dependencies: - '@babel/core': 7.29.13 - '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.29.13) - '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.29.13) + '@babel/core': 7.29.13(supports-color@10.1.0) + '@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.29.13(supports-color@10.1.0)) + '@babel/plugin-transform-react-jsx-source': 7.27.1(@babel/core@7.29.13(supports-color@10.1.0)) '@rolldown/pluginutils': 1.0.0-beta.19 '@types/babel__core': 7.20.5 react-refresh: 0.17.0 - vite: 6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0) + vite: 6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0) transitivePeerDependencies: - supports-color - '@vitejs/plugin-react@6.1.2(@rolldown/plugin-babel@0.2.3(@babel/core@7.29.13)(@babel/runtime@7.28.4)(rolldown@1.2.19)(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0)))(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0))': + '@vitejs/plugin-react@6.3.0(@rolldown/plugin-babel@0.3.1(@babel/core@7.29.13(supports-color@10.1.0))(@babel/runtime@7.28.4)(rolldown@1.3.2)(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0)))(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0))': dependencies: '@rolldown/pluginutils': 1.0.1 vite: 8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0) optionalDependencies: - '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.13)(@babel/runtime@7.28.4)(rolldown@1.2.19)(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0)) + '@rolldown/plugin-babel': 0.3.1(@babel/core@7.29.13(supports-color@10.1.0))(@babel/runtime@7.28.4)(rolldown@1.3.2)(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0)) '@vitest-evals/core@0.18.0': dependencies: @@ -11470,7 +12056,7 @@ snapshots: obug: 3.0.0 std-env: 4.3.0 tinyrainbow: 3.2.0 - vitest: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.16.0)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@22.16.0)(typescript@5.9.3))(vite@8.3.8(@types/node@22.16.0)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + vitest: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.3)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0(supports-color@10.1.0))(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) '@vitest/istanbul-lib-coverage@1.0.2': {} @@ -11478,69 +12064,121 @@ snapshots: dependencies: '@vitest/istanbul-lib-coverage': 1.0.2 - '@vitest/mocker@5.0.5(msw@2.10.2(@types/node@22.16.0)(typescript@5.9.3))(vite@8.3.8(@types/node@22.16.0)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))': - dependencies: - '@jridgewell/trace-mapping': 0.3.31 - '@vitest/spy': 5.0.5 - estree-walker: 3.0.3 - magic-string: 1.4.5 - optionalDependencies: - msw: 2.10.2(@types/node@22.16.0)(typescript@5.9.3) - vite: 8.3.8(@types/node@22.16.0)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) - - '@vitest/mocker@5.0.5(msw@2.10.2(@types/node@22.20.1)(typescript@5.9.3))(vite@8.3.8(@types/node@22.20.1)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))': + '@vitest/mocker@5.0.5(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))': dependencies: '@jridgewell/trace-mapping': 0.3.31 '@vitest/spy': 5.0.5 estree-walker: 3.0.3 magic-string: 1.4.5 optionalDependencies: - msw: 2.10.2(@types/node@22.20.1)(typescript@5.9.3) - vite: 8.3.8(@types/node@22.20.1)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) + msw: 2.15.0(@types/node@22.20.3)(typescript@7.0.2) + vite: 6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0) - '@vitest/mocker@5.0.5(msw@2.10.2(@types/node@22.20.3)(typescript@5.9.3))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.1)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))': + '@vitest/mocker@5.0.5(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.1)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))': dependencies: '@jridgewell/trace-mapping': 0.3.31 '@vitest/spy': 5.0.5 estree-walker: 3.0.3 magic-string: 1.4.5 optionalDependencies: - msw: 2.10.2(@types/node@22.20.3)(typescript@5.9.3) + msw: 2.15.0(@types/node@22.20.3)(typescript@7.0.2) vite: 8.3.8(@types/node@22.20.3)(esbuild@0.28.1)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) - '@vitest/mocker@5.0.5(msw@2.10.2(@types/node@24.13.5)(typescript@5.9.3))(vite@6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))': + '@vitest/mocker@5.0.5(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))': dependencies: '@jridgewell/trace-mapping': 0.3.31 '@vitest/spy': 5.0.5 estree-walker: 3.0.3 magic-string: 1.4.5 optionalDependencies: - msw: 2.10.2(@types/node@24.13.5)(typescript@5.9.3) - vite: 6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0) + msw: 2.15.0(@types/node@22.20.3)(typescript@7.0.2) + vite: 8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) - '@vitest/mocker@5.0.5(msw@2.10.2(@types/node@24.13.5)(typescript@5.9.3))(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0))': + '@vitest/mocker@5.0.5(msw@2.15.0(@types/node@24.13.5)(typescript@7.0.2))(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0))': dependencies: '@jridgewell/trace-mapping': 0.3.31 '@vitest/spy': 5.0.5 estree-walker: 3.0.3 magic-string: 1.4.5 optionalDependencies: - msw: 2.10.2(@types/node@24.13.5)(typescript@5.9.3) + msw: 2.15.0(@types/node@24.13.5)(typescript@7.0.2) vite: 8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0) - '@vitest/mocker@5.0.5(msw@2.10.2(@types/node@24.13.5)(typescript@5.9.3))(vite@8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1))': + '@vitest/spy@5.0.5': {} + + '@volar/kit@2.4.31(typescript@6.0.3)': dependencies: - '@jridgewell/trace-mapping': 0.3.31 - '@vitest/spy': 5.0.5 - estree-walker: 3.0.3 - magic-string: 1.4.5 + '@volar/language-service': 2.4.31(typescript@6.0.3) + '@volar/typescript': 2.4.31(typescript@6.0.3) + typesafe-path: 0.2.2 + typescript: 6.0.3 + vscode-languageserver-textdocument: 1.0.16 + vscode-uri: 3.2.0 + + '@volar/language-core@2.4.31': + dependencies: + '@volar/source-map': 2.4.31 + + '@volar/language-server@2.4.31(typescript@6.0.3)': + dependencies: + '@volar/language-core': 2.4.31 + '@volar/language-service': 2.4.31(typescript@6.0.3) + '@volar/typescript': 2.4.31(typescript@6.0.3) + path-browserify: 1.0.1 + request-light: 0.7.0 + vscode-languageserver: 9.0.1 + vscode-languageserver-protocol: 3.18.5 + vscode-languageserver-textdocument: 1.0.16 + vscode-uri: 3.2.0 optionalDependencies: - msw: 2.10.2(@types/node@24.13.5)(typescript@5.9.3) - vite: 8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) + typescript: 6.0.3 - '@vitest/spy@5.0.5': {} + '@volar/language-service@2.4.31(typescript@6.0.3)': + dependencies: + '@volar/language-core': 2.4.31 + vscode-languageserver-protocol: 3.18.5 + vscode-languageserver-textdocument: 1.0.16 + vscode-uri: 3.2.0 + optionalDependencies: + typescript: 6.0.3 + + '@volar/source-map@2.4.31': {} + + '@volar/typescript@2.4.31(typescript@6.0.3)': + dependencies: + '@volar/language-core': 2.4.31 + '@volar/language-service': 2.4.31(typescript@6.0.3) + path-browserify: 1.0.1 + vscode-uri: 3.2.0 + optionalDependencies: + typescript: 6.0.3 + + '@vscode/emmet-helper@2.11.0': + dependencies: + emmet: 2.4.11 + jsonc-parser: 2.3.1 + vscode-languageserver-textdocument: 1.0.16 + vscode-languageserver-types: 3.18.5 + vscode-uri: 3.2.0 - '@workflow/serde@4.1.0-beta.2': + '@vscode/l10n@0.0.18': {} + + '@yuku-toolchain/darwin-arm64@0.28.1': + optional: true + + '@yuku-toolchain/darwin-x64@0.28.1': + optional: true + + '@yuku-toolchain/linux-arm64@0.28.1': + optional: true + + '@yuku-toolchain/linux-x64@0.28.1': + optional: true + + '@yuku-toolchain/win32-arm64@0.28.1': + optional: true + + '@yuku-toolchain/win32-x64@0.28.1': optional: true abort-controller@3.0.0: @@ -11564,13 +12202,13 @@ snapshots: dependencies: humanize-ms: 1.2.1 - agents@0.32.0(@ai-sdk/provider@4.0.35)(@ai-sdk/react@3.0.232(react@19.2.8)(zod@4.6.7))(@babel/core@7.29.13)(@babel/runtime@7.28.4)(@modelcontextprotocol/client@2.4.0)(@modelcontextprotocol/sdk@1.32.2(@cfworker/json-schema@4.1.1)(zod@4.6.7))(@modelcontextprotocol/server@2.4.0)(ai@6.0.64(zod@4.6.7))(chat@4.45.0(ai@6.0.64(zod@4.6.7))(zod@4.6.7))(react@19.2.8)(rolldown@1.2.14)(vite@6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))(zod@4.6.7): + agents@0.32.0(@ai-sdk/provider@4.0.35)(@ai-sdk/react@3.0.232(react@19.2.8)(zod@4.6.7))(@babel/core@7.29.13(supports-color@10.1.0))(@babel/runtime@7.28.4)(@modelcontextprotocol/client@2.4.0)(@modelcontextprotocol/sdk@1.32.2(@cfworker/json-schema@4.1.1)(supports-color@10.1.0)(zod@4.6.7))(@modelcontextprotocol/server@2.4.0)(ai@6.0.64(zod@4.6.7))(react@19.2.8)(rolldown@1.3.2)(vite@6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0))(zod@4.6.7): dependencies: - '@babel/plugin-proposal-decorators': 8.0.2(@babel/core@7.29.13) + '@babel/plugin-proposal-decorators': 8.0.2(@babel/core@7.29.13(supports-color@10.1.0)) '@cfworker/json-schema': 4.1.1 '@modelcontextprotocol/client': 2.4.0 '@opentelemetry/api': 1.9.1 - '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.13)(@babel/runtime@7.28.4)(rolldown@1.2.14)(vite@6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0)) + '@rolldown/plugin-babel': 0.2.3(@babel/core@7.29.13(supports-color@10.1.0))(@babel/runtime@7.28.4)(rolldown@1.3.2)(vite@6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0)) capnweb: 0.12.0 cron-schedule: 6.0.0 mimetext: 3.0.28 @@ -11582,12 +12220,11 @@ snapshots: optionalDependencies: '@ai-sdk/provider': 4.0.35 '@ai-sdk/react': 3.0.232(react@19.2.8)(zod@4.6.7) - '@modelcontextprotocol/sdk': 1.32.2(@cfworker/json-schema@4.1.1)(zod@4.6.7) + '@modelcontextprotocol/sdk': 1.32.2(@cfworker/json-schema@4.1.1)(supports-color@10.1.0)(zod@4.6.7) '@modelcontextprotocol/server': 2.4.0 ai: 6.0.64(zod@4.6.7) - chat: 4.45.0(ai@6.0.64(zod@4.6.7))(zod@4.6.7) react: 19.2.8 - vite: 6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0) + vite: 6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0) transitivePeerDependencies: - '@babel/core' - '@babel/plugin-transform-runtime' @@ -11618,10 +12255,18 @@ snapshots: '@opentelemetry/api': 1.9.0 zod: 4.6.7 - ajv-formats@3.0.1(ajv@8.20.0): + ajv-draft-04@1.0.0(ajv@8.20.0): optionalDependencies: ajv: 8.20.0 + ajv-formats@3.0.1: + dependencies: + ajv: 8.20.0 + + ajv-i18n@4.2.0(ajv@8.20.0): + dependencies: + ajv: 8.20.0 + ajv@8.20.0: dependencies: fast-deep-equal: 3.1.3 @@ -11649,10 +12294,6 @@ snapshots: ansi-styles@6.2.3: {} - ansis@4.1.0: {} - - ansis@4.3.1: {} - any-promise@1.3.0: {} anymatch@3.1.3: @@ -11676,15 +12317,12 @@ snapshots: array-iterate@2.0.1: {} + artichokie@0.4.5: {} + asciinema-player@3.18.1: dependencies: solid-js: 1.9.19 - ast-kit@2.1.1: - dependencies: - '@babel/parser': 7.29.8 - pathe: 2.0.3 - ast-v8-to-istanbul@1.0.7: dependencies: '@jridgewell/trace-mapping': 0.3.31 @@ -11693,20 +12331,20 @@ snapshots: astring@1.9.0: {} - astro-expressive-code@0.44.2(astro@7.4.11(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)): + astro-expressive-code@0.44.2(astro@7.4.11(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)): dependencies: - astro: 7.4.11(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) + astro: 7.4.11(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) rehype-expressive-code: 0.44.2 url-extras: 0.1.0 - astro@7.4.11(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1): + astro@7.4.11(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1): dependencies: '@astrojs/compiler-rs': 0.5.3 '@astrojs/internal-helpers': 0.13.2 '@astrojs/markdown-satteri': 0.4.9 '@astrojs/runtime': 0.1.1 '@astrojs/telemetry': 3.4.2 - '@astrojs/vite-plugin-astro': 0.1.2(vite@8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + '@astrojs/vite-plugin-astro': 0.1.2(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) '@capsizecss/unpack': 4.0.1 '@clack/prompts': 1.8.1 '@oslojs/encoding': 1.1.0 @@ -11749,12 +12387,12 @@ snapshots: unifont: 1.0.3 unstorage: 1.17.6 verkit: 0.5.0 - vite: 8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) - vitefu: 1.1.3(vite@8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + vite: 8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) + vitefu: 1.1.3(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) xxhash-wasm: 1.1.0 zod: 4.6.7 optionalDependencies: - sharp: 0.35.5(@types/node@24.13.5) + sharp: 0.35.5(@types/node@22.20.3) transitivePeerDependencies: - '@azure/app-configuration' - '@azure/cosmos' @@ -11851,15 +12489,13 @@ snapshots: binpunch@1.0.0: {} - birpc@2.4.0: {} - blake3-wasm@2.1.5: {} - body-parser@2.4.0: + body-parser@2.4.0(supports-color@10.1.0): dependencies: bytes: 3.1.2 content-type: 2.1.0 - debug: 4.4.3 + debug: 4.4.3(supports-color@10.1.0) http-errors: 2.0.1 iconv-lite: 0.7.3 on-finished: 2.4.1 @@ -11875,10 +12511,6 @@ snapshots: dependencies: balanced-match: 4.0.4 - braces@3.0.3: - dependencies: - fill-range: 7.1.1 - browserslist@4.29.5: dependencies: baseline-browser-mapping: 2.11.37 @@ -11893,7 +12525,7 @@ snapshots: bytes@3.1.2: {} - cac@6.7.14: {} + cac@7.1.0: {} call-bind-apply-helpers@1.0.2: dependencies: @@ -11932,27 +12564,6 @@ snapshots: character-reference-invalid@2.0.1: {} - chat@4.45.0(ai@6.0.64(zod@4.6.7))(zod@4.6.7): - dependencies: - '@chat-adapter/catalog': 4.45.0 - '@workflow/serde': 4.1.0-beta.2 - mdast-util-to-string: 4.0.0 - remark-gfm: 4.0.1 - remark-parse: 11.0.0 - remark-stringify: 11.0.0 - remend: 1.3.1 - unified: 11.0.5 - optionalDependencies: - ai: 6.0.64(zod@4.6.7) - zod: 4.6.7 - transitivePeerDependencies: - - supports-color - optional: true - - chokidar@4.0.3: - dependencies: - readdirp: 4.1.2 - chokidar@5.0.0: dependencies: readdirp: 5.1.1 @@ -11980,10 +12591,10 @@ snapshots: parse5-htmlparser2-tree-adapter: 6.0.1 yargs: 16.2.2 - cli-truncate@4.0.0: + cli-truncate@5.2.0: dependencies: - slice-ansi: 5.0.0 - string-width: 7.2.0 + slice-ansi: 8.0.0 + string-width: 8.2.2 cli-width@4.1.0: {} @@ -11999,6 +12610,12 @@ snapshots: strip-ansi: 6.0.1 wrap-ansi: 7.0.0 + cliui@9.0.1: + dependencies: + string-width: 7.2.0 + strip-ansi: 7.1.2 + wrap-ansi: 9.0.2 + clsx@2.1.1: {} cmdk@1.1.1(@types/react-dom@19.3.0(@types/react@19.3.0))(@types/react@19.3.0)(react-dom@19.2.8(react@19.2.8))(react@19.2.8): @@ -12031,8 +12648,6 @@ snapshots: commander@11.1.0: {} - commander@13.1.0: {} - commander@14.0.0: {} commander@14.0.3: {} @@ -12059,6 +12674,8 @@ snapshots: cookie@1.0.2: {} + cookie@1.1.1: {} + cookie@2.0.2: {} core-js-pure@3.43.0: {} @@ -12136,13 +12753,11 @@ snapshots: transitivePeerDependencies: - '@noble/hashes' - debug@4.4.1: - dependencies: - ms: 2.1.3 - - debug@4.4.3: + debug@4.4.3(supports-color@10.1.0): dependencies: ms: 2.1.3 + optionalDependencies: + supports-color: 10.1.0 decimal.js@10.6.0: {} @@ -12179,8 +12794,6 @@ snapshots: dependencies: dequal: 2.0.3 - diff@8.0.4: {} - diff@9.0.0: {} direction@2.0.1: {} @@ -12220,7 +12833,7 @@ snapshots: dset@3.1.4: {} - dts-resolver@2.1.1: {} + dts-resolver@3.0.0: {} dunder-proto@1.0.1: dependencies: @@ -12232,11 +12845,16 @@ snapshots: electron-to-chromium@1.5.486: {} + emmet@2.4.11: + dependencies: + '@emmetio/abbreviation': 2.3.3 + '@emmetio/css-abbreviation': 2.1.8 + emoji-regex@10.4.0: {} emoji-regex@8.0.0: {} - empathic@2.0.0: {} + empathic@2.1.0: {} encodeurl@2.0.0: {} @@ -12444,42 +13062,30 @@ snapshots: dependencies: eventsource-parser: 3.1.1 - execa@8.0.1: - dependencies: - cross-spawn: 7.0.6 - get-stream: 8.0.1 - human-signals: 5.0.0 - is-stream: 3.0.0 - merge-stream: 2.0.0 - npm-run-path: 5.3.0 - onetime: 6.0.0 - signal-exit: 4.1.0 - strip-final-newline: 3.0.0 - expect-type@1.4.0: {} - express-rate-limit@8.7.1(express@5.3.0): + express-rate-limit@8.7.1(express@5.3.0(supports-color@10.1.0))(supports-color@10.1.0): dependencies: - debug: 4.4.3 - express: 5.3.0 + debug: 4.4.3(supports-color@10.1.0) + express: 5.3.0(supports-color@10.1.0) ip-address: 10.7.4 transitivePeerDependencies: - supports-color - express@5.3.0: + express@5.3.0(supports-color@10.1.0): dependencies: accepts: 2.0.0 - body-parser: 2.4.0 + body-parser: 2.4.0(supports-color@10.1.0) content-disposition: 2.0.1 content-type: 2.1.0 cookie: 0.7.2 cookie-signature: 1.2.2 - debug: 4.4.3 + debug: 4.4.3(supports-color@10.1.0) depd: 2.0.0 encodeurl: 2.0.0 escape-html: 1.0.3 etag: 1.8.1 - finalhandler: 2.1.1 + finalhandler: 2.1.1(supports-color@10.1.0) fresh: 2.0.0 http-errors: 2.0.1 merge-descriptors: 2.0.0 @@ -12490,9 +13096,9 @@ snapshots: proxy-addr: 2.0.8 qs: 6.16.1 range-parser: 1.3.0 - router: 2.2.0 - send: 1.2.1 - serve-static: 2.2.1 + router: 2.2.0(supports-color@10.1.0) + send: 1.2.1(supports-color@10.1.0) + serve-static: 2.2.1(supports-color@10.1.0) statuses: 2.0.2 type-is: 2.1.0 vary: 1.1.2 @@ -12543,13 +13149,9 @@ snapshots: fflate@0.8.3: {} - fill-range@7.1.1: - dependencies: - to-regex-range: 5.0.1 - - finalhandler@2.1.1: + finalhandler@2.1.1(supports-color@10.1.0): dependencies: - debug: 4.4.3 + debug: 4.4.3(supports-color@10.1.0) encodeurl: 2.0.0 escape-html: 1.0.3 on-finished: 2.4.1 @@ -12592,7 +13194,7 @@ snapshots: fossilize@0.10.1: dependencies: '@stricli/auto-complete': 1.3.0 - '@stricli/core': 1.2.8(patch_hash=cbf047581d38be04108d3921321c14a778272c24004da8110d4498d4f2a6b2e1) + '@stricli/core': 1.2.8(patch_hash=c1d70807ac8f612d2e942650da25753076478898ece26cbdef5af377bedcbadc) binpunch: 1.0.0 esbuild: 0.25.12 macho-unsign: 2.0.6 @@ -12618,8 +13220,6 @@ snapshots: get-caller-file@2.0.5: {} - get-east-asian-width@1.3.0: {} - get-east-asian-width@1.7.0: {} get-intrinsic@1.3.0: @@ -12642,12 +13242,6 @@ snapshots: dunder-proto: 1.0.1 es-object-atoms: 1.1.1 - get-stream@8.0.1: {} - - get-tsconfig@4.10.1: - dependencies: - resolve-pkg-maps: 1.0.0 - get-tsconfig@5.0.0-beta.6: dependencies: resolve-pkg-maps: 1.0.0 @@ -12795,7 +13389,7 @@ snapshots: unist-util-visit: 5.1.0 zwitch: 2.0.4 - hast-util-to-estree@3.1.3: + hast-util-to-estree@3.1.3(supports-color@10.1.0): dependencies: '@types/estree': 1.0.9 '@types/estree-jsx': 1.0.5 @@ -12805,9 +13399,9 @@ snapshots: estree-util-attach-comments: 3.0.0 estree-util-is-identifier-name: 3.0.0 hast-util-whitespace: 3.0.0 - mdast-util-mdx-expression: 2.0.1 - mdast-util-mdx-jsx: 3.2.0 - mdast-util-mdxjs-esm: 2.0.1 + mdast-util-mdx-expression: 2.0.1(supports-color@10.1.0) + mdast-util-mdx-jsx: 3.2.0(supports-color@10.1.0) + mdast-util-mdxjs-esm: 2.0.1(supports-color@10.1.0) property-information: 7.1.0 space-separated-tokens: 2.0.2 style-to-js: 1.1.17 @@ -12844,7 +13438,7 @@ snapshots: stringify-entities: 4.0.4 zwitch: 2.0.4 - hast-util-to-jsx-runtime@2.3.6: + hast-util-to-jsx-runtime@2.3.6(supports-color@10.1.0): dependencies: '@types/estree': 1.0.8 '@types/hast': 3.0.5 @@ -12853,9 +13447,9 @@ snapshots: devlop: 1.1.0 estree-util-is-identifier-name: 3.0.0 hast-util-whitespace: 3.0.0 - mdast-util-mdx-expression: 2.0.1 - mdast-util-mdx-jsx: 3.2.0 - mdast-util-mdxjs-esm: 2.0.1 + mdast-util-mdx-expression: 2.0.1(supports-color@10.1.0) + mdast-util-mdx-jsx: 3.2.0(supports-color@10.1.0) + mdast-util-mdxjs-esm: 2.0.1(supports-color@10.1.0) property-information: 7.1.0 space-separated-tokens: 2.0.2 style-to-js: 1.1.17 @@ -12897,7 +13491,10 @@ snapshots: property-information: 7.1.0 space-separated-tokens: 2.0.2 - headers-polyfill@4.0.3: {} + headers-polyfill@5.0.1: + dependencies: + '@types/set-cookie-parser': 2.4.10 + set-cookie-parser: 3.2.3 highlight.js@10.7.3: {} @@ -12907,7 +13504,7 @@ snapshots: hono@4.13.18: {} - hookable@5.5.3: {} + hookable@6.1.2: {} html-encoding-sniffer@6.0.0: dependencies: @@ -12935,29 +13532,27 @@ snapshots: statuses: 2.0.2 toidentifier: 1.0.1 - http-proxy-agent@7.0.2: + http-proxy-agent@7.0.2(supports-color@10.1.0): dependencies: agent-base: 7.1.4 - debug: 4.4.3 + debug: 4.4.3(supports-color@10.1.0) transitivePeerDependencies: - supports-color - https-proxy-agent@7.0.6: + https-proxy-agent@7.0.6(supports-color@10.1.0): dependencies: agent-base: 7.1.4 - debug: 4.4.3 + debug: 4.4.3(supports-color@10.1.0) transitivePeerDependencies: - supports-color - human-signals@5.0.0: {} - humanize-ms@1.2.1: dependencies: ms: 2.1.3 - i18next@26.4.2(typescript@5.9.3): + i18next@26.4.2(typescript@6.0.3): optionalDependencies: - typescript: 5.9.3 + typescript: 6.0.3 iconv-lite@0.7.3: dependencies: @@ -12970,6 +13565,8 @@ snapshots: parent-module: 1.0.1 resolve-from: 4.0.0 + import-without-cache@0.4.1: {} + inherits@2.0.4: {} inline-style-parser@0.2.4: {} @@ -13003,11 +13600,13 @@ snapshots: is-fullwidth-code-point@3.0.0: {} - is-fullwidth-code-point@4.0.0: {} - is-fullwidth-code-point@5.0.0: dependencies: - get-east-asian-width: 1.3.0 + get-east-asian-width: 1.7.0 + + is-fullwidth-code-point@5.1.0: + dependencies: + get-east-asian-width: 1.7.0 is-hexadecimal@2.0.1: {} @@ -13017,24 +13616,18 @@ snapshots: is-node-process@1.2.0: {} - is-number@7.0.0: {} - is-plain-obj@4.1.0: {} is-potential-custom-element-name@1.0.1: {} is-promise@4.0.0: {} - is-stream@3.0.0: {} - is-wsl@3.1.0: dependencies: is-inside-container: 1.0.0 isexe@2.0.0: {} - jiti@2.4.2: {} - jiti@2.7.0: {} jose@6.2.12: {} @@ -13051,7 +13644,7 @@ snapshots: dependencies: argparse: 2.0.1 - jsdom@28.1.0: + jsdom@28.1.0(supports-color@10.1.0): dependencies: '@acemir/cssom': 0.9.32 '@asamuzakjp/dom-selector': 6.8.1 @@ -13061,8 +13654,8 @@ snapshots: data-urls: 7.0.0 decimal.js: 10.6.0 html-encoding-sniffer: 6.0.0 - http-proxy-agent: 7.0.2 - https-proxy-agent: 7.0.6 + http-proxy-agent: 7.0.2(supports-color@10.1.0) + https-proxy-agent: 7.0.6(supports-color@10.1.0) is-potential-custom-element-name: 1.0.1 parse5: 8.0.1 saxes: 6.0.0 @@ -13090,6 +13683,8 @@ snapshots: json5@2.2.3: {} + jsonc-parser@2.3.1: {} + jsonc-parser@3.3.1: {} kleur@4.1.5: {} @@ -13194,28 +13789,20 @@ snapshots: lightningcss-win32-arm64-msvc: 1.33.0 lightningcss-win32-x64-msvc: 1.33.0 - lilconfig@3.1.3: {} - lines-and-columns@1.2.4: {} - lint-staged@15.5.2: + lint-staged@16.4.0: dependencies: - chalk: 5.4.1 - commander: 13.1.0 - debug: 4.4.1 - execa: 8.0.1 - lilconfig: 3.1.3 - listr2: 8.3.3 - micromatch: 4.0.8 - pidtree: 0.6.0 + commander: 14.0.3 + listr2: 9.0.5 + picomatch: 4.0.7 string-argv: 0.3.2 - yaml: 2.8.3 - transitivePeerDependencies: - - supports-color + tinyexec: 1.3.1 + yaml: 2.9.1 - listr2@8.3.3: + listr2@9.0.5: dependencies: - cli-truncate: 4.0.0 + cli-truncate: 5.2.0 colorette: 2.0.20 eventemitter3: 5.0.1 log-update: 6.1.0 @@ -13294,13 +13881,13 @@ snapshots: '@types/unist': 3.0.3 unist-util-visit: 5.1.0 - mdast-util-directive@3.1.0: + mdast-util-directive@3.1.0(supports-color@10.1.0): dependencies: '@types/mdast': 4.0.4 '@types/unist': 3.0.3 ccount: 2.0.1 devlop: 1.1.0 - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.2(supports-color@10.1.0) mdast-util-to-markdown: 2.1.2 parse-entities: 4.0.2 stringify-entities: 4.0.4 @@ -13315,14 +13902,14 @@ snapshots: unist-util-is: 6.0.0 unist-util-visit-parents: 6.0.2 - mdast-util-from-markdown@2.0.2: + mdast-util-from-markdown@2.0.2(supports-color@10.1.0): dependencies: '@types/mdast': 4.0.4 '@types/unist': 3.0.3 decode-named-character-reference: 1.2.0 devlop: 1.1.0 mdast-util-to-string: 4.0.0 - micromark: 4.0.2 + micromark: 4.0.2(supports-color@10.1.0) micromark-util-decode-numeric-character-reference: 2.0.2 micromark-util-decode-string: 2.0.1 micromark-util-normalize-identifier: 2.0.1 @@ -13340,67 +13927,67 @@ snapshots: mdast-util-find-and-replace: 3.0.2 micromark-util-character: 2.1.1 - mdast-util-gfm-footnote@2.1.0: + mdast-util-gfm-footnote@2.1.0(supports-color@10.1.0): dependencies: '@types/mdast': 4.0.4 devlop: 1.1.0 - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.2(supports-color@10.1.0) mdast-util-to-markdown: 2.1.2 micromark-util-normalize-identifier: 2.0.1 transitivePeerDependencies: - supports-color - mdast-util-gfm-strikethrough@2.0.0: + mdast-util-gfm-strikethrough@2.0.0(supports-color@10.1.0): dependencies: '@types/mdast': 4.0.4 - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.2(supports-color@10.1.0) mdast-util-to-markdown: 2.1.2 transitivePeerDependencies: - supports-color - mdast-util-gfm-table@2.0.0: + mdast-util-gfm-table@2.0.0(supports-color@10.1.0): dependencies: '@types/mdast': 4.0.4 devlop: 1.1.0 markdown-table: 3.0.4 - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.2(supports-color@10.1.0) mdast-util-to-markdown: 2.1.2 transitivePeerDependencies: - supports-color - mdast-util-gfm-task-list-item@2.0.0: + mdast-util-gfm-task-list-item@2.0.0(supports-color@10.1.0): dependencies: '@types/mdast': 4.0.4 devlop: 1.1.0 - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.2(supports-color@10.1.0) mdast-util-to-markdown: 2.1.2 transitivePeerDependencies: - supports-color - mdast-util-gfm@3.1.0: + mdast-util-gfm@3.1.0(supports-color@10.1.0): dependencies: - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.2(supports-color@10.1.0) mdast-util-gfm-autolink-literal: 2.0.1 - mdast-util-gfm-footnote: 2.1.0 - mdast-util-gfm-strikethrough: 2.0.0 - mdast-util-gfm-table: 2.0.0 - mdast-util-gfm-task-list-item: 2.0.0 + mdast-util-gfm-footnote: 2.1.0(supports-color@10.1.0) + mdast-util-gfm-strikethrough: 2.0.0(supports-color@10.1.0) + mdast-util-gfm-table: 2.0.0(supports-color@10.1.0) + mdast-util-gfm-task-list-item: 2.0.0(supports-color@10.1.0) mdast-util-to-markdown: 2.1.2 transitivePeerDependencies: - supports-color - mdast-util-mdx-expression@2.0.1: + mdast-util-mdx-expression@2.0.1(supports-color@10.1.0): dependencies: '@types/estree-jsx': 1.0.5 '@types/hast': 3.0.5 '@types/mdast': 4.0.4 devlop: 1.1.0 - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.2(supports-color@10.1.0) mdast-util-to-markdown: 2.1.2 transitivePeerDependencies: - supports-color - mdast-util-mdx-jsx@3.2.0: + mdast-util-mdx-jsx@3.2.0(supports-color@10.1.0): dependencies: '@types/estree-jsx': 1.0.5 '@types/hast': 3.0.5 @@ -13408,7 +13995,7 @@ snapshots: '@types/unist': 3.0.3 ccount: 2.0.1 devlop: 1.1.0 - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.2(supports-color@10.1.0) mdast-util-to-markdown: 2.1.2 parse-entities: 4.0.2 stringify-entities: 4.0.4 @@ -13417,23 +14004,23 @@ snapshots: transitivePeerDependencies: - supports-color - mdast-util-mdx@3.0.0: + mdast-util-mdx@3.0.0(supports-color@10.1.0): dependencies: - mdast-util-from-markdown: 2.0.2 - mdast-util-mdx-expression: 2.0.1 - mdast-util-mdx-jsx: 3.2.0 - mdast-util-mdxjs-esm: 2.0.1 + mdast-util-from-markdown: 2.0.2(supports-color@10.1.0) + mdast-util-mdx-expression: 2.0.1(supports-color@10.1.0) + mdast-util-mdx-jsx: 3.2.0(supports-color@10.1.0) + mdast-util-mdxjs-esm: 2.0.1(supports-color@10.1.0) mdast-util-to-markdown: 2.1.2 transitivePeerDependencies: - supports-color - mdast-util-mdxjs-esm@2.0.1: + mdast-util-mdxjs-esm@2.0.1(supports-color@10.1.0): dependencies: '@types/estree-jsx': 1.0.5 '@types/hast': 3.0.5 '@types/mdast': 4.0.4 devlop: 1.1.0 - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.2(supports-color@10.1.0) mdast-util-to-markdown: 2.1.2 transitivePeerDependencies: - supports-color @@ -13479,8 +14066,6 @@ snapshots: merge-descriptors@2.0.0: {} - merge-stream@2.0.0: {} - micromark-core-commonmark@2.0.3: dependencies: decode-named-character-reference: 1.2.0 @@ -13733,10 +14318,10 @@ snapshots: micromark-util-types@2.0.2: {} - micromark@4.0.2: + micromark@4.0.2(supports-color@10.1.0): dependencies: '@types/debug': 4.1.12 - debug: 4.4.3 + debug: 4.4.3(supports-color@10.1.0) decode-named-character-reference: 1.2.0 devlop: 1.1.0 micromark-core-commonmark: 2.0.3 @@ -13755,11 +14340,6 @@ snapshots: transitivePeerDependencies: - supports-color - micromatch@4.0.8: - dependencies: - braces: 3.0.3 - picomatch: 2.3.2 - mime-db@1.52.0: {} mime-db@1.54.0: {} @@ -13779,27 +14359,12 @@ snapshots: js-base64: 3.7.8 mime-types: 2.1.35 - mimic-fn@4.0.0: {} - mimic-function@5.0.1: {} - miniflare@5.20261101.0-beta(@types/node@22.20.1): - dependencies: - '@cspotcode/source-map-support': 0.8.1 - sharp: 0.35.5(@types/node@22.20.1) - undici: 7.30.1 - workerd: 1.20261101.1 - ws: 8.21.0 - youch: 4.1.0-beta.10 - transitivePeerDependencies: - - '@types/node' - - bufferutil - - utf-8-validate - - miniflare@5.20261101.0-beta(@types/node@24.13.5): + miniflare@5.20261101.0-beta(@types/node@22.20.3): dependencies: '@cspotcode/source-map-support': 0.8.1 - sharp: 0.35.5(@types/node@24.13.5) + sharp: 0.35.5(@types/node@22.20.3) undici: 7.30.1 workerd: 1.20261101.1 ws: 8.21.0 @@ -13824,110 +14389,60 @@ snapshots: ms@2.1.3: {} - msw@2.10.2(@types/node@22.16.0)(typescript@5.9.3): + msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2): dependencies: - '@bundled-es-modules/cookie': 2.0.1 - '@bundled-es-modules/statuses': 1.0.1 - '@bundled-es-modules/tough-cookie': 0.1.6 - '@inquirer/confirm': 5.1.21(@types/node@22.16.0) - '@mswjs/interceptors': 0.39.8 - '@open-draft/deferred-promise': 2.2.0 - '@open-draft/until': 2.1.0 - '@types/cookie': 0.6.0 + '@inquirer/confirm': 6.4.0(@types/node@22.20.3) + '@mswjs/interceptors': 0.41.9 + '@open-draft/deferred-promise': 3.0.0 '@types/statuses': 2.0.6 + cookie: 1.1.1 graphql: 16.14.2 - headers-polyfill: 4.0.3 - is-node-process: 1.2.0 - outvariant: 1.4.3 - path-to-regexp: 6.3.0 - picocolors: 1.1.1 - strict-event-emitter: 0.5.1 - type-fest: 4.41.0 - yargs: 17.7.3 - optionalDependencies: - typescript: 5.9.3 - transitivePeerDependencies: - - '@types/node' - optional: true - - msw@2.10.2(@types/node@22.20.1)(typescript@5.9.3): - dependencies: - '@bundled-es-modules/cookie': 2.0.1 - '@bundled-es-modules/statuses': 1.0.1 - '@bundled-es-modules/tough-cookie': 0.1.6 - '@inquirer/confirm': 5.1.21(@types/node@22.20.1) - '@mswjs/interceptors': 0.39.8 - '@open-draft/deferred-promise': 2.2.0 - '@open-draft/until': 2.1.0 - '@types/cookie': 0.6.0 - '@types/statuses': 2.0.6 - graphql: 16.14.2 - headers-polyfill: 4.0.3 + headers-polyfill: 5.0.1 is-node-process: 1.2.0 outvariant: 1.4.3 path-to-regexp: 6.3.0 picocolors: 1.1.1 + rettime: 0.11.12 + statuses: 2.0.2 strict-event-emitter: 0.5.1 - type-fest: 4.41.0 + tough-cookie: 6.0.2 + type-fest: 5.10.0 + until-async: 3.0.2 yargs: 17.7.3 optionalDependencies: - typescript: 5.9.3 + typescript: 7.0.2 transitivePeerDependencies: - '@types/node' - optional: true - msw@2.10.2(@types/node@22.20.3)(typescript@5.9.3): + msw@2.15.0(@types/node@24.13.5)(typescript@7.0.2): dependencies: - '@bundled-es-modules/cookie': 2.0.1 - '@bundled-es-modules/statuses': 1.0.1 - '@bundled-es-modules/tough-cookie': 0.1.6 - '@inquirer/confirm': 5.1.21(@types/node@22.20.3) - '@mswjs/interceptors': 0.39.8 - '@open-draft/deferred-promise': 2.2.0 - '@open-draft/until': 2.1.0 - '@types/cookie': 0.6.0 + '@inquirer/confirm': 6.4.0(@types/node@24.13.5) + '@mswjs/interceptors': 0.41.9 + '@open-draft/deferred-promise': 3.0.0 '@types/statuses': 2.0.6 + cookie: 1.1.1 graphql: 16.14.2 - headers-polyfill: 4.0.3 + headers-polyfill: 5.0.1 is-node-process: 1.2.0 outvariant: 1.4.3 path-to-regexp: 6.3.0 picocolors: 1.1.1 + rettime: 0.11.12 + statuses: 2.0.2 strict-event-emitter: 0.5.1 - type-fest: 4.41.0 + tough-cookie: 6.0.2 + type-fest: 5.10.0 + until-async: 3.0.2 yargs: 17.7.3 optionalDependencies: - typescript: 5.9.3 + typescript: 7.0.2 transitivePeerDependencies: - '@types/node' optional: true - msw@2.10.2(@types/node@24.13.5)(typescript@5.9.3): - dependencies: - '@bundled-es-modules/cookie': 2.0.1 - '@bundled-es-modules/statuses': 1.0.1 - '@bundled-es-modules/tough-cookie': 0.1.6 - '@inquirer/confirm': 5.1.21(@types/node@24.13.5) - '@mswjs/interceptors': 0.39.8 - '@open-draft/deferred-promise': 2.2.0 - '@open-draft/until': 2.1.0 - '@types/cookie': 0.6.0 - '@types/statuses': 2.0.6 - graphql: 16.14.2 - headers-polyfill: 4.0.3 - is-node-process: 1.2.0 - outvariant: 1.4.3 - path-to-regexp: 6.3.0 - picocolors: 1.1.1 - strict-event-emitter: 0.5.1 - type-fest: 4.41.0 - yargs: 17.7.3 - optionalDependencies: - typescript: 5.9.3 - transitivePeerDependencies: - - '@types/node' + muggle-string@0.4.1: {} - mute-stream@2.0.0: {} + mute-stream@4.0.0: {} mz@2.7.0: dependencies: @@ -13970,10 +14485,6 @@ snapshots: normalize-path@3.0.0: {} - npm-run-path@5.3.0: - dependencies: - path-key: 4.0.0 - nth-check@2.1.1: dependencies: boolbase: 1.0.0 @@ -14008,10 +14519,6 @@ snapshots: dependencies: wrappy: 1.0.2 - onetime@6.0.0: - dependencies: - mimic-fn: 4.0.0 - onetime@7.0.0: dependencies: mimic-function: 5.0.1 @@ -14057,61 +14564,62 @@ snapshots: '@oxc-parser/binding-win32-ia32-msvc': 0.152.0 '@oxc-parser/binding-win32-x64-msvc': 0.152.0 - oxfmt@0.72.0: + oxfmt@0.78.0(@astrojs/compiler-rs@0.5.3): dependencies: tinypool: 2.2.0 optionalDependencies: - '@oxfmt/binding-android-arm-eabi': 0.72.0 - '@oxfmt/binding-android-arm64': 0.72.0 - '@oxfmt/binding-darwin-arm64': 0.72.0 - '@oxfmt/binding-darwin-x64': 0.72.0 - '@oxfmt/binding-freebsd-x64': 0.72.0 - '@oxfmt/binding-linux-arm-gnueabihf': 0.72.0 - '@oxfmt/binding-linux-arm-musleabihf': 0.72.0 - '@oxfmt/binding-linux-arm64-gnu': 0.72.0 - '@oxfmt/binding-linux-arm64-musl': 0.72.0 - '@oxfmt/binding-linux-ppc64-gnu': 0.72.0 - '@oxfmt/binding-linux-riscv64-gnu': 0.72.0 - '@oxfmt/binding-linux-riscv64-musl': 0.72.0 - '@oxfmt/binding-linux-s390x-gnu': 0.72.0 - '@oxfmt/binding-linux-x64-gnu': 0.72.0 - '@oxfmt/binding-linux-x64-musl': 0.72.0 - '@oxfmt/binding-openharmony-arm64': 0.72.0 - '@oxfmt/binding-win32-arm64-msvc': 0.72.0 - '@oxfmt/binding-win32-ia32-msvc': 0.72.0 - '@oxfmt/binding-win32-x64-msvc': 0.72.0 - - oxlint-tsgolint@7.0.2004: - optionalDependencies: - '@oxlint-tsgolint/darwin-arm64': 7.0.2004 - '@oxlint-tsgolint/darwin-x64': 7.0.2004 - '@oxlint-tsgolint/linux-arm64': 7.0.2004 - '@oxlint-tsgolint/linux-x64': 7.0.2004 - '@oxlint-tsgolint/win32-arm64': 7.0.2004 - '@oxlint-tsgolint/win32-x64': 7.0.2004 - - oxlint@1.87.0(oxlint-tsgolint@7.0.2004): - optionalDependencies: - '@oxlint/binding-android-arm-eabi': 1.87.0 - '@oxlint/binding-android-arm64': 1.87.0 - '@oxlint/binding-darwin-arm64': 1.87.0 - '@oxlint/binding-darwin-x64': 1.87.0 - '@oxlint/binding-freebsd-x64': 1.87.0 - '@oxlint/binding-linux-arm-gnueabihf': 1.87.0 - '@oxlint/binding-linux-arm-musleabihf': 1.87.0 - '@oxlint/binding-linux-arm64-gnu': 1.87.0 - '@oxlint/binding-linux-arm64-musl': 1.87.0 - '@oxlint/binding-linux-ppc64-gnu': 1.87.0 - '@oxlint/binding-linux-riscv64-gnu': 1.87.0 - '@oxlint/binding-linux-riscv64-musl': 1.87.0 - '@oxlint/binding-linux-s390x-gnu': 1.87.0 - '@oxlint/binding-linux-x64-gnu': 1.87.0 - '@oxlint/binding-linux-x64-musl': 1.87.0 - '@oxlint/binding-openharmony-arm64': 1.87.0 - '@oxlint/binding-win32-arm64-msvc': 1.87.0 - '@oxlint/binding-win32-ia32-msvc': 1.87.0 - '@oxlint/binding-win32-x64-msvc': 1.87.0 - oxlint-tsgolint: 7.0.2004 + '@astrojs/compiler-rs': 0.5.3 + '@oxfmt/binding-android-arm-eabi': 0.78.0 + '@oxfmt/binding-android-arm64': 0.78.0 + '@oxfmt/binding-darwin-arm64': 0.78.0 + '@oxfmt/binding-darwin-x64': 0.78.0 + '@oxfmt/binding-freebsd-x64': 0.78.0 + '@oxfmt/binding-linux-arm-gnueabihf': 0.78.0 + '@oxfmt/binding-linux-arm-musleabihf': 0.78.0 + '@oxfmt/binding-linux-arm64-gnu': 0.78.0 + '@oxfmt/binding-linux-arm64-musl': 0.78.0 + '@oxfmt/binding-linux-ppc64-gnu': 0.78.0 + '@oxfmt/binding-linux-riscv64-gnu': 0.78.0 + '@oxfmt/binding-linux-riscv64-musl': 0.78.0 + '@oxfmt/binding-linux-s390x-gnu': 0.78.0 + '@oxfmt/binding-linux-x64-gnu': 0.78.0 + '@oxfmt/binding-linux-x64-musl': 0.78.0 + '@oxfmt/binding-openharmony-arm64': 0.78.0 + '@oxfmt/binding-win32-arm64-msvc': 0.78.0 + '@oxfmt/binding-win32-ia32-msvc': 0.78.0 + '@oxfmt/binding-win32-x64-msvc': 0.78.0 + + oxlint-tsgolint@7.0.2007: + optionalDependencies: + '@oxlint-tsgolint/darwin-arm64': 7.0.2007 + '@oxlint-tsgolint/darwin-x64': 7.0.2007 + '@oxlint-tsgolint/linux-arm64': 7.0.2007 + '@oxlint-tsgolint/linux-x64': 7.0.2007 + '@oxlint-tsgolint/win32-arm64': 7.0.2007 + '@oxlint-tsgolint/win32-x64': 7.0.2007 + + oxlint@1.93.0(oxlint-tsgolint@7.0.2007): + optionalDependencies: + '@oxlint/binding-android-arm-eabi': 1.93.0 + '@oxlint/binding-android-arm64': 1.93.0 + '@oxlint/binding-darwin-arm64': 1.93.0 + '@oxlint/binding-darwin-x64': 1.93.0 + '@oxlint/binding-freebsd-x64': 1.93.0 + '@oxlint/binding-linux-arm-gnueabihf': 1.93.0 + '@oxlint/binding-linux-arm-musleabihf': 1.93.0 + '@oxlint/binding-linux-arm64-gnu': 1.93.0 + '@oxlint/binding-linux-arm64-musl': 1.93.0 + '@oxlint/binding-linux-ppc64-gnu': 1.93.0 + '@oxlint/binding-linux-riscv64-gnu': 1.93.0 + '@oxlint/binding-linux-riscv64-musl': 1.93.0 + '@oxlint/binding-linux-s390x-gnu': 1.93.0 + '@oxlint/binding-linux-x64-gnu': 1.93.0 + '@oxlint/binding-linux-x64-musl': 1.93.0 + '@oxlint/binding-openharmony-arm64': 1.93.0 + '@oxlint/binding-win32-arm64-msvc': 1.93.0 + '@oxlint/binding-win32-ia32-msvc': 1.93.0 + '@oxlint/binding-win32-x64-msvc': 1.93.0 + oxlint-tsgolint: 7.0.2007 p-limit@6.2.0: dependencies: @@ -14195,9 +14703,9 @@ snapshots: optionalDependencies: react: 19.2.8 - path-key@3.1.1: {} + path-browserify@1.0.1: {} - path-key@4.0.0: {} + path-key@3.1.1: {} path-parse@1.0.7: {} @@ -14232,8 +14740,6 @@ snapshots: picomatch@4.0.7: {} - pidtree@0.6.0: {} - pixelmatch@7.2.0: dependencies: pngjs: 7.0.0 @@ -14273,6 +14779,8 @@ snapshots: dependencies: commander: 9.5.0 + prettier@3.10.1: {} + pretty-format@27.5.1: dependencies: ansi-regex: 5.0.1 @@ -14300,10 +14808,6 @@ snapshots: forwarded: 0.2.0 ipaddr.js: 1.9.1 - psl@1.15.0: - dependencies: - punycode: 2.3.1 - punycode@2.3.1: {} pure-rand@8.4.2: {} @@ -14315,9 +14819,7 @@ snapshots: es-define-property: 1.0.1 side-channel: 1.1.1 - quansync@0.2.10: {} - - querystringify@2.2.0: {} + quansync@1.0.0: {} radix3@1.1.2: {} @@ -14345,17 +14847,17 @@ snapshots: react-is@17.0.2: {} - react-markdown@9.1.0(@types/react@19.1.8)(react@19.2.8): + react-markdown@9.1.0(@types/react@19.1.8)(react@19.2.8)(supports-color@10.1.0): dependencies: '@types/hast': 3.0.4 '@types/mdast': 4.0.4 '@types/react': 19.1.8 devlop: 1.1.0 - hast-util-to-jsx-runtime: 2.3.6 + hast-util-to-jsx-runtime: 2.3.6(supports-color@10.1.0) html-url-attributes: 3.0.1 mdast-util-to-hast: 13.2.2 react: 19.2.8 - remark-parse: 11.0.0 + remark-parse: 11.0.0(supports-color@10.1.0) remark-rehype: 11.1.2 unified: 11.0.5 unist-util-visit: 5.0.0 @@ -14406,10 +14908,10 @@ snapshots: optionalDependencies: react-dom: 19.2.8(react@19.2.8) - react-scroll-to-bottom@4.2.0(@babel/core@7.29.13)(react@19.2.8): + react-scroll-to-bottom@4.2.0(@babel/core@7.29.13(supports-color@10.1.0))(react@19.2.8)(supports-color@10.1.0): dependencies: '@babel/runtime-corejs3': 7.28.0 - '@emotion/css': 11.1.3(@babel/core@7.29.13) + '@emotion/css': 11.1.3(@babel/core@7.29.13(supports-color@10.1.0))(supports-color@10.1.0) classnames: 2.3.1 core-js: 3.18.3 math-random: 2.0.1 @@ -14430,8 +14932,6 @@ snapshots: react@19.2.8: {} - readdirp@4.1.2: {} - readdirp@5.1.1: {} recma-build-jsx@1.0.0: @@ -14494,11 +14994,11 @@ snapshots: hast-util-raw: 9.1.0 vfile: 6.0.3 - rehype-recma@1.0.0: + rehype-recma@1.0.0(supports-color@10.1.0): dependencies: '@types/estree': 1.0.9 '@types/hast': 3.0.5 - hast-util-to-estree: 3.1.3 + hast-util-to-estree: 3.1.3(supports-color@10.1.0) transitivePeerDependencies: - supports-color @@ -14515,37 +15015,37 @@ snapshots: rehype-stringify: 10.0.1 unified: 11.0.5 - remark-directive@4.0.0: + remark-directive@4.0.0(supports-color@10.1.0): dependencies: '@types/mdast': 4.0.4 - mdast-util-directive: 3.1.0 + mdast-util-directive: 3.1.0(supports-color@10.1.0) micromark-extension-directive: 4.0.0 unified: 11.0.5 transitivePeerDependencies: - supports-color - remark-gfm@4.0.1: + remark-gfm@4.0.1(supports-color@10.1.0): dependencies: '@types/mdast': 4.0.4 - mdast-util-gfm: 3.1.0 + mdast-util-gfm: 3.1.0(supports-color@10.1.0) micromark-extension-gfm: 3.0.0 - remark-parse: 11.0.0 + remark-parse: 11.0.0(supports-color@10.1.0) remark-stringify: 11.0.0 unified: 11.0.5 transitivePeerDependencies: - supports-color - remark-mdx@3.1.1: + remark-mdx@3.1.1(supports-color@10.1.0): dependencies: - mdast-util-mdx: 3.0.0 + mdast-util-mdx: 3.0.0(supports-color@10.1.0) micromark-extension-mdxjs: 3.0.0 transitivePeerDependencies: - supports-color - remark-parse@11.0.0: + remark-parse@11.0.0(supports-color@10.1.0): dependencies: '@types/mdast': 4.0.4 - mdast-util-from-markdown: 2.0.2 + mdast-util-from-markdown: 2.0.2(supports-color@10.1.0) micromark-util-types: 2.0.2 unified: 11.0.5 transitivePeerDependencies: @@ -14572,15 +15072,14 @@ snapshots: mdast-util-to-markdown: 2.1.2 unified: 11.0.5 - remend@1.3.1: - optional: true + request-light@0.5.8: {} + + request-light@0.7.0: {} require-directory@2.1.1: {} require-from-string@2.0.2: {} - requires-port@1.0.0: {} - resolve-from@4.0.0: {} resolve-pkg-maps@1.0.0: {} @@ -14621,44 +15120,22 @@ snapshots: retext-stringify: 4.0.0 unified: 11.0.5 + rettime@0.11.12: {} + rfdc@1.4.1: {} - rolldown-plugin-dts@0.13.13(rolldown@1.0.0-beta.23)(typescript@5.9.3): + rolldown-plugin-dts@0.30.2(rolldown@1.3.2)(typescript@7.0.2): dependencies: - '@babel/generator': 7.28.0 - '@babel/parser': 7.28.0 - '@babel/types': 7.28.0 - ast-kit: 2.1.1 - birpc: 2.4.0 - debug: 4.4.3 - dts-resolver: 2.1.1 - get-tsconfig: 4.10.1 - rolldown: 1.0.0-beta.23 - optionalDependencies: - typescript: 5.9.3 + dts-resolver: 3.0.0 + get-tsconfig: 5.0.0-beta.6 + obug: 3.0.0 + rolldown: 1.3.2 + yuku: 0.28.1 + optionalDependencies: + typescript: 7.0.2 transitivePeerDependencies: + - '@yuku-toolchain/wasm' - oxc-resolver - - supports-color - - rolldown@1.0.0-beta.23: - dependencies: - '@oxc-project/runtime': 0.75.0 - '@oxc-project/types': 0.75.0 - '@rolldown/pluginutils': 1.0.0-beta.23 - ansis: 4.3.1 - optionalDependencies: - '@rolldown/binding-darwin-arm64': 1.0.0-beta.23 - '@rolldown/binding-darwin-x64': 1.0.0-beta.23 - '@rolldown/binding-freebsd-x64': 1.0.0-beta.23 - '@rolldown/binding-linux-arm-gnueabihf': 1.0.0-beta.23 - '@rolldown/binding-linux-arm64-gnu': 1.0.0-beta.23 - '@rolldown/binding-linux-arm64-musl': 1.0.0-beta.23 - '@rolldown/binding-linux-x64-gnu': 1.0.0-beta.23 - '@rolldown/binding-linux-x64-musl': 1.0.0-beta.23 - '@rolldown/binding-wasm32-wasi': 1.0.0-beta.23 - '@rolldown/binding-win32-arm64-msvc': 1.0.0-beta.23 - '@rolldown/binding-win32-ia32-msvc': 1.0.0-beta.23 - '@rolldown/binding-win32-x64-msvc': 1.0.0-beta.23 rolldown@1.2.14: dependencies: @@ -14703,6 +15180,28 @@ snapshots: '@rolldown/binding-win32-arm64-msvc': 1.2.19 '@rolldown/binding-win32-x64-msvc': 1.2.19 + rolldown@1.3.2: + dependencies: + '@oxc-project/types': 0.158.0 + '@rolldown/pluginutils': 1.0.1 + optionalDependencies: + '@rolldown/binding-android-arm-eabi': 1.3.2 + '@rolldown/binding-android-arm64': 1.3.2 + '@rolldown/binding-darwin-arm64': 1.3.2 + '@rolldown/binding-darwin-x64': 1.3.2 + '@rolldown/binding-freebsd-x64': 1.3.2 + '@rolldown/binding-linux-arm-gnueabihf': 1.3.2 + '@rolldown/binding-linux-arm64-gnu': 1.3.2 + '@rolldown/binding-linux-arm64-musl': 1.3.2 + '@rolldown/binding-linux-ppc64-gnu': 1.3.2 + '@rolldown/binding-linux-s390x-gnu': 1.3.2 + '@rolldown/binding-linux-x64-gnu': 1.3.2 + '@rolldown/binding-linux-x64-musl': 1.3.2 + '@rolldown/binding-openharmony-arm64': 1.3.2 + '@rolldown/binding-wasm32-wasi': 1.3.2 + '@rolldown/binding-win32-arm64-msvc': 1.3.2 + '@rolldown/binding-win32-x64-msvc': 1.3.2 + rollup@4.62.4: dependencies: '@types/estree': 1.0.9 @@ -14735,9 +15234,9 @@ snapshots: '@rollup/rollup-win32-x64-msvc': 4.62.4 fsevents: 2.3.3 - router@2.2.0: + router@2.2.0(supports-color@10.1.0): dependencies: - debug: 4.4.3 + debug: 4.4.3(supports-color@10.1.0) depd: 2.0.0 is-promise: 4.0.0 parseurl: 1.3.3 @@ -14816,9 +15315,9 @@ snapshots: semver@7.8.5: {} - send@1.2.1: + send@1.2.1(supports-color@10.1.0): dependencies: - debug: 4.4.3 + debug: 4.4.3(supports-color@10.1.0) encodeurl: 2.0.0 escape-html: 1.0.3 etag: 1.8.1 @@ -14840,53 +15339,22 @@ snapshots: seroval@1.8.1: {} - serve-static@2.2.1: + serve-static@2.2.1(supports-color@10.1.0): dependencies: encodeurl: 2.0.0 escape-html: 1.0.3 parseurl: 1.3.3 - send: 1.2.1 + send: 1.2.1(supports-color@10.1.0) transitivePeerDependencies: - supports-color set-cookie-parser@2.7.2: {} - setprototypeof@1.2.0: {} + set-cookie-parser@3.2.3: {} - sharp@0.35.5(@types/node@22.20.1): - dependencies: - '@img/colour': 1.1.0 - detect-libc: 2.1.2 - semver: 7.8.5 - optionalDependencies: - '@img/sharp-darwin-arm64': 0.35.5 - '@img/sharp-darwin-x64': 0.35.5 - '@img/sharp-freebsd-wasm32': 0.35.5 - '@img/sharp-libvips-darwin-arm64': 1.3.4 - '@img/sharp-libvips-darwin-x64': 1.3.4 - '@img/sharp-libvips-linux-arm': 1.3.4 - '@img/sharp-libvips-linux-arm64': 1.3.4 - '@img/sharp-libvips-linux-ppc64': 1.3.4 - '@img/sharp-libvips-linux-riscv64': 1.3.4 - '@img/sharp-libvips-linux-s390x': 1.3.4 - '@img/sharp-libvips-linux-x64': 1.3.4 - '@img/sharp-libvips-linuxmusl-arm64': 1.3.4 - '@img/sharp-libvips-linuxmusl-x64': 1.3.4 - '@img/sharp-linux-arm': 0.35.5 - '@img/sharp-linux-arm64': 0.35.5 - '@img/sharp-linux-ppc64': 0.35.5 - '@img/sharp-linux-riscv64': 0.35.5 - '@img/sharp-linux-s390x': 0.35.5 - '@img/sharp-linux-x64': 0.35.5 - '@img/sharp-linuxmusl-arm64': 0.35.5 - '@img/sharp-linuxmusl-x64': 0.35.5 - '@img/sharp-webcontainers-wasm32': 0.35.5 - '@img/sharp-win32-arm64': 0.35.5 - '@img/sharp-win32-ia32': 0.35.5 - '@img/sharp-win32-x64': 0.35.5 - '@types/node': 22.20.1 + setprototypeof@1.2.0: {} - sharp@0.35.5(@types/node@24.13.5): + sharp@0.35.5(@types/node@22.20.3): dependencies: '@img/colour': 1.1.0 detect-libc: 2.1.2 @@ -14917,7 +15385,7 @@ snapshots: '@img/sharp-win32-arm64': 0.35.5 '@img/sharp-win32-ia32': 0.35.5 '@img/sharp-win32-x64': 0.35.5 - '@types/node': 24.13.5 + '@types/node': 22.20.3 shebang-command@2.0.0: dependencies: @@ -14990,7 +15458,7 @@ snapshots: signal-exit@4.1.0: {} - simple-git-hooks@2.13.1: {} + simple-git-hooks@2.14.0: {} simple-update-in@2.2.0: {} @@ -15003,15 +15471,15 @@ snapshots: arg: 5.0.2 sax: 1.6.1 - slice-ansi@5.0.0: + slice-ansi@7.1.0: dependencies: ansi-styles: 6.2.3 - is-fullwidth-code-point: 4.0.0 + is-fullwidth-code-point: 5.0.0 - slice-ansi@7.1.0: + slice-ansi@8.0.0: dependencies: ansi-styles: 6.2.3 - is-fullwidth-code-point: 5.0.0 + is-fullwidth-code-point: 5.1.0 smol-toml@1.9.1: {} @@ -15057,7 +15525,7 @@ snapshots: string-width@7.2.0: dependencies: emoji-regex: 10.4.0 - get-east-asian-width: 1.3.0 + get-east-asian-width: 1.7.0 strip-ansi: 7.1.2 string-width@8.2.2: @@ -15078,8 +15546,6 @@ snapshots: dependencies: ansi-regex: 6.2.2 - strip-final-newline@3.0.0: {} - style-to-js@1.1.17: dependencies: style-to-object: 1.0.9 @@ -15116,6 +15582,8 @@ snapshots: symbol-tree@3.2.4: {} + tagged-tag@1.0.0: {} + tailwind-merge@3.3.1: {} tailwind-merge@3.7.0: {} @@ -15166,15 +15634,8 @@ snapshots: tinyclip@1.0.3: {} - tinyexec@1.0.4: {} - tinyexec@1.3.1: {} - tinyglobby@0.2.15: - dependencies: - fdir: 6.5.0(picomatch@4.0.7) - picomatch: 4.0.7 - tinyglobby@0.2.17: dependencies: fdir: 6.5.0(picomatch@4.0.5) @@ -15192,19 +15653,8 @@ snapshots: dependencies: tldts-core: 7.4.18 - to-regex-range@5.0.1: - dependencies: - is-number: 7.0.0 - toidentifier@1.0.1: {} - tough-cookie@4.1.4: - dependencies: - psl: 1.15.0 - punycode: 2.3.1 - universalify: 0.2.0 - url-parse: 1.5.10 - tough-cookie@6.0.2: dependencies: tldts: 7.4.18 @@ -15219,27 +15669,31 @@ snapshots: trough@2.2.0: {} - tsdown@0.12.9(typescript@5.9.3): - dependencies: - ansis: 4.1.0 - cac: 6.7.14 - chokidar: 4.0.3 - debug: 4.4.3 - diff: 8.0.4 - empathic: 2.0.0 - hookable: 5.5.3 - rolldown: 1.0.0-beta.23 - rolldown-plugin-dts: 0.13.13(rolldown@1.0.0-beta.23)(typescript@5.9.3) - semver: 7.7.4 - tinyexec: 1.0.4 - tinyglobby: 0.2.15 - unconfig: 7.3.2 + tsdown@0.23.7(tsx@4.23.13)(typescript@7.0.2): + dependencies: + cac: 7.1.0 + defu: 6.1.7 + empathic: 2.1.0 + hookable: 6.1.2 + import-without-cache: 0.4.1 + obug: 3.0.0 + picomatch: 4.0.7 + rolldown: 1.3.2 + rolldown-plugin-dts: 0.30.2(rolldown@1.3.2)(typescript@7.0.2) + tinyexec: 1.3.1 + tinyglobby: 0.2.17 + tinyps: 0.5.2 + unconfig-core: 7.5.0 + verkit: 0.5.0 optionalDependencies: - typescript: 5.9.3 + tsx: 4.23.13 + typescript: 7.0.2 transitivePeerDependencies: - - '@typescript/native-preview' + - '@volar/typescript' + - '@vue/language-core' + - '@yuku-toolchain/wasm' - oxc-resolver - - supports-color + - tsrs - vue-tsc tslib@2.8.1: {} @@ -15253,7 +15707,9 @@ snapshots: tw-animate-css@1.3.5: {} - type-fest@4.41.0: {} + type-fest@5.10.0: + dependencies: + tagged-tag: 1.0.0 type-is@2.1.0: dependencies: @@ -15261,18 +15717,45 @@ snapshots: media-typer: 1.1.1 mime-types: 3.0.2 - typescript@5.9.3: {} + typesafe-path@0.2.2: {} + + typescript-auto-import-cache@0.3.6: + dependencies: + semver: 7.8.5 + + typescript@6.0.3: {} + + typescript@7.0.2: + optionalDependencies: + '@typescript/typescript-aix-ppc64': 7.0.2 + '@typescript/typescript-darwin-arm64': 7.0.2 + '@typescript/typescript-darwin-x64': 7.0.2 + '@typescript/typescript-freebsd-arm64': 7.0.2 + '@typescript/typescript-freebsd-x64': 7.0.2 + '@typescript/typescript-linux-arm': 7.0.2 + '@typescript/typescript-linux-arm64': 7.0.2 + '@typescript/typescript-linux-loong64': 7.0.2 + '@typescript/typescript-linux-mips64el': 7.0.2 + '@typescript/typescript-linux-ppc64': 7.0.2 + '@typescript/typescript-linux-riscv64': 7.0.2 + '@typescript/typescript-linux-s390x': 7.0.2 + '@typescript/typescript-linux-x64': 7.0.2 + '@typescript/typescript-netbsd-arm64': 7.0.2 + '@typescript/typescript-netbsd-x64': 7.0.2 + '@typescript/typescript-openbsd-arm64': 7.0.2 + '@typescript/typescript-openbsd-x64': 7.0.2 + '@typescript/typescript-sunos-x64': 7.0.2 + '@typescript/typescript-win32-arm64': 7.0.2 + '@typescript/typescript-win32-x64': 7.0.2 ufo@1.6.4: {} ultrahtml@1.7.0: {} - unconfig@7.3.2: + unconfig-core@7.5.0: dependencies: - '@quansync/fs': 0.1.3 - defu: 6.1.7 - jiti: 2.4.2 - quansync: 0.2.10 + '@quansync/fs': 1.1.0 + quansync: 1.0.0 uncrypto@0.1.3: {} @@ -15362,8 +15845,6 @@ snapshots: unist-util-is: 6.0.0 unist-util-visit-parents: 6.0.2 - universalify@0.2.0: {} - unpipe@1.0.0: {} unstorage@1.17.6: @@ -15377,6 +15858,8 @@ snapshots: ofetch: 1.5.1 ufo: 1.6.4 + until-async@3.0.2: {} + update-browserslist-db@1.3.4(browserslist@4.29.5): dependencies: browserslist: 4.29.5 @@ -15385,11 +15868,6 @@ snapshots: url-extras@0.1.0: {} - url-parse@1.5.10: - dependencies: - querystringify: 2.2.0 - requires-port: 1.0.0 - urlpattern-polyfill@10.1.0: {} use-callback-ref@1.3.3(@types/react@19.3.0)(react@19.2.8): @@ -15415,9 +15893,9 @@ snapshots: uuidv7@1.2.1: {} - valibot@1.4.2(typescript@5.9.3): + valibot@1.4.2(typescript@7.0.2): optionalDependencies: - typescript: 5.9.3 + typescript: 7.0.2 vary@1.1.2: {} @@ -15438,7 +15916,7 @@ snapshots: '@types/unist': 3.0.3 vfile-message: 4.0.2 - vite@6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0): + vite@6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0): dependencies: esbuild: 0.25.12 fdir: 6.5.0(picomatch@4.0.7) @@ -15447,7 +15925,7 @@ snapshots: rollup: 4.62.4 tinyglobby: 0.2.17 optionalDependencies: - '@types/node': 24.13.5 + '@types/node': 22.20.3 fsevents: 2.3.3 jiti: 2.7.0 lightningcss: 1.33.0 @@ -15469,36 +15947,6 @@ snapshots: tsx: 4.23.13 yaml: 2.9.0 - vite@8.3.8(@types/node@22.16.0)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1): - dependencies: - lightningcss: 1.33.0 - picomatch: 4.0.7 - postcss: 8.5.32 - rolldown: 1.2.19 - tinyglobby: 0.2.17 - optionalDependencies: - '@types/node': 22.16.0 - esbuild: 0.28.2 - fsevents: 2.3.3 - jiti: 2.7.0 - tsx: 4.23.13 - yaml: 2.9.1 - - vite@8.3.8(@types/node@22.20.1)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1): - dependencies: - lightningcss: 1.33.0 - picomatch: 4.0.7 - postcss: 8.5.32 - rolldown: 1.2.19 - tinyglobby: 0.2.17 - optionalDependencies: - '@types/node': 22.20.1 - esbuild: 0.28.2 - fsevents: 2.3.3 - jiti: 2.7.0 - tsx: 4.23.13 - yaml: 2.9.1 - vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.1)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1): dependencies: lightningcss: 1.33.0 @@ -15514,7 +15962,7 @@ snapshots: tsx: 4.23.13 yaml: 2.9.1 - vite@8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1): + vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1): dependencies: lightningcss: 1.33.0 picomatch: 4.0.7 @@ -15522,31 +15970,31 @@ snapshots: rolldown: 1.2.19 tinyglobby: 0.2.17 optionalDependencies: - '@types/node': 24.13.5 + '@types/node': 22.20.3 esbuild: 0.28.2 fsevents: 2.3.3 jiti: 2.7.0 tsx: 4.23.13 yaml: 2.9.1 - vitefu@1.1.3(vite@8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)): + vitefu@1.1.3(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)): optionalDependencies: - vite: 8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) + vite: 8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) vitest-evals@0.18.0(ai@6.0.64(zod@4.6.7))(tinyrainbow@3.2.0)(vitest@5.0.5)(zod@4.6.7): dependencies: '@vitest-evals/core': 0.18.0 '@vitest-evals/report-ui': 0.18.0 tinyrainbow: 3.2.0 - vitest: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@24.13.5)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@24.13.5)(typescript@5.9.3))(vite@8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + vitest: 5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.3)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0(supports-color@10.1.0))(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) optionalDependencies: ai: 6.0.64(zod@4.6.7) zod: 4.6.7 - vitest@5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.16.0)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@22.16.0)(typescript@5.9.3))(vite@8.3.8(@types/node@22.16.0)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)): + vitest@5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.3)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0(supports-color@10.1.0))(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0)): dependencies: '@types/chai': 5.2.2 - '@vitest/mocker': 5.0.5(msw@2.10.2(@types/node@22.16.0)(typescript@5.9.3))(vite@8.3.8(@types/node@22.16.0)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + '@vitest/mocker': 5.0.5(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0)) chai: 6.3.0 es-module-lexer: 2.3.2 expect-type: 1.4.0 @@ -15557,20 +16005,20 @@ snapshots: tinybench: 6.2.2 tinyexec: 1.3.1 tinyglobby: 0.2.17 - vite: 8.3.8(@types/node@22.16.0)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) + vite: 6.4.5(@types/node@22.20.3)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0) why-is-node-running: 3.2.1 optionalDependencies: '@opentelemetry/api': 1.9.1 - '@types/node': 22.16.0 + '@types/node': 22.20.3 '@vitest/coverage-v8': 5.0.5(vitest@5.0.5) - jsdom: 28.1.0 + jsdom: 28.1.0(supports-color@10.1.0) transitivePeerDependencies: - msw - vitest@5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.1)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@22.20.1)(typescript@5.9.3))(vite@8.3.8(@types/node@22.20.1)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)): + vitest@5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.3)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0(supports-color@10.1.0))(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.1)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)): dependencies: '@types/chai': 5.2.2 - '@vitest/mocker': 5.0.5(msw@2.10.2(@types/node@22.20.1)(typescript@5.9.3))(vite@8.3.8(@types/node@22.20.1)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + '@vitest/mocker': 5.0.5(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.1)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) chai: 6.3.0 es-module-lexer: 2.3.2 expect-type: 1.4.0 @@ -15581,20 +16029,20 @@ snapshots: tinybench: 6.2.2 tinyexec: 1.3.1 tinyglobby: 0.2.17 - vite: 8.3.8(@types/node@22.20.1)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) + vite: 8.3.8(@types/node@22.20.3)(esbuild@0.28.1)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) why-is-node-running: 3.2.1 optionalDependencies: '@opentelemetry/api': 1.9.1 - '@types/node': 22.20.1 + '@types/node': 22.20.3 '@vitest/coverage-v8': 5.0.5(vitest@5.0.5) - jsdom: 28.1.0 + jsdom: 28.1.0(supports-color@10.1.0) transitivePeerDependencies: - msw - vitest@5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.3)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@22.20.3)(typescript@5.9.3))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.1)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)): + vitest@5.0.5(@opentelemetry/api@1.9.1)(@types/node@22.20.3)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0(supports-color@10.1.0))(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)): dependencies: '@types/chai': 5.2.2 - '@vitest/mocker': 5.0.5(msw@2.10.2(@types/node@22.20.3)(typescript@5.9.3))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.1)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) + '@vitest/mocker': 5.0.5(msw@2.15.0(@types/node@22.20.3)(typescript@7.0.2))(vite@8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) chai: 6.3.0 es-module-lexer: 2.3.2 expect-type: 1.4.0 @@ -15605,20 +16053,20 @@ snapshots: tinybench: 6.2.2 tinyexec: 1.3.1 tinyglobby: 0.2.17 - vite: 8.3.8(@types/node@22.20.3)(esbuild@0.28.1)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) + vite: 8.3.8(@types/node@22.20.3)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) why-is-node-running: 3.2.1 optionalDependencies: '@opentelemetry/api': 1.9.1 '@types/node': 22.20.3 '@vitest/coverage-v8': 5.0.5(vitest@5.0.5) - jsdom: 28.1.0 + jsdom: 28.1.0(supports-color@10.1.0) transitivePeerDependencies: - msw - vitest@5.0.5(@opentelemetry/api@1.9.1)(@types/node@24.13.5)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@24.13.5)(typescript@5.9.3))(vite@6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0)): + vitest@5.0.5(@opentelemetry/api@1.9.1)(@types/node@24.13.5)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0(supports-color@10.1.0))(msw@2.15.0(@types/node@24.13.5)(typescript@7.0.2))(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0)): dependencies: '@types/chai': 5.2.2 - '@vitest/mocker': 5.0.5(msw@2.10.2(@types/node@24.13.5)(typescript@5.9.3))(vite@6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0)) + '@vitest/mocker': 5.0.5(msw@2.15.0(@types/node@24.13.5)(typescript@7.0.2))(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0)) chai: 6.3.0 es-module-lexer: 2.3.2 expect-type: 1.4.0 @@ -15629,63 +16077,123 @@ snapshots: tinybench: 6.2.2 tinyexec: 1.3.1 tinyglobby: 0.2.17 - vite: 6.4.5(@types/node@24.13.5)(jiti@2.7.0)(lightningcss@1.33.0)(tsx@4.23.13)(yaml@2.9.0) + vite: 8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0) why-is-node-running: 3.2.1 optionalDependencies: '@opentelemetry/api': 1.9.1 '@types/node': 24.13.5 '@vitest/coverage-v8': 5.0.5(vitest@5.0.5) - jsdom: 28.1.0 + jsdom: 28.1.0(supports-color@10.1.0) transitivePeerDependencies: - msw - vitest@5.0.5(@opentelemetry/api@1.9.1)(@types/node@24.13.5)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@24.13.5)(typescript@5.9.3))(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0)): + volar-service-css@0.0.71(@volar/language-service@2.4.31(typescript@6.0.3)): dependencies: - '@types/chai': 5.2.2 - '@vitest/mocker': 5.0.5(msw@2.10.2(@types/node@24.13.5)(typescript@5.9.3))(vite@8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0)) - chai: 6.3.0 - es-module-lexer: 2.3.2 - expect-type: 1.4.0 - magic-string: 1.4.5 - obug: 3.0.0 - picomatch: 4.0.7 - std-env: 4.3.0 - tinybench: 6.2.2 - tinyexec: 1.3.1 - tinyglobby: 0.2.17 - vite: 8.3.3(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.0) - why-is-node-running: 3.2.1 + vscode-css-languageservice: 6.3.10 + vscode-languageserver-textdocument: 1.0.16 + vscode-uri: 3.2.0 optionalDependencies: - '@opentelemetry/api': 1.9.1 - '@types/node': 24.13.5 - '@vitest/coverage-v8': 5.0.5(vitest@5.0.5) - jsdom: 28.1.0 - transitivePeerDependencies: - - msw + '@volar/language-service': 2.4.31(typescript@6.0.3) - vitest@5.0.5(@opentelemetry/api@1.9.1)(@types/node@24.13.5)(@vitest/coverage-v8@5.0.5)(jsdom@28.1.0)(msw@2.10.2(@types/node@24.13.5)(typescript@5.9.3))(vite@8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)): + volar-service-emmet@0.0.71(@volar/language-service@2.4.31(typescript@6.0.3)): dependencies: - '@types/chai': 5.2.2 - '@vitest/mocker': 5.0.5(msw@2.10.2(@types/node@24.13.5)(typescript@5.9.3))(vite@8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1)) - chai: 6.3.0 - es-module-lexer: 2.3.2 - expect-type: 1.4.0 - magic-string: 1.4.5 - obug: 3.0.0 - picomatch: 4.0.7 - std-env: 4.3.0 - tinybench: 6.2.2 - tinyexec: 1.3.1 - tinyglobby: 0.2.17 - vite: 8.3.8(@types/node@24.13.5)(esbuild@0.28.2)(jiti@2.7.0)(tsx@4.23.13)(yaml@2.9.1) - why-is-node-running: 3.2.1 + '@emmetio/css-parser': 0.4.1 + '@emmetio/html-matcher': 1.3.0 + '@vscode/emmet-helper': 2.11.0 + vscode-uri: 3.2.0 optionalDependencies: - '@opentelemetry/api': 1.9.1 - '@types/node': 24.13.5 - '@vitest/coverage-v8': 5.0.5(vitest@5.0.5) - jsdom: 28.1.0 - transitivePeerDependencies: - - msw + '@volar/language-service': 2.4.31(typescript@6.0.3) + + volar-service-html@0.0.71(@volar/language-service@2.4.31(typescript@6.0.3)): + dependencies: + vscode-html-languageservice: 5.6.2 + vscode-languageserver-textdocument: 1.0.16 + vscode-uri: 3.2.0 + optionalDependencies: + '@volar/language-service': 2.4.31(typescript@6.0.3) + + volar-service-prettier@0.0.71(@volar/language-service@2.4.31(typescript@6.0.3))(prettier@3.10.1): + dependencies: + vscode-uri: 3.2.0 + optionalDependencies: + '@volar/language-service': 2.4.31(typescript@6.0.3) + prettier: 3.10.1 + + volar-service-typescript-twoslash-queries@0.0.71(@volar/language-service@2.4.31(typescript@6.0.3))(typescript@6.0.3): + dependencies: + vscode-uri: 3.2.0 + optionalDependencies: + '@volar/language-service': 2.4.31(typescript@6.0.3) + typescript: 6.0.3 + + volar-service-typescript@0.0.71(@volar/language-service@2.4.31(typescript@6.0.3))(typescript@6.0.3): + dependencies: + path-browserify: 1.0.1 + semver: 7.8.5 + typescript-auto-import-cache: 0.3.6 + vscode-languageserver-textdocument: 1.0.16 + vscode-nls: 5.2.0 + vscode-uri: 3.2.0 + optionalDependencies: + '@volar/language-service': 2.4.31(typescript@6.0.3) + typescript: 6.0.3 + + volar-service-yaml@0.0.71(@volar/language-service@2.4.31(typescript@6.0.3)): + dependencies: + vscode-uri: 3.2.0 + yaml-language-server: 1.23.0 + optionalDependencies: + '@volar/language-service': 2.4.31(typescript@6.0.3) + + vscode-css-languageservice@6.3.10: + dependencies: + '@vscode/l10n': 0.0.18 + vscode-languageserver-textdocument: 1.0.16 + vscode-languageserver-types: 3.17.5 + vscode-uri: 3.2.0 + + vscode-html-languageservice@5.6.2: + dependencies: + '@vscode/l10n': 0.0.18 + vscode-languageserver-textdocument: 1.0.16 + vscode-languageserver-types: 3.18.5 + vscode-uri: 3.2.0 + + vscode-json-languageservice@4.1.8: + dependencies: + jsonc-parser: 3.3.1 + vscode-languageserver-textdocument: 1.0.16 + vscode-languageserver-types: 3.18.5 + vscode-nls: 5.2.0 + vscode-uri: 3.2.0 + + vscode-jsonrpc@10.0.0: {} + + vscode-jsonrpc@8.2.0: {} + + vscode-languageserver-protocol@3.17.5: + dependencies: + vscode-jsonrpc: 8.2.0 + vscode-languageserver-types: 3.17.5 + + vscode-languageserver-protocol@3.18.5: + dependencies: + vscode-jsonrpc: 10.0.0 + vscode-languageserver-types: 3.18.5 + + vscode-languageserver-textdocument@1.0.16: {} + + vscode-languageserver-types@3.17.5: {} + + vscode-languageserver-types@3.18.5: {} + + vscode-languageserver@9.0.1: + dependencies: + vscode-languageserver-protocol: 3.17.5 + + vscode-nls@5.2.0: {} + + vscode-uri@3.2.0: {} w3c-xmlserializer@5.0.0: dependencies: @@ -15730,13 +16238,13 @@ snapshots: '@cloudflare/workerd-linux-arm64': 1.20261101.1 '@cloudflare/workerd-windows-64': 1.20261101.1 - wrangler@4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@24.13.5): + wrangler@4.156.1(@cloudflare/workers-types@4.20260405.1)(@types/node@22.20.3): dependencies: '@cloudflare/kv-asset-handler': 0.5.0 '@cloudflare/unenv-preset': 2.16.2(unenv@2.0.0-rc.24)(workerd@1.20261101.1) blake3-wasm: 2.1.5 esbuild: 0.28.2 - miniflare: 5.20261101.0-beta(@types/node@24.13.5) + miniflare: 5.20261101.0-beta(@types/node@22.20.3) path-to-regexp: 6.3.0 unenv: 2.0.0-rc.24 workerd: 1.20261101.1 @@ -15748,34 +16256,11 @@ snapshots: - bufferutil - utf-8-validate - wrangler@4.156.1(@types/node@22.20.1): - dependencies: - '@cloudflare/kv-asset-handler': 0.5.0 - '@cloudflare/unenv-preset': 2.16.2(unenv@2.0.0-rc.24)(workerd@1.20261101.1) - blake3-wasm: 2.1.5 - esbuild: 0.28.2 - miniflare: 5.20261101.0-beta(@types/node@22.20.1) - path-to-regexp: 6.3.0 - unenv: 2.0.0-rc.24 - workerd: 1.20261101.1 - optionalDependencies: - fsevents: 2.3.3 - transitivePeerDependencies: - - '@types/node' - - bufferutil - - utf-8-validate - wrap-ansi@10.0.1: dependencies: ansi-styles: 6.2.3 string-width: 8.2.2 - wrap-ansi@6.2.0: - dependencies: - ansi-styles: 4.3.0 - string-width: 4.2.3 - strip-ansi: 6.0.1 - wrap-ansi@7.0.0: dependencies: ansi-styles: 4.3.0 @@ -15806,6 +16291,21 @@ snapshots: yallist@3.1.1: {} + yaml-language-server@1.23.0: + dependencies: + '@vscode/l10n': 0.0.18 + ajv: 8.20.0 + ajv-draft-04: 1.0.0(ajv@8.20.0) + ajv-i18n: 4.2.0(ajv@8.20.0) + prettier: 3.10.1 + request-light: 0.5.8 + vscode-json-languageservice: 4.1.8 + vscode-languageserver: 9.0.1 + vscode-languageserver-textdocument: 1.0.16 + vscode-languageserver-types: 3.18.5 + vscode-uri: 3.2.0 + yaml: 2.8.3 + yaml@1.10.3: {} yaml@2.8.3: {} @@ -15818,6 +16318,8 @@ snapshots: yargs-parser@21.1.1: {} + yargs-parser@22.0.0: {} + yargs@16.2.2: dependencies: cliui: 7.0.4 @@ -15838,14 +16340,21 @@ snapshots: y18n: 5.0.8 yargs-parser: 21.1.1 + yargs@18.2.0: + dependencies: + cliui: 9.0.1 + escalade: 3.2.0 + get-caller-file: 2.0.5 + string-width: 8.2.2 + y18n: 5.0.8 + yargs-parser: 22.0.0 + yauzl@3.4.0: dependencies: pend: 1.2.0 yocto-queue@1.2.2: {} - yoctocolors-cjs@2.1.3: {} - youch-core@0.3.3: dependencies: '@poppinss/exception': 1.2.2 @@ -15859,6 +16368,15 @@ snapshots: cookie: 1.0.2 youch-core: 0.3.3 + yuku@0.28.1: + optionalDependencies: + '@yuku-toolchain/darwin-arm64': 0.28.1 + '@yuku-toolchain/darwin-x64': 0.28.1 + '@yuku-toolchain/linux-arm64': 0.28.1 + '@yuku-toolchain/linux-x64': 0.28.1 + '@yuku-toolchain/win32-arm64': 0.28.1 + '@yuku-toolchain/win32-x64': 0.28.1 + zod-to-json-schema@3.25.2(zod@4.6.7): dependencies: zod: 4.6.7 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 2f5cc2bc90..d591dee3f3 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -47,7 +47,7 @@ overrides: zod: ^4.6.6 catalog: - "@ast-grep/cli": ^0.43.0 + "@ast-grep/cli": ^0.51.2 "@ai-sdk/anthropic": ^3.0.137 "@ai-sdk/mcp": ^1.0.16 "@ai-sdk/openai": ^3.0.23 @@ -70,11 +70,11 @@ catalog: "@sentry/vite-plugin": 11.12.0 "@tailwindcss/typography": ^0.5.16 "@tailwindcss/vite": ^4.3.3 - "@types/node": ^22.15.33 + "@types/node": ^22.20.3 "@types/react": ^19.1.8 "@types/react-dom": ^19.1.6 "@vitejs/plugin-react": ^4.6.0 - "@vitest/coverage-v8": ^5.0.5 + "@vitest/coverage-v8": ~5.0.5 agents: 0.32.0 ai: ^6.0.64 chalk: ^5.4.1 @@ -84,7 +84,7 @@ catalog: dotenv: ^16.6.1 dotenv-cli: ^8.0.0 hono: ^4.13.16 - lint-staged: ^15.5.2 + lint-staged: ^16.4.0 lucide-react: ^0.503.0 marked: ^15.0.12 mdast-util-from-markdown: ^2.0.2 @@ -92,29 +92,42 @@ catalog: micromark-extension-gfm: ^3.0.0 # Keep Dynamic Worker tests on the same Miniflare/workerd runtime as Wrangler. miniflare: 5.20261101.0-beta - msw: ^2.10.2 + msw: ^2.15.0 open: ^10.1.2 - oxfmt: 0.72.0 - oxlint: 1.87.0 - oxlint-tsgolint: 7.0.2004 + oxfmt: 0.78.0 + oxlint: 1.93.0 + oxlint-tsgolint: 7.0.2007 react: ^19.2.8 react-dom: ^19.2.8 react-markdown: ^9.1.0 remark-gfm: ^4.0.1 - simple-git-hooks: ^2.13.1 + simple-git-hooks: ^2.14.0 tailwind-merge: ^3.3.1 tailwindcss: ^4.3.3 - tsdown: ^0.12.9 - tsx: ^4.20.3 + tsdown: ^0.23.7 tw-animate-css: ^1.3.4 - typescript: ^5.9.3 + typescript: ^7.0.2 + # TypeScript 7 has no JavaScript compiler API. Scripts that parse or print + # TypeScript with it import this package instead; `tsc` stays on TypeScript 7. + "@typescript/typescript6": 6.0.2 valibot: ^1.4.2 vite: ^6.4.5 - vitest: ^5.0.5 + # Vitest 5.1's mocker calls AsyncLocalStorage.disable(), which workerd does + # not implement, so every mcp-cloudflare test that imports + # @sentry/cloudflare fails to load under @cloudflare/vitest-plugin 1.4.12. + # Plugin 1.7.0 shims it; raise both together. + vitest: ~5.0.5 vitest-evals: ^0.18.0 wrangler: 4.156.1 zod: ^4.6.6 +catalogs: + # `astro check` (@astrojs/check 0.9) supports TypeScript ^5 || ^6 only. + # Only apps/cli-docs uses this; move it to the default catalog once + # @astrojs/check supports TypeScript 7. + astro-check: + typescript: 6.0.3 + minimumReleaseAgeExclude: - "@ai-sdk/gateway@3.0.153" - "@ai-sdk/provider-utils@4.0.40" @@ -137,46 +150,6 @@ minimumReleaseAgeExclude: - "@sentry/search-syntax@1.0.0" - "@sentry/server-runtime-injection@11.12.0" - "@sentry/server-utils@11.12.0" - - "@oxfmt/binding-android-arm-eabi@0.72.0" - - "@oxfmt/binding-android-arm64@0.72.0" - - "@oxfmt/binding-darwin-arm64@0.72.0" - - "@oxfmt/binding-darwin-x64@0.72.0" - - "@oxfmt/binding-freebsd-x64@0.72.0" - - "@oxfmt/binding-linux-arm-gnueabihf@0.72.0" - - "@oxfmt/binding-linux-arm-musleabihf@0.72.0" - - "@oxfmt/binding-linux-arm64-gnu@0.72.0" - - "@oxfmt/binding-linux-arm64-musl@0.72.0" - - "@oxfmt/binding-linux-ppc64-gnu@0.72.0" - - "@oxfmt/binding-linux-riscv64-gnu@0.72.0" - - "@oxfmt/binding-linux-riscv64-musl@0.72.0" - - "@oxfmt/binding-linux-s390x-gnu@0.72.0" - - "@oxfmt/binding-linux-x64-gnu@0.72.0" - - "@oxfmt/binding-linux-x64-musl@0.72.0" - - "@oxfmt/binding-openharmony-arm64@0.72.0" - - "@oxfmt/binding-win32-arm64-msvc@0.72.0" - - "@oxfmt/binding-win32-ia32-msvc@0.72.0" - - "@oxfmt/binding-win32-x64-msvc@0.72.0" - - "@oxlint/binding-android-arm-eabi@1.87.0" - - "@oxlint/binding-android-arm64@1.87.0" - - "@oxlint/binding-darwin-arm64@1.87.0" - - "@oxlint/binding-darwin-x64@1.87.0" - - "@oxlint/binding-freebsd-x64@1.87.0" - - "@oxlint/binding-linux-arm-gnueabihf@1.87.0" - - "@oxlint/binding-linux-arm-musleabihf@1.87.0" - - "@oxlint/binding-linux-arm64-gnu@1.87.0" - - "@oxlint/binding-linux-arm64-musl@1.87.0" - - "@oxlint/binding-linux-ppc64-gnu@1.87.0" - - "@oxlint/binding-linux-riscv64-gnu@1.87.0" - - "@oxlint/binding-linux-riscv64-musl@1.87.0" - - "@oxlint/binding-linux-s390x-gnu@1.87.0" - - "@oxlint/binding-linux-x64-gnu@1.87.0" - - "@oxlint/binding-linux-x64-musl@1.87.0" - - "@oxlint/binding-openharmony-arm64@1.87.0" - - "@oxlint/binding-win32-arm64-msvc@1.87.0" - - "@oxlint/binding-win32-ia32-msvc@1.87.0" - - "@oxlint/binding-win32-x64-msvc@1.87.0" - - oxfmt@0.72.0 - - oxlint@1.87.0 - "@sentry/api@2.15.0" - miniflare@5.20261101.0-beta - wrangler@4.156.1 diff --git a/vitest.workspace.ts b/vitest.workspace.ts deleted file mode 100644 index 66f39df1b0..0000000000 --- a/vitest.workspace.ts +++ /dev/null @@ -1 +0,0 @@ -export default ["packages/*", "apps/*"]; From 77d6b5c65284f90fcbaa10de706604bc9e4c5b11 Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Sat, 14 Nov 2026 17:23:48 +0000 Subject: [PATCH 08/18] build(tsconfig): Apply one strict policy to every project Co-Authored-By: Joshua Li <14209781+joshuarli@users.noreply.github.com> --- apps/cli-docs/tsconfig.json | 7 +- apps/docs-mcp/tsconfig.json | 10 +- apps/games-api/tsconfig.json | 12 +- apps/games-api/tsconfig.node.json | 14 ++ apps/local/tsconfig.app.json | 21 +- apps/local/tsconfig.json | 5 +- apps/local/tsconfig.node.json | 8 +- apps/local/tsconfig.test.json | 19 ++ docs/cloudflare/architecture.md | 6 +- docs/contributing/coding-guidelines.md | 86 ++++++-- docs/contributing/pr-management.md | 2 +- docs/contributing/quality-checks.md | 4 +- docs/testing/remote.md | 2 +- docs/testing/stdio.md | 2 +- packages/cli/script/tsconfig.json | 7 +- packages/cli/tsconfig.json | 13 +- packages/codemod-cli3to4/tsconfig.json | 56 +++-- .../package/consumer/tsconfig.bundler.json | 11 + .../test/package/consumer/tsconfig.json | 3 + packages/logger/tsconfig.json | 9 +- packages/mcp-cloudflare/tsconfig.client.json | 17 +- packages/mcp-cloudflare/tsconfig.json | 3 +- packages/mcp-cloudflare/tsconfig.node.json | 7 +- packages/mcp-cloudflare/tsconfig.server.json | 9 +- packages/mcp-cloudflare/tsconfig.test.json | 15 +- packages/mcp-core/tsconfig.json | 5 +- packages/mcp-core/tsconfig.scripts.json | 18 ++ packages/mcp-server-evals/tsconfig.json | 9 +- packages/mcp-server-evals/tsconfig.node.json | 16 ++ packages/mcp-server-mocks/tsconfig.json | 11 +- packages/mcp-server-mocks/tsconfig.node.json | 18 ++ packages/mcp-server/tsconfig.json | 15 ++ packages/mcp-test-client/tsconfig.json | 15 +- packages/smoke-tests/tsconfig.json | 16 ++ packages/toolkit-core/tsconfig.json | 4 + scripts/ci-projects.test.mjs | 7 +- scripts/cli-lint-rules.test.mjs | 10 +- scripts/generate-parsers.mjs | 2 +- scripts/oxc-config.test.mjs | 23 +- scripts/tsconfig-policy.mjs | 206 ++++++++++++++++++ scripts/tsconfig-policy.test.mjs | 125 +++++++++++ tsconfig.base.json | 30 ++- 42 files changed, 777 insertions(+), 101 deletions(-) create mode 100644 apps/games-api/tsconfig.node.json create mode 100644 apps/local/tsconfig.test.json create mode 100644 packages/logger/test/package/consumer/tsconfig.bundler.json create mode 100644 packages/mcp-core/tsconfig.scripts.json create mode 100644 packages/mcp-server-evals/tsconfig.node.json create mode 100644 packages/mcp-server-mocks/tsconfig.node.json create mode 100644 packages/mcp-server/tsconfig.json create mode 100644 packages/smoke-tests/tsconfig.json create mode 100644 scripts/tsconfig-policy.mjs create mode 100644 scripts/tsconfig-policy.test.mjs diff --git a/apps/cli-docs/tsconfig.json b/apps/cli-docs/tsconfig.json index 26491b02de..2d5137a643 100644 --- a/apps/cli-docs/tsconfig.json +++ b/apps/cli-docs/tsconfig.json @@ -1,3 +1,8 @@ { - "extends": ["../../tsconfig.base.json", "astro/tsconfigs/strict"] + // Astro's runtime options, then the shared checking policy. The root base's + // runtime default `target` would replace Astro's, so restate it here. + "extends": ["astro/tsconfigs/strict", "../../tsconfig.base.json"], + "compilerOptions": { + "target": "ESNext" + } } diff --git a/apps/docs-mcp/tsconfig.json b/apps/docs-mcp/tsconfig.json index 7be5af3815..80921b5c19 100644 --- a/apps/docs-mcp/tsconfig.json +++ b/apps/docs-mcp/tsconfig.json @@ -2,9 +2,17 @@ "extends": "../../tsconfig.base.json", "compilerOptions": { "target": "ESNext", + "module": "ESNext", + "moduleResolution": "Bundler", "lib": ["ESNext", "WebWorker"], + "types": ["node"], "jsx": "react-jsx", - "jsxImportSource": "hono/jsx" + "jsxImportSource": "hono/jsx", + // skipLibCheck exception: `@mastra/core` and `@mastra/schema-compat` vendored AI SDK v4/v5 and zod v3 declarations fail TS2694/TS2707/TS2304/TS2846/TS2344/TS2307/TS2724 against zod 4 and current AI SDK majors (still in @mastra/core 1.83.0). Remove when they check cleanly. + // skipLibCheck exception: `@openrouter/ai-sdk-provider` declarations fail TS2416 under exactOptionalPropertyTypes (1.5.4 LanguageModelV2 implementation). Remove when they check cleanly. + // skipLibCheck exception: `@sentry/cloudflare` declarations fail TS2304/TS2307 (ExecutionContext, cloudflare:workers) because this program loads Node types, not @cloudflare/workers-types. Remove when the program loads Workers types or the declarations stop needing them. + // skipLibCheck exception: `wrangler` and `miniflare` declarations fail TS2307/TS2305/TS7016 on packages they bundle but do not ship (worker-config.test.ts imports them). Remove when they check cleanly. + "skipLibCheck": true }, "include": ["src/**/*.ts"], "exclude": ["node_modules", ".wrangler"] diff --git a/apps/games-api/tsconfig.json b/apps/games-api/tsconfig.json index 6c9736edcd..754bc3f394 100644 --- a/apps/games-api/tsconfig.json +++ b/apps/games-api/tsconfig.json @@ -2,8 +2,16 @@ "extends": "../../tsconfig.base.json", "compilerOptions": { "lib": ["ES2023", "ES2024.String"], - "types": ["@cloudflare/workers-types"], - "allowJs": true + "allowJs": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "incremental": true, + // The Worker runs with nodejs_compat, and @sentry/cloudflare's + // declarations (via @sentry/server-utils) need Node types. + "types": ["@cloudflare/workers-types", "node"], + // skipLibCheck exception: `@cloudflare/workers-types` and `@types/node` declare the same globals (TS2300 DOMException/Blob, TS2451 console/crypto, TS2502 PerformanceEntry). Remove when both can load in one program without conflicts. + "skipLibCheck": true }, "include": ["src"] } diff --git a/apps/games-api/tsconfig.node.json b/apps/games-api/tsconfig.node.json new file mode 100644 index 0000000000..71e88e7d27 --- /dev/null +++ b/apps/games-api/tsconfig.node.json @@ -0,0 +1,14 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "lib": ["ES2023", "ES2024.String"], + "allowJs": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "incremental": true, + "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo", + "types": ["node"] + }, + "include": ["vitest.config.ts"] +} diff --git a/apps/local/tsconfig.app.json b/apps/local/tsconfig.app.json index 4f7f227ea5..c9ba43cde9 100644 --- a/apps/local/tsconfig.app.json +++ b/apps/local/tsconfig.app.json @@ -3,24 +3,27 @@ "compilerOptions": { "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo", "target": "es2023", - "lib": ["ES2023", "DOM", "DOM.Iterable"], + // @shikijs/types declares `using` support with Symbol.dispose. + "lib": ["ES2023", "ESNext.Disposable", "DOM"], + "module": "esnext", "types": ["vite/client"], "allowArbitraryExtensions": true, /* Bundler mode */ + "moduleResolution": "bundler", "paths": { "@/*": ["./src/*"] }, "allowImportingTsExtensions": true, - "verbatimModuleSyntax": true, "noEmit": true, - "jsx": "react-jsx", - - /* Linting */ - "noUnusedLocals": true, - "noUnusedParameters": true, - "erasableSyntaxOnly": true + "jsx": "react-jsx" }, "include": ["src"], - "exclude": ["src/**/*.test.ts", "src/**/*.test.tsx"] + // Tests and their setup and fixtures are checked by tsconfig.test.json. + "exclude": [ + "src/**/*.test.ts", + "src/**/*.test.tsx", + "src/test-setup.ts", + "src/test-fixtures" + ] } diff --git a/apps/local/tsconfig.json b/apps/local/tsconfig.json index d0b2bca504..263e279bc0 100644 --- a/apps/local/tsconfig.json +++ b/apps/local/tsconfig.json @@ -2,11 +2,10 @@ "files": [], "references": [ { "path": "./tsconfig.app.json" }, - { "path": "./tsconfig.node.json" } + { "path": "./tsconfig.node.json" }, + { "path": "./tsconfig.test.json" } ], "compilerOptions": { - "ignoreDeprecations": "6.0", - "baseUrl": ".", "paths": { "@/*": ["./src/*"] } diff --git a/apps/local/tsconfig.node.json b/apps/local/tsconfig.node.json index 82b379bd07..dd569d9f07 100644 --- a/apps/local/tsconfig.node.json +++ b/apps/local/tsconfig.node.json @@ -10,13 +10,7 @@ "module": "nodenext", "moduleResolution": "nodenext", "allowImportingTsExtensions": true, - "verbatimModuleSyntax": true, - "noEmit": true, - - /* Linting */ - "noUnusedLocals": true, - "noUnusedParameters": true, - "erasableSyntaxOnly": true + "noEmit": true }, "include": ["vite.config.ts", "scripts/**/*.ts"] } diff --git a/apps/local/tsconfig.test.json b/apps/local/tsconfig.test.json new file mode 100644 index 0000000000..9f4a89cbd8 --- /dev/null +++ b/apps/local/tsconfig.test.json @@ -0,0 +1,19 @@ +{ + // Vitest runs these in jsdom (vite.config.ts) with Node APIs available, so + // the browser app settings apply plus Node types. + "extends": "./tsconfig.app.json", + "compilerOptions": { + "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.test.tsbuildinfo", + // The integration tests run the CLI's local receiver in process, so this + // program also checks packages/cli sources, which target ESNext. + "lib": ["ESNext", "DOM"], + "types": ["vite/client", "node"] + }, + "include": [ + "src/**/*.test.ts", + "src/**/*.test.tsx", + "src/test-setup.ts", + "src/test-fixtures" + ], + "exclude": [] +} diff --git a/docs/cloudflare/architecture.md b/docs/cloudflare/architecture.md index b5efaa81f2..3922f3c353 100644 --- a/docs/cloudflare/architecture.md +++ b/docs/cloudflare/architecture.md @@ -153,9 +153,9 @@ Required for deployment: ```toml [vars] -COOKIE_SECRET = "..." # For session encryption -OPENAI_API_KEY = "..." # For GPT-4 access -SENTRY_CLIENT_ID = "..." # OAuth app ID +COOKIE_SECRET = "..." # For session encryption +OPENAI_API_KEY = "..." # For GPT-4 access +SENTRY_CLIENT_ID = "..." # OAuth app ID SENTRY_CLIENT_SECRET = "..." # OAuth app secret ``` diff --git a/docs/contributing/coding-guidelines.md b/docs/contributing/coding-guidelines.md index e34d61b3c2..70b7d46768 100644 --- a/docs/contributing/coding-guidelines.md +++ b/docs/contributing/coding-guidelines.md @@ -6,19 +6,61 @@ product-specific implementation patterns. ## TypeScript Configuration -```typescript -// tsconfig.json essentials -{ - "compilerOptions": { - "strict": true, - "target": "ES2022", - "module": "ESNext", - "moduleResolution": "Bundler", - "sourceMap": true, - "noImplicitAny": true - } -} -``` +Every first-party TypeScript file is type-checked with TypeScript 7 (`tsc` +from the `typescript` catalog entry). + +- **Shared base.** Every project extends the root `tsconfig.base.json`. Its + checking options apply everywhere. They include `strict`, + `noUncheckedIndexedAccess`, `exactOptionalPropertyTypes`, + `noPropertyAccessFromIndexSignature`, `verbatimModuleSyntax`, + `erasableSyntaxOnly`, `noUnusedLocals`, `noUnusedParameters`, and + `skipLibCheck: false`. A project sets only its runtime: `target`, `module`, + `moduleResolution`, `lib`, `types`, JSX, and emit. The codemod is the one + exception: `jssg` cannot follow an `extends` outside its package, so its + tsconfig repeats the checking options. +- **Don't weaken the policy.** `scripts/tsconfig-policy.test.mjs` runs in CI. It + fails when a project overrides a policy option, when a tracked TypeScript file + is in no checked program, or when a package that has a `tsconfig.json` has no + `typecheck` script. +- **Library-check exceptions.** If a dependency's declarations fail and no + dependency fix exists, set `skipLibCheck: true` in the affected program only. + Add one comment line per dependency: + `// skipLibCheck exception: . Remove when .` +- **Running the check.** `pnpm run typecheck` builds the workspace and runs + every package's `typecheck` script; `pnpm run tsc` is an alias. In a package, + run `pnpm run typecheck`. CI runs each package's script through + `package.json#sentryCi`. If results look stale after a tsconfig change, + delete the package's `node_modules/.tmp` build info. +- **Optional properties.** Under `exactOptionalPropertyTypes`, `x?: T` does not + accept `undefined`. Omit the key with a conditional spread, or with + `omitUndefined()` in mcp-core. Declare `x?: T | undefined` only when callers + forward a value that can be undefined, such as an optional zod field. +- **Compiler API.** TypeScript 7 has no JavaScript compiler API. Code that + parses or prints TypeScript imports `@typescript/typescript6`. `tsc` stays + on TypeScript 7. +- **Known exceptions.** `apps/cli-docs` runs `astro check` on TypeScript 6 + (the `astro-check` catalog) until `@astrojs/check` supports TypeScript 7. + `@sentry/mcp-core` emits declarations through tsdown's tsgo backend. +- **tsrs (experimental, opt-in).** [tsrs](https://github.com/oxc-project/tsrs) + is a faster TypeScript-compatible checker. Toolkit doesn't depend on it, and + CI never runs it. Oxlint picks `tsrs-lint` automatically when the package is + installed, so keep it out of the workspace: install it into a scratch + directory and select it explicitly. + + ```bash + npm install --prefix ~/.cache/tsrs tsrs@0.25.0-ts7.1.0-beta + # Type-aware lint with the tsrs backend (same diagnostics, ~3x faster here): + OXLINT_TSGOLINT_PATH=~/.cache/tsrs/node_modules/.bin/tsrs-lint pnpm exec oxlint . + # Check one program: + ~/.cache/tsrs/node_modules/.bin/tsrs -p packages/cli/tsconfig.json --noEmit + ``` + + tsrs implements TypeScript 7.1 beta, so it can report errors that the + TypeScript 7.0 gate doesn't. `pnpm run typecheck` decides. Don't use + `--fast` mode, which has reported false errors here. Don't use + `oxlint --type-check` as a substitute for `typecheck` either: it checks each + file under one tsconfig, so it misses programs such as toolkit-core's + browser build. ## Code Style @@ -37,8 +79,20 @@ product-specific implementation patterns. - Oxlint runs type-aware (`options.typeAware` in `.oxlintrc.json`, backed by `oxlint-tsgolint`). `typescript/return-await` (`always`) is on repo-wide: write `return await` in async functions so callers stay in async stack - traces. Type-aware correctness rules that still have a backlog are turned - off at the root; #1573 tracks enabling them. + traces. +- Repo-wide promise and error rules: `no-misused-promises`, + `switch-exhaustiveness-check` (a `default` branch counts), + `only-throw-error`, `prefer-promise-reject-errors`, `no-base-to-string`, and + `no-unsafe-enum-comparison`. In the CLI, rethrow a caught value recorded + earlier (for example by a callback) with `rethrow()` from + `src/lib/rethrow.ts`, so it reaches callers unchanged. +- Non-test source outside the CLI also gets `no-explicit-any`, + `no-non-null-assertion`, `no-unnecessary-condition`, and the `no-unsafe-*` + rules. Validate untrusted data (zod or a type guard) instead of reading it as + `any`. `packages/cli/src` already bans `any` and `!`. +- Type-aware lint reads workspace packages through their built declarations. + Build them before linting, or imports read as error types: + `pnpm --filter '@sentry/mcp-core...' --filter @sentry/logger run build`. - Copy and combine iterables with spread: `[...set]`, `[...a, ...b]`, `[...path, key]`. `unicorn/prefer-spread` enforces this repo-wide and autofixes `Array.from(x)` and `.slice()`. Spread rejects non-iterables at @@ -124,7 +178,7 @@ pnpm -w run lint # Oxlint and ast-grep checks for root, MCP, and CLI pnpm -w run lint:fix # Fix issues pnpm -w run format # Format with Oxfmt pnpm --filter sentry run lint # CLI-specific lint and format checks -pnpm tsc --noEmit # Type check +pnpm -w run typecheck # Type check every package pnpm test # Run tests pnpm -w run build # Build all ``` diff --git a/docs/contributing/pr-management.md b/docs/contributing/pr-management.md index 4ba9dcaad2..cafbd063b6 100644 --- a/docs/contributing/pr-management.md +++ b/docs/contributing/pr-management.md @@ -321,7 +321,7 @@ This PR implements comprehensive improvements to the search_events tool... ```bash # Run all quality checks before requesting review -pnpm run tsc # TypeScript compilation +pnpm run typecheck # TypeScript compilation pnpm run lint # Code linting pnpm run test # Unit tests diff --git a/docs/contributing/quality-checks.md b/docs/contributing/quality-checks.md index 7e1a116630..3dfa1f6614 100644 --- a/docs/contributing/quality-checks.md +++ b/docs/contributing/quality-checks.md @@ -5,7 +5,7 @@ Required checks before completing any code changes. ## Required Commands ```bash -pnpm run tsc && pnpm run lint && pnpm run test +pnpm run typecheck && pnpm run lint && pnpm run test ``` Do not proceed if any check fails. @@ -32,7 +32,7 @@ happy-path inline snapshot test. Review tool output snapshots against ## Pre-Commit Checklist -- [ ] Quality checks pass (`pnpm run tsc && pnpm run lint && pnpm run test`) +- [ ] Quality checks pass (`pnpm run typecheck && pnpm run lint && pnpm run test`) - [ ] Tool count within limits - [ ] New tools have tests with inline snapshots - [ ] Tool/skill definitions regenerated if tools changed (`pnpm run --filter @sentry/mcp-core generate-definitions`) diff --git a/docs/testing/remote.md b/docs/testing/remote.md index 3323d51402..c7d43c4624 100644 --- a/docs/testing/remote.md +++ b/docs/testing/remote.md @@ -659,7 +659,7 @@ Before deploying changes: pnpm -w run build # 2. Type check -pnpm -w run tsc +pnpm -w run typecheck # 3. Lint pnpm -w run lint diff --git a/docs/testing/stdio.md b/docs/testing/stdio.md index ce18ba661c..7047713000 100644 --- a/docs/testing/stdio.md +++ b/docs/testing/stdio.md @@ -500,7 +500,7 @@ Before committing changes that affect stdio: ```bash pnpm -w run build -pnpm -w run tsc +pnpm -w run typecheck pnpm -w run lint pnpm --dir packages/cli exec vitest run test/lib/mcp test/lib/mcp-start.test.ts echo '{"jsonrpc":"2.0","id":1,"method":"tools/list"}' | \ diff --git a/packages/cli/script/tsconfig.json b/packages/cli/script/tsconfig.json index e516b7faf6..cbfaca8190 100644 --- a/packages/cli/script/tsconfig.json +++ b/packages/cli/script/tsconfig.json @@ -1,4 +1,9 @@ { "extends": "../tsconfig.json", - "include": ["**/*.ts"] + "include": [ + "**/*.ts", + "../src/global.d.ts", + "../grammar/**/*.ts", + "../vitest.config.ts" + ] } diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json index 7a70bc7782..36e255654e 100644 --- a/packages/cli/tsconfig.json +++ b/packages/cli/tsconfig.json @@ -3,11 +3,18 @@ "compilerOptions": { "lib": ["ESNext"], "target": "ESNext", + "module": "ESNext", "allowJs": true, + "moduleResolution": "bundler", "allowImportingTsExtensions": true, - "verbatimModuleSyntax": true, - "erasableSyntaxOnly": true, - "noEmit": true + "noEmit": true, + "resolveJsonModule": true, + "esModuleInterop": true, + // skipLibCheck exception: `ai` declarations fail TS2344 under exactOptionalPropertyTypes and TS2304 on DOM names (HeadersInit, RequestCredentials, FileList) in this Node program (ai@6 dist/index.d.ts, loaded through @sentry/mcp-core types). Remove when they check cleanly. + // skipLibCheck exception: `@ai-sdk/provider-utils` declarations fail TS2304 on the DOM name HeadersInit in this Node program. Remove when they check cleanly without lib DOM. + // skipLibCheck exception: `@sentry/symbolic` declarations fail TS2304/TS2552/TS2503/TS2694 on DOM and WebAssembly names (BufferSource, RequestInfo, WebAssembly.Memory) that @types/node 22 lacks. Remove when they check cleanly in a Node program. + // skipLibCheck exception: `hono` declarations (hono/ws, loaded by @hono/node-server) fail TS2304/TS2315 on DOM names (CloseEvent, BinaryType, generic MessageEvent) in this Node program. Remove when they check cleanly without lib DOM. + "skipLibCheck": true }, "include": ["src/**/*.ts"], "exclude": ["node_modules", "dist"] diff --git a/packages/codemod-cli3to4/tsconfig.json b/packages/codemod-cli3to4/tsconfig.json index 7ebfa025ba..9a06a4d34b 100644 --- a/packages/codemod-cli3to4/tsconfig.json +++ b/packages/codemod-cli3to4/tsconfig.json @@ -1,26 +1,48 @@ { - // jssg can't resolve an `extends` outside this package, so this doesn't extend the shared base. + // Self-contained: `jssg test` cannot resolve an `extends` that points + // outside this package, so the checking options of the root + // tsconfig.base.json are copied here. + // scripts/tsconfig-policy.test.mjs fails if the two drift apart. "compilerOptions": { - "target": "ESNext", - "module": "NodeNext", - "moduleResolution": "NodeNext", - "moduleDetection": "force", - "isolatedModules": true, - "esModuleInterop": true, - "resolveJsonModule": true, - "skipLibCheck": true, - "forceConsistentCasingInFileNames": true, "strict": true, - "noFallthroughCasesInSwitch": true, - "noImplicitOverride": true, "noUncheckedIndexedAccess": true, + "exactOptionalPropertyTypes": true, + "noImplicitOverride": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, + "noPropertyAccessFromIndexSignature": true, + "noUnusedLocals": true, + "noUnusedParameters": true, "noUncheckedSideEffectImports": true, - "types": ["@codemod.com/jssg-types"], - "allowImportingTsExtensions": true, - "noEmit": true, - "verbatimModuleSyntax": true, + "allowUnreachableCode": false, + "allowUnusedLabels": false, + "forceConsistentCasingInFileNames": true, + "isolatedModules": true, "erasableSyntaxOnly": true, - "noImplicitReturns": true + "verbatimModuleSyntax": true, + "moduleDetection": "force", + "skipLibCheck": false, + "target": "ES2022", + // The codemod declares no runtime capabilities (codemod.yaml) and uses + // no runtime globals, so the program gets only the ES lib. + "lib": ["ES2023"], + "module": "NodeNext", + "moduleResolution": "NodeNext", + // Load only the `codemod:ast-grep` module declarations (the package's + // `main` entry); jssg-env.d.ts adds the language modules the codemod + // imports. The package root also pulls in its LLRT runtime globals and + // its other modules, whose declarations do not check: TS1038 in + // modules/metrics.d.ts and modules/runtime.d.ts, TS2300/TS2717 for Intl + // in llrt/timezone.d.ts, TS1203 and missing Node types in llrt/*.d.ts + // (jssg-types 1.6.3, the latest). + "types": ["@codemod.com/jssg-types/main"], + "allowImportingTsExtensions": true, + "noEmit": true }, + "include": ["scripts", "jssg-env.d.ts"], + // tests/*/input.ts and expected.ts are `jssg test` fixtures: source text + // the codemod rewrites and the text it must produce. They import + // @sentry/cli v3 and `sentry`, which this package does not install, and + // are not meant to be a type-correct program. "exclude": ["tests"] } diff --git a/packages/logger/test/package/consumer/tsconfig.bundler.json b/packages/logger/test/package/consumer/tsconfig.bundler.json new file mode 100644 index 0000000000..12c5c7dc5b --- /dev/null +++ b/packages/logger/test/package/consumer/tsconfig.bundler.json @@ -0,0 +1,11 @@ +{ + // A bundled app resolves the package's "import" condition without Node's + // module rules. + "extends": "./tsconfig.json", + "compilerOptions": { + "module": "Preserve", + "moduleResolution": "Bundler", + "noEmit": true + }, + "include": ["esm.ts"] +} diff --git a/packages/logger/test/package/consumer/tsconfig.json b/packages/logger/test/package/consumer/tsconfig.json index 5273f3ee62..4f1c055681 100644 --- a/packages/logger/test/package/consumer/tsconfig.json +++ b/packages/logger/test/package/consumer/tsconfig.json @@ -4,6 +4,9 @@ "moduleResolution": "NodeNext", "target": "ES2022", "strict": true, + "exactOptionalPropertyTypes": true, + "noUncheckedIndexedAccess": true, + "skipLibCheck": false, "outDir": "out", "types": ["node"] }, diff --git a/packages/logger/tsconfig.json b/packages/logger/tsconfig.json index 999b11224d..1f0950ccea 100644 --- a/packages/logger/tsconfig.json +++ b/packages/logger/tsconfig.json @@ -1,9 +1,14 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { + "target": "ES2022", "lib": ["ES2023"], + "module": "ESNext", + "moduleResolution": "Bundler", "types": ["node"], - "noEmit": true + "noEmit": true, + "declaration": true, + "isolatedDeclarations": true }, - "include": ["src/**/*.ts", "test/*.ts"] + "include": ["src/**/*.ts", "test/*.ts", "tsdown.config.ts"] } diff --git a/packages/mcp-cloudflare/tsconfig.client.json b/packages/mcp-cloudflare/tsconfig.client.json index b3722fcf81..516bba5b93 100644 --- a/packages/mcp-cloudflare/tsconfig.client.json +++ b/packages/mcp-cloudflare/tsconfig.client.json @@ -1,22 +1,31 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { + "jsx": "react-jsx", "target": "ES2020", "lib": ["ES2020", "DOM", "DOM.Iterable"], - "types": ["vite/client"], - "jsx": "react-jsx", "useDefineForClassFields": true, + "types": ["vite/client"], "allowJs": true, "sourceMap": true, "declaration": true, "declarationMap": true, "incremental": true, + // Type checking only; vite builds the client bundle. + "noEmit": true, + // skipLibCheck exception: `ai` declarations fail TS2344 under exactOptionalPropertyTypes (ai@6 dist/index.d.ts). Remove when they check cleanly. + // skipLibCheck exception: `ai` and `@ai-sdk/provider-utils` declarations reference Node-only names in this browser program (TS2591 Buffer, node:http; TS2694). Remove when they check cleanly without @types/node. + "skipLibCheck": true, "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.client.tsbuildinfo", "paths": { - "@/*": ["./src/*"] + "@/*": [ + "./src/*" + ] }, "outDir": "dist", "rootDir": "src" }, - "include": ["src/client"] + // src/constants.ts and src/homepage-content.ts are shared with the Worker, + // so both programs list them and check them under each environment. + "include": ["src/client", "src/constants.ts", "src/homepage-content.ts"] } diff --git a/packages/mcp-cloudflare/tsconfig.json b/packages/mcp-cloudflare/tsconfig.json index 4ae2aa1b27..b6fd4c10e1 100644 --- a/packages/mcp-cloudflare/tsconfig.json +++ b/packages/mcp-cloudflare/tsconfig.json @@ -3,6 +3,7 @@ "references": [ { "path": "./tsconfig.client.json" }, { "path": "./tsconfig.node.json" }, - { "path": "./tsconfig.server.json" } + { "path": "./tsconfig.server.json" }, + { "path": "./tsconfig.test.json" } ] } diff --git a/packages/mcp-cloudflare/tsconfig.node.json b/packages/mcp-cloudflare/tsconfig.node.json index 10f3658dd2..3508e95f4c 100644 --- a/packages/mcp-cloudflare/tsconfig.node.json +++ b/packages/mcp-cloudflare/tsconfig.node.json @@ -7,9 +7,14 @@ "declaration": true, "declarationMap": true, "incremental": true, + // Type checking only; nothing consumes JS emitted from these configs. + "noEmit": true, + // skipLibCheck exception: `wrangler`, `miniflare` and `@cloudflare/vite-plugin` declarations fail TS2307/TS2305/TS2552/TS7016 on packages they bundle but do not ship (@cloudflare/workers-utils, @cloudflare/workers-shared, @cloudflare/config). Remove when they check cleanly. + // skipLibCheck exception: `unplugin`, `webpack-virtual-modules`, `vite` and `vitest` declarations fail TS2307 'webpack', TS2305 rollup 'AcornNode'/vite 'ESTree', and TS2430 against the installed rollup. Remove when they check cleanly. + "skipLibCheck": true, "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo", "outDir": "dist", "rootDir": "" }, - "include": ["vite.config.ts"] + "include": ["vite.config.ts", "vitest.config.ts"] } diff --git a/packages/mcp-cloudflare/tsconfig.server.json b/packages/mcp-cloudflare/tsconfig.server.json index 1e0cc6723d..f494d1ce58 100644 --- a/packages/mcp-cloudflare/tsconfig.server.json +++ b/packages/mcp-cloudflare/tsconfig.server.json @@ -1,6 +1,11 @@ { "extends": "./tsconfig.node.json", "compilerOptions": { + "noEmit": true, + // skipLibCheck exception: `@cloudflare/workers-types` and `@types/node` declare the same globals (TS2300 DOMException/Blob, TS2451 console/crypto, TS2502 PerformanceEntry); the Worker uses nodejs_compat and needs both. Remove when both can load in one program without conflicts. + // skipLibCheck exception: `ai` declarations fail TS2344 under exactOptionalPropertyTypes (ai@6 dist/index.d.ts). Remove when they check cleanly. + // skipLibCheck exception: `ai` declarations fail TS2304 on DOM names @cloudflare/workers-types lacks (RequestCredentials, FileList). Remove when they check cleanly. + "skipLibCheck": true, "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.server.tsbuildinfo", "types": [ "@cloudflare/workers-types", @@ -8,7 +13,9 @@ ] }, "include": [ - "src/server" + "src/server", + "src/constants.ts", + "src/homepage-content.ts" ], "exclude": [ "src/**/*.test.ts", diff --git a/packages/mcp-cloudflare/tsconfig.test.json b/packages/mcp-cloudflare/tsconfig.test.json index 6f4aa00dc5..04f1c217bf 100644 --- a/packages/mcp-cloudflare/tsconfig.test.json +++ b/packages/mcp-cloudflare/tsconfig.test.json @@ -1,13 +1,24 @@ { "extends": "./tsconfig.server.json", "compilerOptions": { + "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.test.tsbuildinfo", + "noEmit": true, + // skipLibCheck exception: `@cloudflare/workers-types` and `@types/node` declare the same globals (TS2300 DOMException/Blob, TS2451 console/crypto, TS2502 PerformanceEntry); the Worker tests use nodejs_compat and need both. Remove when both can load in one program without conflicts. + // skipLibCheck exception: `ai` declarations fail TS2344 under exactOptionalPropertyTypes (ai@6 dist/index.d.ts) and TS2304 on DOM names workers-types lacks. Remove when they check cleanly. + // skipLibCheck exception: `miniflare` declarations (via @cloudflare/vitest-plugin) fail TS2307/TS2305/TS2552/TS7016 on packages it bundles but does not ship. Remove when they check cleanly. + // skipLibCheck exception: `urlpattern-polyfill` declarations fail TS2300 against the URLPattern global from @cloudflare/workers-types. Remove when they check cleanly. + "skipLibCheck": true, "types": [ "@cloudflare/workers-types", - "@cloudflare/vitest-plugin" + "@types/node", + "@cloudflare/vitest-plugin/types" ] }, + // Client component tests belong to tsconfig.client.json, which includes + // all of src/client. "include": [ - "src/**/*.test.ts", + "src/*.test.ts", + "src/server/**/*.test.ts", "src/test-setup.ts", "src/test-utils/**/*.ts" ], diff --git a/packages/mcp-core/tsconfig.json b/packages/mcp-core/tsconfig.json index 4061fbae45..6b95c5022b 100644 --- a/packages/mcp-core/tsconfig.json +++ b/packages/mcp-core/tsconfig.json @@ -9,7 +9,10 @@ "incremental": true, "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.tsbuildinfo", "outDir": "dist", - "rootDir": "src" + "rootDir": "src", + "types": ["node"], + // skipLibCheck exception: `ai` declarations fail TS2344 under exactOptionalPropertyTypes (ai@6.0.x dist/index.d.ts). Remove when they check cleanly. + "skipLibCheck": true }, "include": ["src"] } diff --git a/packages/mcp-core/tsconfig.scripts.json b/packages/mcp-core/tsconfig.scripts.json new file mode 100644 index 0000000000..24082ef957 --- /dev/null +++ b/packages/mcp-core/tsconfig.scripts.json @@ -0,0 +1,18 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "lib": ["ES2023", "ES2024.String"], + "allowJs": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "incremental": true, + "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.scripts.tsbuildinfo", + "noEmit": true, + "allowImportingTsExtensions": true, + "types": ["node"], + // skipLibCheck exception: `ai` declarations fail TS2344 under exactOptionalPropertyTypes (ai@6.0.x dist/index.d.ts). Remove when they check cleanly. + "skipLibCheck": true + }, + "include": ["scripts", "vitest.config.ts", "tsdown.config.ts"] +} diff --git a/packages/mcp-server-evals/tsconfig.json b/packages/mcp-server-evals/tsconfig.json index 4061fbae45..607ddac6ed 100644 --- a/packages/mcp-server-evals/tsconfig.json +++ b/packages/mcp-server-evals/tsconfig.json @@ -1,7 +1,6 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "lib": ["ES2023", "ES2024.String"], "allowJs": true, "sourceMap": true, "declaration": true, @@ -9,7 +8,13 @@ "incremental": true, "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.tsbuildinfo", "outDir": "dist", - "rootDir": "src" + "rootDir": "src", + // msw and the AI SDK declarations use Fetch and WebSocket DOM types + // (ResponseType, HeadersInit, EventInit, ...) that @types/node lacks. + "lib": ["ES2023", "ES2024.String", "DOM"], + "types": ["node"], + // skipLibCheck exception: `ai` declarations fail TS2344 under exactOptionalPropertyTypes (ai@6.0.x dist/index.d.ts). Remove when they check cleanly. + "skipLibCheck": true }, "include": ["src"] } diff --git a/packages/mcp-server-evals/tsconfig.node.json b/packages/mcp-server-evals/tsconfig.node.json new file mode 100644 index 0000000000..d81a85af9a --- /dev/null +++ b/packages/mcp-server-evals/tsconfig.node.json @@ -0,0 +1,16 @@ +{ + // vitest.config.ts runs in Node and sits outside tsconfig.json's rootDir. + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "lib": ["ES2023", "ES2024.String"], + "allowJs": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "incremental": true, + "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo", + "noEmit": true, + "types": ["node"] + }, + "include": ["vitest.config.ts"] +} diff --git a/packages/mcp-server-mocks/tsconfig.json b/packages/mcp-server-mocks/tsconfig.json index 4061fbae45..fa298d20d5 100644 --- a/packages/mcp-server-mocks/tsconfig.json +++ b/packages/mcp-server-mocks/tsconfig.json @@ -1,15 +1,20 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "lib": ["ES2023", "ES2024.String"], - "allowJs": true, "sourceMap": true, "declaration": true, "declarationMap": true, "incremental": true, "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.tsbuildinfo", "outDir": "dist", - "rootDir": "src" + "rootDir": "src", + // msw's declarations name Fetch and WebSocket DOM globals (ResponseType, + // BodyInit, EventInit, MessageEvent) that @types/node does not declare. + "lib": ["ES2023", "ES2024.String", "DOM"], + "types": ["node"], + // Lets tsdown emit declarations with Oxc instead of the compiler API. + "allowJs": false, + "isolatedDeclarations": true }, "include": ["src"] } diff --git a/packages/mcp-server-mocks/tsconfig.node.json b/packages/mcp-server-mocks/tsconfig.node.json new file mode 100644 index 0000000000..e9dc459ae5 --- /dev/null +++ b/packages/mcp-server-mocks/tsconfig.node.json @@ -0,0 +1,18 @@ +{ + // Build tooling that runs in Node and is not part of the published package. + // Kept out of tsconfig.json, whose rootDir and isolatedDeclarations apply + // to the emitted src/ declarations only. + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "lib": ["ES2023", "ES2024.String"], + "allowJs": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "incremental": true, + "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo", + "noEmit": true, + "types": ["node"] + }, + "include": ["tsdown.config.ts"] +} diff --git a/packages/mcp-server/tsconfig.json b/packages/mcp-server/tsconfig.json new file mode 100644 index 0000000000..a5b1d3d5c6 --- /dev/null +++ b/packages/mcp-server/tsconfig.json @@ -0,0 +1,15 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "target": "ES2022", + "lib": ["ES2023"], + "module": "ESNext", + "moduleResolution": "Bundler", + "types": ["node"], + "noEmit": true + }, + // The package ships only the esbuild bundle of the CLI; its own source is + // the build script. The CLI's esbuild plugins it imports are checked here + // too, as this program reaches them. + "include": ["script"] +} diff --git a/packages/mcp-test-client/tsconfig.json b/packages/mcp-test-client/tsconfig.json index efb3d30c1c..8ca1a4d1af 100644 --- a/packages/mcp-test-client/tsconfig.json +++ b/packages/mcp-test-client/tsconfig.json @@ -1,15 +1,22 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { - "lib": ["ES2023", "ES2024.String"], "allowJs": true, "sourceMap": true, "declaration": true, "declarationMap": true, "incremental": true, "outDir": "./dist", - "rootDir": "./src" + "rootDir": ".", + // The AI SDK and MCP SDK declarations use Fetch DOM types (HeadersInit, + // RequestCredentials, FileList) that @types/node does not declare. + "lib": ["ES2023", "ES2024.String", "DOM"], + "types": ["node"], + // skipLibCheck exception: `ai` declarations fail TS2344 under exactOptionalPropertyTypes (ai@6.0.x dist/index.d.ts). Remove when they check cleanly. + "skipLibCheck": true }, - "include": ["src/**/*"], - "exclude": ["node_modules", "dist", "**/*.test.ts"] + // Tests and the Vite/tsdown configs are checked with the source; tsdown + // bundles only src/index.ts. + "include": ["src", "vitest.config.ts", "tsdown.config.ts"], + "exclude": ["node_modules", "dist"] } diff --git a/packages/smoke-tests/tsconfig.json b/packages/smoke-tests/tsconfig.json new file mode 100644 index 0000000000..c317252131 --- /dev/null +++ b/packages/smoke-tests/tsconfig.json @@ -0,0 +1,16 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "target": "ES2022", + // The tests call fetch and build Headers from HeadersInit, which only + // the DOM lib declares. + "lib": ["ES2023", "DOM"], + "module": "ESNext", + "moduleResolution": "Bundler", + "resolveJsonModule": true, + "types": ["node"], + "noEmit": true + }, + // Type-check only: the tests need a deployed server and credentials. + "include": ["src", "vitest.config.ts"] +} diff --git a/packages/toolkit-core/tsconfig.json b/packages/toolkit-core/tsconfig.json index 0d7100cbc2..e89f74bace 100644 --- a/packages/toolkit-core/tsconfig.json +++ b/packages/toolkit-core/tsconfig.json @@ -1,6 +1,10 @@ { "extends": "../../tsconfig.base.json", "compilerOptions": { + "target": "ES2022", + "module": "ESNext", + "moduleResolution": "Bundler", + "types": ["node"], "noEmit": true }, "include": ["src/**/*.ts"] diff --git a/scripts/ci-projects.test.mjs b/scripts/ci-projects.test.mjs index 9be16701cb..bdac17209f 100644 --- a/scripts/ci-projects.test.mjs +++ b/scripts/ci-projects.test.mjs @@ -33,7 +33,12 @@ describe("workspace CI selection", () => { assert.ok(names.includes("sentry-cli-docs")); assert.ok(names.includes("sentry")); assert.ok(names.includes("@sentry/mcp-core")); - assert.ok(!names.includes("@sentry/mcp-smoke-tests")); + // Smoke tests need a deployed server; CI only type-checks them. + const smoke = matrix.include.find( + ({ name }) => name === "@sentry/mcp-smoke-tests", + ); + assert.equal(smoke.typecheck, "typecheck"); + assert.equal(smoke.test, ""); assert.equal(new Set(names).size, names.length); const docs = matrix.include.find(({ name }) => name === "sentry-cli-docs"); assert.equal(docs.prepare, "ci:prepare"); diff --git a/scripts/cli-lint-rules.test.mjs b/scripts/cli-lint-rules.test.mjs index c122ef81f6..db28a65449 100644 --- a/scripts/cli-lint-rules.test.mjs +++ b/scripts/cli-lint-rules.test.mjs @@ -2,8 +2,14 @@ import { describe, it } from "node:test"; import { RuleTester } from "oxlint/plugins-dev"; import plugin from "../packages/cli/lint-rules/cli-oxlint-plugin.js"; -RuleTester.describe = describe; -RuleTester.it = it; +// node:test tracks the promises its suite functions return; RuleTester only +// needs void callbacks. +RuleTester.describe = (text, fn) => { + void describe(text, fn); +}; +RuleTester.it = (text, fn) => { + void it(text, fn); +}; const tester = new RuleTester({ languageOptions: { parserOptions: { lang: "ts" } }, diff --git a/scripts/generate-parsers.mjs b/scripts/generate-parsers.mjs index fb6248543b..066e5b3b39 100644 --- a/scripts/generate-parsers.mjs +++ b/scripts/generate-parsers.mjs @@ -21,7 +21,7 @@ import { existsSync } from "node:fs"; import { mkdir, readdir, readFile, writeFile } from "node:fs/promises"; import { join, relative, resolve, sep } from "node:path"; import peggy from "peggy"; -import ts from "typescript"; +import ts from "@typescript/typescript6"; const HEADER = "// Auto-generated by scripts/generate-parsers.mjs — DO NOT EDIT\n"; diff --git a/scripts/oxc-config.test.mjs b/scripts/oxc-config.test.mjs index 97bd9d4be8..5fdf2c270b 100644 --- a/scripts/oxc-config.test.mjs +++ b/scripts/oxc-config.test.mjs @@ -55,10 +55,31 @@ test("editor and staged files use Oxc for root, MCP, and CLI", () => { "explicit", ); assert.ok(!formatter.ignorePatterns.includes("packages/cli/**")); - assert.deepEqual(extensions.recommendations, ["oxc.oxc-vscode"]); + assert.deepEqual(extensions.recommendations, [ + "oxc.oxc-vscode", + "TypeScriptTeam.native-preview", + ]); assert.deepEqual(Object.keys(packageJson["lint-staged"]), ["*"]); }); +test("editors use the workspace TypeScript 7 compiler", () => { + // TypeScript 7 ships no tsserver, so the legacy `typescript.tsdk` setting + // cannot load it; the TypeScript 7 extension reads these settings instead. + for (const path of [ + ".vscode/settings.json", + "packages/cli/.vscode/settings.json", + ]) { + const settings = readRootJson(path); + assert.equal(settings["js/ts.experimental.useTsgo"], true, path); + assert.equal( + settings["js/ts.tsdk.path"], + "./node_modules/typescript", + path, + ); + assert.equal(settings["typescript.tsdk"], undefined, path); + } +}); + test("CI lint checks formatting for commits that skip the pre-commit hook", () => { const { scripts } = readRootJson("package.json"); const workflow = readFileSync( diff --git a/scripts/tsconfig-policy.mjs b/scripts/tsconfig-policy.mjs new file mode 100644 index 0000000000..4195d1f630 --- /dev/null +++ b/scripts/tsconfig-policy.mjs @@ -0,0 +1,206 @@ +/** + * Finds the TypeScript programs that package type checks run, and the + * compiler options and root files of each. + * + * `scripts/tsconfig-policy.test.mjs` uses this to fail when a project + * weakens the shared policy in `tsconfig.base.json`, or when a TypeScript + * file is in no checked program. Run `node scripts/tsconfig-policy.mjs` to + * list every checked program with its file count. + */ +import { execFileSync } from "node:child_process"; +import { existsSync, readFileSync } from "node:fs"; +import { createRequire } from "node:module"; +import { dirname, join, relative, resolve } from "node:path"; +import { fileURLToPath, pathToFileURL } from "node:url"; +import ts from "@typescript/typescript6"; + +export const ROOT = resolve(dirname(fileURLToPath(import.meta.url)), ".."); + +/** + * Package scripts that CI runs as the type check, in the order + * scripts/ci-projects.mjs looks for them. Packages use `typecheck`; the + * tsconfig policy test enforces that. + */ +const TYPECHECK_SCRIPTS = ["typecheck", "tsc", "check"]; + +function toRepoPath(path) { + return relative(ROOT, path).split("\\").join("/"); +} + +function parseConfig(configPath) { + const parsed = ts.getParsedCommandLineOfConfigFile( + configPath, + {}, + { + ...ts.sys, + onUnRecoverableConfigFileDiagnostic: (diagnostic) => { + throw new Error( + `${toRepoPath(configPath)}: ${ts.flattenDiagnosticMessageText(diagnostic.messageText, "\n")}`, + ); + }, + }, + ); + if (!parsed) { + throw new Error(`Could not read ${toRepoPath(configPath)}`); + } + return parsed; +} + +/** Effective compiler options of the shared policy. */ +export function policyOptions() { + return parseConfig(join(ROOT, "tsconfig.base.json")).options; +} + +/** + * Expand a `tsc -b` target into the configs it builds: the config itself + * when it has root files, and every config it references. + */ +function buildTargets(configPath, seen = new Set()) { + if (seen.has(configPath)) { + return []; + } + seen.add(configPath); + const parsed = parseConfig(configPath); + const targets = parsed.fileNames.length > 0 ? [configPath] : []; + for (const reference of parsed.projectReferences ?? []) { + const referenced = ts.resolveProjectReferencePath(reference); + targets.push(...buildTargets(referenced, seen)); + } + return targets; +} + +function configArgument(packageDir, value) { + const path = resolve(packageDir, value); + return existsSync(path) && !path.endsWith(".json") + ? join(path, "tsconfig.json") + : path; +} + +/** + * Configs that one `tsc` command line checks. Supports `-p`/`--project`, + * `-b`/`--build` with optional targets, and a bare `tsc`. + */ +export function configsForCommand(packageDir, command) { + const args = command.trim().split(/\s+/).slice(1); + const build = args.some((arg) => arg === "-b" || arg === "--build"); + const configs = []; + for (let index = 0; index < args.length; index++) { + const arg = args[index]; + if (arg === "-p" || arg === "--project") { + const value = args[index + 1]; + if (value === undefined) { + throw new Error(`${command}: ${arg} needs a config`); + } + configs.push(configArgument(packageDir, value)); + index++; + } else if (build && !arg.startsWith("-")) { + configs.push(configArgument(packageDir, arg)); + } + } + if (configs.length === 0) { + configs.push(join(packageDir, "tsconfig.json")); + } + return build ? configs.flatMap((config) => buildTargets(config)) : configs; +} + +export function workspacePackages() { + const output = execFileSync("pnpm", ["ls", "-r", "--depth", "-1", "--json"], { + cwd: ROOT, + encoding: "utf8", + }); + return JSON.parse(output) + .map(({ path }) => path) + .filter((path) => path !== ROOT); +} + +/** + * Every program that a package type check runs, keyed by repository path. + * `astro check` checks the package's tsconfig.json. + */ +export function checkedPrograms() { + const programs = new Map(); + for (const packageDir of workspacePackages()) { + const manifest = JSON.parse( + readFileSync(join(packageDir, "package.json"), "utf8"), + ); + const scripts = manifest.scripts ?? {}; + const name = TYPECHECK_SCRIPTS.find((script) => scripts[script]); + if (name === undefined) { + continue; + } + for (const command of scripts[name].split("&&")) { + const program = command.trim().split(/\s+/)[0]; + const configs = + program === "tsc" + ? configsForCommand(packageDir, command) + : command.trim().startsWith("astro check") + ? [join(packageDir, "tsconfig.json")] + : []; + for (const config of configs) { + const parsed = parseConfig(config); + programs.set(toRepoPath(config), { + path: config, + package: manifest.name, + script: name, + options: parsed.options, + files: parsed.fileNames.map(toRepoPath), + }); + } + } + } + return programs; +} + +const EXCEPTION_MARKER = "// skipLibCheck exception:"; + +function extendsTargets(configPath, raw) { + const value = raw.extends; + const targets = value === undefined ? [] : [value].flat(); + return targets.map((target) => + target.startsWith(".") + ? resolve(dirname(configPath), target) + : createRequire(configPath).resolve(target), + ); +} + +/** + * Find the config in a program's `extends` chain that turns on + * skipLibCheck, and the reasons its comments give. Returns undefined when + * no config in the chain sets it. + */ +export function libCheckException(configPath) { + const text = readFileSync(configPath, "utf8"); + const raw = ts.parseConfigFileTextToJson(configPath, text).config ?? {}; + if (raw.compilerOptions?.skipLibCheck === true) { + const reasons = text + .split("\n") + .map((line) => line.trim()) + .filter((line) => line.startsWith(EXCEPTION_MARKER)) + .map((line) => line.slice(EXCEPTION_MARKER.length).trim()); + return { config: toRepoPath(configPath), reasons }; + } + // Later entries in `extends` win, so search them first. + for (const target of extendsTargets(configPath, raw).reverse()) { + const found = libCheckException(target); + if (found) { + return found; + } + } + return undefined; +} + +/** Tracked TypeScript sources, excluding dependencies and build output. */ +export function trackedTypeScriptFiles() { + const output = execFileSync( + "git", + ["ls-files", "--", "*.ts", "*.tsx", "*.mts", "*.cts"], + { cwd: ROOT, encoding: "utf8" }, + ); + return output.split("\n").filter(Boolean); +} + +if (import.meta.url === pathToFileURL(process.argv[1] ?? "").href) { + for (const [config, { package: name, script, files }] of checkedPrograms()) { + console.log(`${config}\t${name}#${script}\t${files.length} files`); + } +} diff --git a/scripts/tsconfig-policy.test.mjs b/scripts/tsconfig-policy.test.mjs new file mode 100644 index 0000000000..e7117c506f --- /dev/null +++ b/scripts/tsconfig-policy.test.mjs @@ -0,0 +1,125 @@ +import assert from "node:assert/strict"; +import { existsSync, readFileSync } from "node:fs"; +import { join } from "node:path"; +import { test } from "node:test"; +import ts from "@typescript/typescript6"; +import { + checkedPrograms, + libCheckException, + policyOptions, + ROOT, + trackedTypeScriptFiles, + workspacePackages, +} from "./tsconfig-policy.mjs"; + +/** + * Tracked TypeScript files that no type check covers on purpose. Each entry + * must still match a file. + */ +const UNCHECKED = [ + { + pattern: /^packages\/codemod-cli3to4\/tests\//, + reason: + "codemod input and expected-output fixtures, compared as text by `jssg test`", + }, + { + pattern: /^packages\/logger\/test\/package\/consumer\//, + reason: + "packed-package consumer, compiled against the tarball by test/package/check.sh", + }, + { + pattern: /^packages\/mcp-cloudflare\/worker-configuration\.d\.ts$/, + reason: + "`wrangler types` output that no program references; Env comes from src/server/types.ts", + }, +]; + +const programs = checkedPrograms(); +const policy = policyOptions(); +/** + * Runtime defaults in tsconfig.base.json that projects may override. Every + * other option there is checking policy. + */ +const RUNTIME_KEYS = new Set([ + "target", + "module", + "moduleResolution", + "esModuleInterop", + "resolveJsonModule", +]); +const policyKeys = Object.keys( + ts.readConfigFile(join(ROOT, "tsconfig.base.json"), ts.sys.readFile).config + .compilerOptions, +).filter((key) => !RUNTIME_KEYS.has(key)); + +test("every package with a tsconfig.json has a typecheck script", () => { + for (const packageDir of workspacePackages()) { + if (!existsSync(join(packageDir, "tsconfig.json"))) { + continue; + } + const { name, scripts = {} } = JSON.parse( + readFileSync(join(packageDir, "package.json"), "utf8"), + ); + assert.ok(scripts.typecheck, `${name} has no "typecheck" script`); + } +}); + +test("every type check runs a program with files", () => { + assert.ok(programs.size > 0); + for (const [config, { files }] of programs) { + assert.ok(files.length > 0, `${config} checks no files`); + } +}); + +test("no checked program weakens the shared compiler policy", () => { + for (const [config, { options }] of programs) { + for (const key of policyKeys) { + if (key === "skipLibCheck") { + continue; + } + assert.equal( + options[key] ?? false, + policy[key], + `${config} overrides ${key}; the shared policy sets ${JSON.stringify(policy[key])}`, + ); + } + } +}); + +test("every skipLibCheck exception gives its reasons", () => { + for (const [config, { path, options }] of programs) { + if (options.skipLibCheck !== true) { + continue; + } + const exception = libCheckException(path); + assert.ok(exception, `${config} skips library checks without an exception`); + assert.ok( + exception.reasons.length > 0, + `${exception.config} sets skipLibCheck without a "// skipLibCheck exception: . Remove when ." comment`, + ); + for (const reason of exception.reasons) { + assert.match( + reason, + /Remove when .+\.$/, + `${exception.config}: "${reason}" names no removal condition`, + ); + } + } +}); + +test("every tracked TypeScript file is in a checked program", () => { + const checked = new Set([...programs.values()].flatMap(({ files }) => files)); + const files = trackedTypeScriptFiles(); + const missing = files.filter( + (file) => + !checked.has(file) && + !UNCHECKED.some(({ pattern }) => pattern.test(file)), + ); + assert.deepEqual(missing, [], "add these files to a checked tsconfig"); + for (const { pattern } of UNCHECKED) { + assert.ok( + files.some((file) => pattern.test(file)), + `${pattern.source} matches no tracked file`, + ); + } +}); diff --git a/tsconfig.base.json b/tsconfig.base.json index fd393380f7..bf546a49e7 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1,19 +1,35 @@ { "$schema": "https://json.schemastore.org/tsconfig", + // The shared base for every first-party TypeScript project. + // + // The checking policy (from `strict` down) applies everywhere: do not weaken + // it in a project; scripts/tsconfig-policy.test.mjs fails when a project + // does. Projects set their own runtime on top: module resolution, lib, + // ambient types, JSX, and emit. The runtime defaults here suit bundled ESM. "compilerOptions": { "target": "ES2022", "module": "ESNext", "moduleResolution": "Bundler", - "moduleDetection": "force", - "isolatedModules": true, "esModuleInterop": true, "resolveJsonModule": true, - "skipLibCheck": true, - "forceConsistentCasingInFileNames": true, + "strict": true, - "noFallthroughCasesInSwitch": true, - "noImplicitOverride": true, "noUncheckedIndexedAccess": true, - "noUncheckedSideEffectImports": true + "exactOptionalPropertyTypes": true, + "noImplicitOverride": true, + "noImplicitReturns": true, + "noFallthroughCasesInSwitch": true, + "noPropertyAccessFromIndexSignature": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noUncheckedSideEffectImports": true, + "allowUnreachableCode": false, + "allowUnusedLabels": false, + "forceConsistentCasingInFileNames": true, + "isolatedModules": true, + "erasableSyntaxOnly": true, + "verbatimModuleSyntax": true, + "moduleDetection": "force", + "skipLibCheck": false } } From eae48f1705e3e4c15099a0652d4a118619531764 Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Sat, 14 Nov 2026 17:23:48 +0000 Subject: [PATCH 09/18] chore(lint): Extend type-aware safety rules Co-Authored-By: Joshua Li <14209781+joshuarli@users.noreply.github.com> --- .oxlintrc.json | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/.oxlintrc.json b/.oxlintrc.json index 62ecf603df..d39013caec 100644 --- a/.oxlintrc.json +++ b/.oxlintrc.json @@ -53,9 +53,49 @@ "typescript/no-unnecessary-type-parameters": "error", "typescript/no-useless-default-assignment": "error", "jsx-a11y/interactive-supports-focus": "off", - "unicorn/prefer-spread": "error" + "unicorn/prefer-spread": "error", + "typescript/no-misused-promises": "error", + "typescript/switch-exhaustiveness-check": [ + "error", + { + "considerDefaultExhaustiveForUnions": true + } + ], + "typescript/only-throw-error": "error", + "typescript/prefer-promise-reject-errors": [ + "error", + { "allowThrowingUnknown": true } + ], + "typescript/no-base-to-string": "error", + "typescript/no-unsafe-enum-comparison": "error" }, "overrides": [ + { + "files": [ + "apps/{docs-mcp,games-api,local}/**/*.{ts,tsx}", + "packages/{codemod-cli3to4,logger,mcp-cloudflare,mcp-core,mcp-server,mcp-server-evals,mcp-server-mocks,mcp-test-client,smoke-tests,toolkit-core}/**/*.{ts,tsx}" + ], + "excludeFiles": [ + "**/*.test.{ts,tsx}", + "**/test/**", + "**/tests/**", + "**/test-utils/**", + "**/test-setup.ts", + "**/test-fixtures/**", + "**/test-fixtures.ts", + "**/*.config.{ts,mts}" + ], + "rules": { + "typescript/no-explicit-any": "error", + "typescript/no-non-null-assertion": "error", + "typescript/no-unnecessary-condition": "error", + "typescript/no-unsafe-assignment": "error", + "typescript/no-unsafe-argument": "error", + "typescript/no-unsafe-call": "error", + "typescript/no-unsafe-member-access": "error", + "typescript/no-unsafe-return": "error" + } + }, { "files": ["**/*.test.{ts,tsx,mjs}", "**/test/**/*.{ts,tsx}"], "rules": { From dc6ea03c59899fe38809501e17d49529364b7d97 Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Sat, 14 Nov 2026 17:23:55 +0000 Subject: [PATCH 10/18] ref(cli): Satisfy the strict policy and safety rules Co-Authored-By: Joshua Li <14209781+joshuarli@users.noreply.github.com> --- packages/cli/.vscode/settings.json | 3 +- packages/cli/DEVELOPMENT.md | 2 +- packages/cli/README.md | 2 +- packages/cli/script/bench-sweep.ts | 7 +- packages/cli/script/bench.ts | 46 ++- packages/cli/script/build.ts | 12 +- packages/cli/script/bundle.ts | 6 +- packages/cli/script/check-doc-examples.ts | 2 +- packages/cli/script/check-env-coverage.ts | 10 +- packages/cli/script/check-patches.ts | 15 +- packages/cli/script/check-stale-references.ts | 3 +- packages/cli/script/eval-skill.ts | 4 +- packages/cli/script/generate-banner-image.ts | 10 +- packages/cli/script/generate-command-docs.ts | 2 +- packages/cli/script/generate-docs-sections.ts | 35 +- packages/cli/script/generate-sdk.ts | 10 +- packages/cli/script/generate-skill.ts | 7 +- packages/cli/script/generate.ts | 7 +- packages/cli/script/lib/chunk-build.ts | 2 +- packages/cli/script/lib/split-bundle.ts | 8 +- packages/cli/script/lib/top-level-routes.ts | 6 +- packages/cli/script/markdown.ts | 4 +- packages/cli/script/prepare-e2e-bundle.ts | 2 +- packages/cli/script/sdk-declarations.ts | 2 +- packages/cli/script/sdk-run-calls.ts | 7 +- packages/cli/script/text-import-plugin.ts | 2 +- packages/cli/script/ts-codegen.ts | 19 +- packages/cli/src/app-for-args.ts | 2 +- packages/cli/src/bin.ts | 2 +- packages/cli/src/chunk-main.ts | 2 +- packages/cli/src/cli.ts | 4 +- .../src/commands/agent-conversation/list.ts | 4 +- .../cli/src/commands/alert/issues/create.ts | 8 +- .../cli/src/commands/alert/issues/edit.ts | 44 +-- .../cli/src/commands/alert/issues/list.ts | 11 +- .../cli/src/commands/alert/metrics/create.ts | 7 +- .../cli/src/commands/alert/metrics/edit.ts | 34 +- .../cli/src/commands/alert/metrics/list.ts | 13 +- .../cli/src/commands/alert/mutation-utils.ts | 6 +- packages/cli/src/commands/api.ts | 22 +- packages/cli/src/commands/auth/login.ts | 5 +- packages/cli/src/commands/auth/logout.ts | 2 +- packages/cli/src/commands/auth/refresh.ts | 4 +- packages/cli/src/commands/auth/status.ts | 95 +++--- packages/cli/src/commands/auth/switch.ts | 1 + packages/cli/src/commands/auth/whoami.ts | 6 +- packages/cli/src/commands/build/upload.ts | 2 +- packages/cli/src/commands/cli/completion.ts | 2 +- packages/cli/src/commands/cli/defaults.ts | 10 +- packages/cli/src/commands/cli/feedback.ts | 13 +- packages/cli/src/commands/cli/fix.ts | 4 +- packages/cli/src/commands/cli/import.ts | 1 + packages/cli/src/commands/cli/setup.ts | 8 +- packages/cli/src/commands/cli/uninstall.ts | 3 +- packages/cli/src/commands/cli/upgrade.ts | 52 +-- .../src/commands/dart-symbol-map/upload.ts | 2 +- .../cli/src/commands/dashboard/arguments.ts | 8 +- packages/cli/src/commands/dashboard/create.ts | 4 +- packages/cli/src/commands/dashboard/list.ts | 6 +- .../cli/src/commands/dashboard/resolve.ts | 14 +- .../cli/src/commands/dashboard/revisions.ts | 4 +- packages/cli/src/commands/dashboard/view.ts | 6 +- .../cli/src/commands/dashboard/widget/edit.ts | 6 +- .../cli/src/commands/debug-files/check.ts | 1 + .../cli/src/commands/debug-files/upload.ts | 4 +- packages/cli/src/commands/dsn/list.ts | 2 +- packages/cli/src/commands/event/send.ts | 3 +- .../cli/src/commands/event/shared-events.ts | 2 +- packages/cli/src/commands/event/view.ts | 8 +- packages/cli/src/commands/explore.ts | 20 +- packages/cli/src/commands/info.ts | 10 +- .../cli/src/commands/integration/delete.ts | 1 + packages/cli/src/commands/issue/list.ts | 53 +-- packages/cli/src/commands/issue/plan.ts | 5 +- packages/cli/src/commands/issue/unlink.ts | 1 + packages/cli/src/commands/issue/utils.ts | 2 +- .../cli/src/commands/local/control-plane.ts | 15 +- packages/cli/src/commands/local/daemon.ts | 8 +- packages/cli/src/commands/local/envelope.ts | 42 +-- .../cli/src/commands/local/receiver-ingest.ts | 4 +- .../src/commands/local/retention-buffer.ts | 9 +- packages/cli/src/commands/local/run.ts | 12 +- packages/cli/src/commands/local/server.ts | 13 +- .../cli/src/commands/local/session-store.ts | 6 +- .../cli/src/commands/local/viewer-protocol.ts | 2 +- packages/cli/src/commands/log/list.ts | 14 +- packages/cli/src/commands/log/view.ts | 6 +- packages/cli/src/commands/org/list.ts | 5 +- packages/cli/src/commands/proguard/upload.ts | 4 +- packages/cli/src/commands/project/create.ts | 18 +- packages/cli/src/commands/project/delete.ts | 4 +- packages/cli/src/commands/project/list.ts | 19 +- packages/cli/src/commands/project/view.ts | 4 +- .../cli/src/commands/react-native/gradle.ts | 4 +- .../cli/src/commands/react-native/xcode.ts | 18 +- packages/cli/src/commands/release/create.ts | 7 +- packages/cli/src/commands/release/delete.ts | 1 + packages/cli/src/commands/release/deploy.ts | 24 +- packages/cli/src/commands/release/finalize.ts | 2 +- packages/cli/src/commands/release/parse.ts | 2 +- .../cli/src/commands/release/set-commits.ts | 6 +- packages/cli/src/commands/replay/list.ts | 4 +- packages/cli/src/commands/replay/view.ts | 6 +- packages/cli/src/commands/schema.ts | 12 +- .../cli/src/commands/snapshots/download.ts | 2 +- packages/cli/src/commands/snapshots/upload.ts | 9 +- .../cli/src/commands/sourcemap/resolve.ts | 6 +- packages/cli/src/commands/sourcemap/upload.ts | 5 +- packages/cli/src/commands/span/list.ts | 12 +- packages/cli/src/commands/span/view.ts | 2 +- packages/cli/src/commands/status/show.ts | 1 + packages/cli/src/commands/token/delete.ts | 1 + packages/cli/src/commands/token/list.ts | 1 + packages/cli/src/commands/trace/list.ts | 2 +- packages/cli/src/commands/trace/logs.ts | 6 +- packages/cli/src/commands/trace/view.ts | 12 +- packages/cli/src/context.ts | 2 +- packages/cli/src/global.d.ts | 20 +- packages/cli/src/lib/account-selection.ts | 2 +- packages/cli/src/lib/api-schema.ts | 8 +- packages/cli/src/lib/api/alerts.ts | 91 ++--- .../cli/src/lib/api/attribute-pagination.ts | 2 +- packages/cli/src/lib/api/chunk-upload.ts | 12 +- packages/cli/src/lib/api/completion-seed.ts | 2 +- packages/cli/src/lib/api/conversations.ts | 22 +- packages/cli/src/lib/api/dart-symbols.ts | 2 +- packages/cli/src/lib/api/dashboards.ts | 64 ++-- packages/cli/src/lib/api/debug-files.ts | 8 +- packages/cli/src/lib/api/dropped-events.ts | 7 +- packages/cli/src/lib/api/events.ts | 11 +- packages/cli/src/lib/api/explore.ts | 39 ++- packages/cli/src/lib/api/feedback.ts | 8 +- packages/cli/src/lib/api/infrastructure.ts | 61 ++-- packages/cli/src/lib/api/integrations.ts | 4 +- packages/cli/src/lib/api/issue-app-links.ts | 23 +- .../cli/src/lib/api/issue-integrations.ts | 16 +- packages/cli/src/lib/api/issue-tags.ts | 5 +- packages/cli/src/lib/api/issues.ts | 58 ++-- packages/cli/src/lib/api/logs.ts | 56 +-- packages/cli/src/lib/api/monitors.ts | 6 +- packages/cli/src/lib/api/organizations.ts | 5 +- packages/cli/src/lib/api/preprod-artifacts.ts | 25 +- packages/cli/src/lib/api/proguard.ts | 2 +- packages/cli/src/lib/api/projects.ts | 23 +- packages/cli/src/lib/api/releases.ts | 13 +- packages/cli/src/lib/api/replays.ts | 31 +- packages/cli/src/lib/api/repositories.ts | 11 +- packages/cli/src/lib/api/sourcemaps.ts | 12 +- packages/cli/src/lib/api/teams.ts | 11 +- packages/cli/src/lib/api/traces.ts | 142 ++++---- packages/cli/src/lib/app-identity.ts | 2 +- packages/cli/src/lib/arg-parsing.ts | 2 +- packages/cli/src/lib/attribute-search.ts | 4 +- packages/cli/src/lib/bash-hook/traceback.ts | 24 +- packages/cli/src/lib/binary.ts | 12 +- packages/cli/src/lib/build/index.ts | 2 +- packages/cli/src/lib/build/vcs.ts | 32 +- packages/cli/src/lib/bytes.ts | 25 ++ packages/cli/src/lib/chunk-loader.ts | 4 +- packages/cli/src/lib/ci.ts | 42 +-- packages/cli/src/lib/clipboard.ts | 15 +- packages/cli/src/lib/command.ts | 62 ++-- packages/cli/src/lib/complete.ts | 9 +- packages/cli/src/lib/config-dir.ts | 2 +- packages/cli/src/lib/constants.ts | 10 +- packages/cli/src/lib/custom-ca.ts | 2 +- packages/cli/src/lib/custom-headers.ts | 2 +- packages/cli/src/lib/dashboard-arguments.ts | 4 +- packages/cli/src/lib/db/account-scope.ts | 4 +- packages/cli/src/lib/db/accounts.ts | 10 +- packages/cli/src/lib/db/auth.ts | 36 +- packages/cli/src/lib/db/completion-cache.ts | 2 +- packages/cli/src/lib/db/index.ts | 5 +- packages/cli/src/lib/db/pagination.ts | 7 +- packages/cli/src/lib/db/regions.ts | 6 +- packages/cli/src/lib/db/schema.ts | 26 +- packages/cli/src/lib/db/user.ts | 6 +- packages/cli/src/lib/delta-upgrade.ts | 6 +- packages/cli/src/lib/detect-agent.ts | 15 +- packages/cli/src/lib/dif/index.ts | 7 +- packages/cli/src/lib/dif/scan.ts | 30 +- packages/cli/src/lib/dif/zip.ts | 2 +- packages/cli/src/lib/dsn/errors.ts | 2 +- packages/cli/src/lib/dsn/types.ts | 14 +- packages/cli/src/lib/env-token-host.ts | 6 +- .../cli/src/lib/envelope/checkin-builder.ts | 2 +- .../cli/src/lib/envelope/event-builder.ts | 5 +- packages/cli/src/lib/envelope/transport.ts | 9 +- packages/cli/src/lib/error-reporting.ts | 10 +- packages/cli/src/lib/errors.ts | 30 +- packages/cli/src/lib/formatters/alerts.ts | 41 +-- packages/cli/src/lib/formatters/chart-core.ts | 2 +- .../src/lib/formatters/chart-presentation.ts | 4 +- .../cli/src/lib/formatters/conversation.ts | 41 +-- packages/cli/src/lib/formatters/dashboard.ts | 8 +- .../src/lib/formatters/explore-timeseries.ts | 6 +- packages/cli/src/lib/formatters/feedback.ts | 6 +- packages/cli/src/lib/formatters/highlight.ts | 5 +- packages/cli/src/lib/formatters/human.ts | 50 +-- packages/cli/src/lib/formatters/json.ts | 6 +- packages/cli/src/lib/formatters/local.ts | 61 ++-- packages/cli/src/lib/formatters/log.ts | 6 +- packages/cli/src/lib/formatters/markdown.ts | 12 +- packages/cli/src/lib/formatters/output.ts | 14 +- .../cli/src/lib/formatters/pixel-canvas.ts | 2 +- .../cli/src/lib/formatters/plain-detect.ts | 6 +- packages/cli/src/lib/formatters/replay.ts | 12 +- .../lib/formatters/saved-transformations.ts | 2 +- .../src/lib/formatters/semantic-display.ts | 14 +- .../cli/src/lib/formatters/sixel-dashboard.ts | 4 +- packages/cli/src/lib/formatters/text-table.ts | 6 +- packages/cli/src/lib/formatters/trace.ts | 12 +- packages/cli/src/lib/games/leaderboard-api.ts | 2 +- packages/cli/src/lib/ghcr.ts | 6 +- packages/cli/src/lib/git.ts | 6 +- packages/cli/src/lib/help.ts | 13 +- packages/cli/src/lib/hex-id-recovery.ts | 6 +- packages/cli/src/lib/http1-dispatcher.ts | 12 +- packages/cli/src/lib/id-arguments.ts | 8 +- packages/cli/src/lib/interactive-login.ts | 21 +- packages/cli/src/lib/introspect.ts | 6 +- packages/cli/src/lib/issue-identifier.ts | 7 +- packages/cli/src/lib/issue-links.ts | 16 +- packages/cli/src/lib/jvm-bundle.ts | 2 +- packages/cli/src/lib/list-command.ts | 16 +- packages/cli/src/lib/list-filter.ts | 2 +- packages/cli/src/lib/login-host-guard.ts | 4 +- packages/cli/src/lib/mcp.ts | 14 +- packages/cli/src/lib/mcp/args.ts | 48 +-- packages/cli/src/lib/mcp/config.ts | 16 +- packages/cli/src/lib/mcp/scope-check.ts | 2 +- packages/cli/src/lib/mcp/server.ts | 45 ++- packages/cli/src/lib/mutate-command.ts | 14 +- packages/cli/src/lib/oauth.ts | 6 +- packages/cli/src/lib/omit-undefined.ts | 39 +++ packages/cli/src/lib/org-list.ts | 38 ++- packages/cli/src/lib/polling.ts | 4 +- packages/cli/src/lib/project-context.ts | 4 +- packages/cli/src/lib/prompt.ts | 11 +- .../cli/src/lib/react-native/wrap-call.ts | 28 +- .../cli/src/lib/react-native/xcode-env.ts | 51 +-- packages/cli/src/lib/region.ts | 4 +- packages/cli/src/lib/release-notes.ts | 8 +- packages/cli/src/lib/replay-rrweb.ts | 4 +- packages/cli/src/lib/resolve-target.ts | 45 +-- packages/cli/src/lib/resolve-team.ts | 4 +- packages/cli/src/lib/response-cache.ts | 2 +- packages/cli/src/lib/rethrow.ts | 13 + packages/cli/src/lib/route-map.ts | 2 +- packages/cli/src/lib/scan/concurrent.ts | 6 +- packages/cli/src/lib/scan/grep.ts | 4 +- packages/cli/src/lib/scan/regex.ts | 2 +- packages/cli/src/lib/scan/types.ts | 52 +-- packages/cli/src/lib/scan/walker.ts | 3 +- packages/cli/src/lib/scan/worker-pool.ts | 7 +- packages/cli/src/lib/sdk-invoke.ts | 12 +- packages/cli/src/lib/select-ui/types.ts | 4 +- packages/cli/src/lib/sentry-client.ts | 16 +- packages/cli/src/lib/sentry-url-parser.ts | 16 +- packages/cli/src/lib/sentryclirc-import.ts | 16 +- packages/cli/src/lib/sentryclirc.ts | 14 +- packages/cli/src/lib/setup-code.ts | 2 +- packages/cli/src/lib/shell.ts | 6 +- packages/cli/src/lib/sixel.ts | 10 +- packages/cli/src/lib/snapshots/archive.ts | 8 +- packages/cli/src/lib/snapshots/images.ts | 1 + packages/cli/src/lib/sourcemap/debug-id.ts | 2 +- packages/cli/src/lib/sourcemap/inject.ts | 18 +- packages/cli/src/lib/sourcemap/zip.ts | 2 +- packages/cli/src/lib/target-positional.ts | 2 +- packages/cli/src/lib/telemetry.ts | 39 ++- .../cli/src/lib/telemetry/zstd-transport.ts | 22 +- packages/cli/src/lib/time-range.ts | 4 +- packages/cli/src/lib/timezone.ts | 4 +- packages/cli/src/lib/token-claims.ts | 12 +- packages/cli/src/lib/trace-target.ts | 6 +- packages/cli/src/lib/upgrade.ts | 17 +- packages/cli/src/lib/utils.ts | 6 +- packages/cli/src/lib/version-check.ts | 4 +- packages/cli/src/lib/which.ts | 2 +- packages/cli/src/lib/windows-path.ts | 2 +- packages/cli/src/mcp-server.ts | 4 +- packages/cli/src/root-help-routes.ts | 3 +- packages/cli/src/types/dashboard.ts | 7 +- packages/cli/src/types/feedback.ts | 4 +- packages/cli/src/types/sentry.ts | 2 +- .../commands/agent-conversation/list.test.ts | 93 ++--- .../commands/agent-conversation/view.test.ts | 81 ++--- .../test/commands/alert/issues/create.test.ts | 7 +- .../test/commands/alert/issues/delete.test.ts | 19 +- .../test/commands/alert/issues/edit.test.ts | 5 +- .../test/commands/alert/issues/list.test.ts | 6 +- .../test/commands/alert/issues/view.test.ts | 5 +- .../commands/alert/metrics/create.test.ts | 5 +- .../commands/alert/metrics/delete.test.ts | 15 +- .../test/commands/alert/metrics/edit.test.ts | 5 +- .../test/commands/alert/metrics/list.test.ts | 6 +- .../test/commands/alert/metrics/view.test.ts | 5 +- .../cli/test/commands/api.property.test.ts | 4 +- packages/cli/test/commands/api.test.ts | 12 +- .../cli/test/commands/attribute/list.test.ts | 24 +- .../cli/test/commands/auth/default.test.ts | 5 +- .../test/commands/auth/login-force.test.ts | 19 +- packages/cli/test/commands/auth/login.test.ts | 217 ++++++------ .../cli/test/commands/auth/logout.test.ts | 6 +- .../cli/test/commands/auth/refresh.test.ts | 50 ++- .../cli/test/commands/auth/status.test.ts | 84 ++--- .../cli/test/commands/auth/switch.test.ts | 11 +- .../cli/test/commands/auth/whoami.test.ts | 52 ++- packages/cli/test/commands/bash-hook.test.ts | 7 +- .../cli/test/commands/build/download.test.ts | 7 +- .../cli/test/commands/build/upload.test.ts | 30 +- packages/cli/test/commands/cli.test.ts | 30 +- .../cli/test/commands/cli/completion.test.ts | 2 +- .../cli/test/commands/cli/defaults.test.ts | 133 ++++---- packages/cli/test/commands/cli/fix.test.ts | 50 +-- packages/cli/test/commands/cli/setup.test.ts | 2 +- .../cli/test/commands/cli/uninstall.test.ts | 2 +- .../cli/test/commands/cli/upgrade.test.ts | 38 ++- .../commands/code-mappings/upload.test.ts | 20 +- .../commands/dart-symbol-map/upload.test.ts | 8 +- .../test/commands/dashboard/create.test.ts | 63 ++-- .../cli/test/commands/dashboard/list.test.ts | 118 +++---- .../test/commands/dashboard/resolve.test.ts | 66 ++-- .../test/commands/dashboard/restore.test.ts | 60 ++-- .../test/commands/dashboard/revisions.test.ts | 70 ++-- .../commands/dashboard/widget/add.test.ts | 268 ++++++++------- .../commands/dashboard/widget/delete.test.ts | 70 ++-- .../commands/dashboard/widget/edit.test.ts | 256 +++++++------- .../dashboard/widget/preservation.test.ts | 14 +- .../commands/debug-files/bundle-jvm.test.ts | 12 +- .../debug-files/bundle-sources.test.ts | 2 +- .../test/commands/debug-files/check.test.ts | 2 +- .../test/commands/debug-files/find.test.ts | 2 +- .../debug-files/print-sources.test.ts | 2 +- .../test/commands/debug-files/upload.test.ts | 76 +++-- packages/cli/test/commands/docs.test.ts | 10 +- packages/cli/test/commands/dsn/list.test.ts | 9 +- .../commands/event/analytics.func.test.ts | 22 +- .../cli/test/commands/event/list.func.test.ts | 75 ++-- packages/cli/test/commands/event/send.test.ts | 14 +- packages/cli/test/commands/event/view.test.ts | 149 ++++---- packages/cli/test/commands/explore.test.ts | 101 +++--- .../cli/test/commands/feedback/list.test.ts | 51 ++- .../cli/test/commands/feedback/status.test.ts | 14 +- .../cli/test/commands/feedback/utils.test.ts | 8 +- .../cli/test/commands/feedback/view.test.ts | 47 ++- .../test/commands/games/leaderboard.test.ts | 12 +- .../cli/test/commands/games/snake.test.ts | 3 +- packages/cli/test/commands/info.test.ts | 13 +- packages/cli/test/commands/init.test.ts | 9 +- .../test/commands/integration/delete.test.ts | 40 +-- .../test/commands/integration/list.test.ts | 36 +- .../test/commands/issue/archive.func.test.ts | 41 +-- .../test/commands/issue/events.func.test.ts | 91 +++-- .../test/commands/issue/explain.func.test.ts | 28 +- .../cli/test/commands/issue/link.func.test.ts | 11 +- .../test/commands/issue/list.property.test.ts | 14 +- packages/cli/test/commands/issue/list.test.ts | 142 ++++---- .../test/commands/issue/merge.func.test.ts | 134 ++++---- .../cli/test/commands/issue/plan.func.test.ts | 16 +- .../issue/resolve-commit-spec.test.ts | 13 +- .../test/commands/issue/resolve.func.test.ts | 74 ++-- .../issue/short-id-resolution.test.ts | 2 +- packages/cli/test/commands/issue/tags.test.ts | 15 +- .../test/commands/issue/unlink.func.test.ts | 15 +- .../cli/test/commands/issue/utils.test.ts | 74 +--- .../cli/test/commands/issue/view.func.test.ts | 58 ++-- .../test/commands/local/control-plane.test.ts | 5 +- .../commands/local/daemon-lifecycle.test.ts | 14 +- .../commands/local/daemon-startup.test.ts | 7 +- .../cli/test/commands/local/envelope.test.ts | 4 +- .../commands/local/receiver-ingest.test.ts | 27 +- packages/cli/test/commands/local/run.test.ts | 30 +- .../cli/test/commands/local/server.test.ts | 15 +- packages/cli/test/commands/log/list.test.ts | 316 +++++++++-------- .../cli/test/commands/log/view.func.test.ts | 97 +++--- packages/cli/test/commands/log/view.test.ts | 68 ++-- .../cli/test/commands/monitor/run.test.ts | 17 +- packages/cli/test/commands/org/list.test.ts | 87 ++--- .../cli/test/commands/platform/list.test.ts | 16 +- .../cli/test/commands/proguard/upload.test.ts | 17 +- .../cli/test/commands/project/create.test.ts | 323 ++++++++++-------- .../cli/test/commands/project/delete.test.ts | 92 ++--- .../cli/test/commands/project/list.test.ts | 48 ++- .../test/commands/project/view.func.test.ts | 85 ++--- .../test/commands/react-native/gradle.test.ts | 41 ++- .../test/commands/react-native/xcode.test.ts | 38 ++- .../cli/test/commands/release/archive.test.ts | 41 +-- .../cli/test/commands/release/create.test.ts | 53 +-- .../cli/test/commands/release/delete.test.ts | 56 +-- .../cli/test/commands/release/deploy.test.ts | 49 +-- .../test/commands/release/finalize.test.ts | 43 +-- .../commands/release/propose-version.test.ts | 33 +- .../test/commands/release/set-commits.test.ts | 125 +++---- .../cli/test/commands/release/view.test.ts | 53 +-- .../cli/test/commands/replay/download.test.ts | 40 +-- .../cli/test/commands/replay/list.test.ts | 70 ++-- .../cli/test/commands/replay/view.test.ts | 81 ++--- packages/cli/test/commands/repo/list.test.ts | 121 ++++--- .../cli/test/commands/schema-path.test.ts | 34 +- .../cli/test/commands/send-envelope.test.ts | 16 +- .../cli/test/commands/snapshots/diff.test.ts | 17 +- .../test/commands/snapshots/download.test.ts | 11 +- .../test/commands/snapshots/upload.test.ts | 78 +++-- .../test/commands/sourcemap/inject.test.ts | 5 +- .../test/commands/sourcemap/upload.test.ts | 21 +- packages/cli/test/commands/span/list.test.ts | 93 +++-- packages/cli/test/commands/span/view.test.ts | 41 ++- .../cli/test/commands/status/show.test.ts | 3 +- packages/cli/test/commands/team/list.test.ts | 151 ++++---- .../cli/test/commands/token/accounts.test.ts | 8 +- .../cli/test/commands/token/create.test.ts | 39 +-- .../cli/test/commands/token/delete.test.ts | 40 +-- packages/cli/test/commands/token/list.test.ts | 32 +- packages/cli/test/commands/trace/list.test.ts | 111 +++--- packages/cli/test/commands/trace/logs.test.ts | 93 +++-- .../cli/test/commands/trace/view.func.test.ts | 144 ++++---- packages/cli/test/commands/trace/view.test.ts | 22 +- packages/cli/test/commands/trial/list.test.ts | 78 +++-- .../cli/test/commands/trial/start.test.ts | 102 +++--- packages/cli/test/commands/wasm-split.test.ts | 3 +- packages/cli/test/constants.ts | 2 +- packages/cli/test/e2e/api.test.ts | 6 +- packages/cli/test/e2e/bundle-setup.ts | 2 +- packages/cli/test/e2e/delta-upgrade.test.ts | 2 +- packages/cli/test/e2e/explore.test.ts | 4 +- packages/cli/test/e2e/feedback.test.ts | 10 +- packages/cli/test/e2e/library.test.ts | 4 +- packages/cli/test/e2e/local.test.ts | 9 +- packages/cli/test/e2e/migration.test.ts | 2 +- packages/cli/test/e2e/multiregion.test.ts | 8 +- packages/cli/test/e2e/skill-eval.test.ts | 8 +- packages/cli/test/e2e/telemetry-exit.test.ts | 2 +- .../cli/test/eval-common/anthropic-client.ts | 10 +- packages/cli/test/fixture.ts | 4 +- packages/cli/test/fixtures/bench/generate.ts | 9 +- packages/cli/test/fixtures/bench/helpers.ts | 61 +++- .../cli/test/fixtures/local-agent-server.ts | 6 +- packages/cli/test/helpers.ts | 145 +++++++- .../cli/test/lib/account-selection.test.ts | 2 +- packages/cli/test/lib/alias.property.test.ts | 5 +- .../cli/test/lib/api-client.coverage.test.ts | 33 +- .../test/lib/api-client.multiregion.test.ts | 47 +-- packages/cli/test/lib/api-client.seer.test.ts | 2 +- packages/cli/test/lib/api-client.test.ts | 92 ++--- packages/cli/test/lib/api/alerts.test.ts | 54 +-- .../cli/test/lib/api/chunk-upload.test.ts | 2 +- .../cli/test/lib/api/conversations.test.ts | 10 +- packages/cli/test/lib/api/dashboards.test.ts | 18 +- packages/cli/test/lib/api/debug-files.test.ts | 152 ++++----- packages/cli/test/lib/api/explore.test.ts | 10 +- .../cli/test/lib/api/infrastructure.test.ts | 64 ++-- .../cli/test/lib/api/integrations.test.ts | 4 +- .../cli/test/lib/api/issue-app-links.test.ts | 18 +- .../test/lib/api/issue-integrations.test.ts | 6 +- packages/cli/test/lib/api/logs.test.ts | 15 +- packages/cli/test/lib/api/monitors.test.ts | 2 +- .../api/organizations-context.focused.test.ts | 4 +- .../cli/test/lib/api/organizations.test.ts | 4 +- .../test/lib/api/preprod-artifacts.test.ts | 22 +- .../cli/test/lib/api/project-dsns.test.ts | 4 +- packages/cli/test/lib/api/projects.test.ts | 15 - packages/cli/test/lib/api/releases.test.ts | 10 +- packages/cli/test/lib/api/replays.test.ts | 13 +- .../cli/test/lib/api/repositories.test.ts | 14 +- packages/cli/test/lib/api/traces.test.ts | 42 +-- packages/cli/test/lib/app-identity.test.ts | 10 +- packages/cli/test/lib/arg-parsing.test.ts | 39 +-- .../cli/test/lib/argument-conventions.test.ts | 7 +- packages/cli/test/lib/auth-hint.test.ts | 43 +-- packages/cli/test/lib/auto-auth.test.ts | 10 +- .../test/lib/auto-paginate.property.test.ts | 5 +- packages/cli/test/lib/bench/generate.test.ts | 4 +- packages/cli/test/lib/bench/helpers.test.ts | 15 +- packages/cli/test/lib/binary.test.ts | 2 + packages/cli/test/lib/bootstrap-auth.test.ts | 12 +- .../cli/test/lib/bspatch.property.test.ts | 13 +- .../lib/build/car-extract.integration.test.ts | 7 +- packages/cli/test/lib/build/dsyms.test.ts | 9 +- .../test/lib/build/zip-writer.mocked.test.ts | 5 +- .../cli/test/lib/build/zip-writer.test.ts | 13 +- packages/cli/test/lib/bytes.test.ts | 20 ++ packages/cli/test/lib/chunk-loader.test.ts | 4 +- .../test/lib/command-api-references.test.ts | 2 +- .../cli/test/lib/command-examples.test.ts | 4 +- packages/cli/test/lib/command.test.ts | 206 ++++++----- packages/cli/test/lib/complete.test.ts | 18 +- .../cli/test/lib/completion-warmup.test.ts | 1 + .../cli/test/lib/completions.property.test.ts | 9 +- packages/cli/test/lib/config.test.ts | 13 +- packages/cli/test/lib/constants.test.ts | 32 +- .../cli/test/lib/context-recovery.test.ts | 63 ++-- packages/cli/test/lib/custom-ca.test.ts | 69 ++-- packages/cli/test/lib/custom-headers.test.ts | 116 +++---- .../cli/test/lib/db/account-routing.test.ts | 119 +++---- packages/cli/test/lib/db/accounts.test.ts | 4 +- .../lib/db/auth-concurrency.focused.test.ts | 13 +- packages/cli/test/lib/db/auth.host.test.ts | 59 ++-- .../cli/test/lib/db/auth.property.test.ts | 24 +- packages/cli/test/lib/db/auth.test.ts | 81 ++--- packages/cli/test/lib/db/concurrent-worker.ts | 34 +- .../test/lib/db/dsn-cache.model-based.test.ts | 8 +- packages/cli/test/lib/db/dsn-cache.test.ts | 8 +- packages/cli/test/lib/db/migration.test.ts | 12 +- packages/cli/test/lib/db/model-based.test.ts | 30 +- packages/cli/test/lib/db/resilient.test.ts | 6 +- .../lib/db/schema-downgrade.focused.test.ts | 8 +- packages/cli/test/lib/db/schema.test.ts | 10 +- packages/cli/test/lib/db/utils.test.ts | 4 +- packages/cli/test/lib/detect-agent.test.ts | 5 + packages/cli/test/lib/dif/find.test.ts | 3 +- packages/cli/test/lib/dif/index.test.ts | 2 +- .../cli/test/lib/dsn/code-scanner.test.ts | 21 +- packages/cli/test/lib/dsn/detector.test.ts | 24 +- packages/cli/test/lib/dsn/env-file.test.ts | 12 +- packages/cli/test/lib/dsn/env.test.ts | 32 +- packages/cli/test/lib/dsn/errors.test.ts | 10 +- packages/cli/test/lib/dsn/fifo-safety.test.ts | 25 +- .../cli/test/lib/dsn/home-fallback.test.ts | 8 +- packages/cli/test/lib/dsn/resolver.test.ts | 41 ++- packages/cli/test/lib/env-token-host.test.ts | 24 +- packages/cli/test/lib/env.test.ts | 2 +- .../test/lib/envelope/event-builder.test.ts | 6 +- .../test/lib/envelope/event-send-dsn.test.ts | 16 +- .../cli/test/lib/envelope/transport.test.ts | 16 +- packages/cli/test/lib/error-reporting.test.ts | 73 ++-- packages/cli/test/lib/errors.test.ts | 3 +- .../cli/test/lib/formatters/alerts.test.ts | 30 +- .../test/lib/formatters/chart-core.test.ts | 7 +- .../cli/test/lib/formatters/colors.test.ts | 28 +- .../test/lib/formatters/conversation.test.ts | 74 ++-- .../dashboard-sixel-integration.test.ts | 15 +- .../cli/test/lib/formatters/dashboard.test.ts | 49 +-- .../lib/formatters/event-outcomes.test.ts | 5 +- .../lib/formatters/explore-timeseries.test.ts | 67 ++-- .../cli/test/lib/formatters/feedback.test.ts | 29 +- .../test/lib/formatters/human.details.test.ts | 54 +-- .../cli/test/lib/formatters/human.test.ts | 17 +- .../test/lib/formatters/issue-links.test.ts | 2 +- .../test/lib/formatters/issue-tags.test.ts | 9 +- packages/cli/test/lib/formatters/json.test.ts | 42 +-- .../cli/test/lib/formatters/local.test.ts | 57 ++-- packages/cli/test/lib/formatters/log.test.ts | 19 +- .../cli/test/lib/formatters/output.test.ts | 6 +- .../lib/formatters/semantic-display.test.ts | 3 +- .../test/lib/formatters/sql.property.test.ts | 22 +- packages/cli/test/lib/formatters/sql.test.ts | 32 +- .../cli/test/lib/formatters/table.test.ts | 45 +-- .../lib/formatters/trace.property.test.ts | 38 +-- .../cli/test/lib/formatters/trace.test.ts | 16 +- packages/cli/test/lib/fuzzy.test.ts | 3 +- packages/cli/test/lib/games/score.test.ts | 3 +- packages/cli/test/lib/ghcr.test.ts | 9 +- packages/cli/test/lib/help-positional.test.ts | 15 +- .../cli/test/lib/http1-dispatcher.test.ts | 8 +- packages/cli/test/lib/index.test.ts | 18 +- packages/cli/test/lib/ini.test.ts | 70 ++-- .../cli/test/lib/install-ps1-script.test.ts | 25 +- packages/cli/test/lib/install-scenarios.ts | 22 +- packages/cli/test/lib/install-script.test.ts | 50 +-- .../cli/test/lib/interactive-login.test.ts | 25 +- .../cli/test/lib/introspect.property.test.ts | 10 +- packages/cli/test/lib/introspect.test.ts | 30 +- .../lib/issue-1568-routing.focused.test.ts | 6 +- packages/cli/test/lib/issue-arguments.test.ts | 8 +- packages/cli/test/lib/list-command.test.ts | 25 +- packages/cli/test/lib/mcp-auth.test.ts | 16 +- packages/cli/test/lib/mcp-command.test.ts | 6 +- packages/cli/test/lib/mcp-login.test.ts | 2 +- packages/cli/test/lib/mcp-start.test.ts | 86 ++--- packages/cli/test/lib/mcp/config.test.ts | 15 +- .../lib/mcp/disabled-skills-warning.test.ts | 8 +- packages/cli/test/lib/mcp/parse-flags.ts | 2 +- .../test/lib/mcp/telemetry-init-scope.test.ts | 3 +- packages/cli/test/lib/mcp/telemetry.test.ts | 14 +- packages/cli/test/lib/oauth.test.ts | 19 +- packages/cli/test/lib/omit-undefined.test.ts | 17 + packages/cli/test/lib/org-list-budget.test.ts | 6 +- packages/cli/test/lib/org-list.test.ts | 238 ++++++------- .../cli/test/lib/paginate.property.test.ts | 4 +- .../cli/test/lib/positional-parse.test.ts | 3 +- .../cli/test/lib/proguard.property.test.ts | 3 +- packages/cli/test/lib/project-context.test.ts | 4 +- .../cli/test/lib/promises.property.test.ts | 5 +- .../test/lib/react-native/wrap-call.test.ts | 5 +- .../test/lib/react-native/xcode-env.test.ts | 6 +- packages/cli/test/lib/region.test.ts | 49 +-- packages/cli/test/lib/release-notes.test.ts | 12 +- .../test/lib/release-parse.property.test.ts | 8 +- packages/cli/test/lib/replay-rrweb.test.ts | 14 +- .../test/lib/resolve-effective-org.test.ts | 16 +- .../test/lib/resolve-target-listing.test.ts | 194 +++++++---- .../test/lib/resolve-target-picker.test.ts | 2 +- .../test/lib/resolve-target.mocked.test.ts | 171 ++++++---- packages/cli/test/lib/resolve-target.test.ts | 94 ++--- packages/cli/test/lib/response-cache.test.ts | 18 +- packages/cli/test/lib/route-registry.test.ts | 4 +- packages/cli/test/lib/scan/concurrent.test.ts | 5 +- .../cli/test/lib/scan/grep.property.test.ts | 3 +- packages/cli/test/lib/scan/grep.test.ts | 3 +- .../lib/scanner-flags.integration.test.ts | 2 +- .../lib/sdk-invoke-isolation.focused.test.ts | 15 +- packages/cli/test/lib/sdk-invoke.test.ts | 61 ++-- .../cli/test/lib/sdk-no-persistence.test.ts | 46 ++- packages/cli/test/lib/sea-assets.test.ts | 7 +- .../cli/test/lib/search-query.warn.test.ts | 9 +- .../security/auto-login-host-guard.test.ts | 4 +- .../lib/security/custom-headers-leak.test.ts | 20 +- .../lib/security/fetch-layer-guard.test.ts | 28 +- .../security/login-token-rc-poison.test.ts | 14 +- .../lib/security/refresh-token-poison.test.ts | 19 +- .../security/sentryclirc-url-poison.test.ts | 45 +-- .../security/sntrys-claim-mismatch.test.ts | 51 ++- .../test/lib/security/url-arg-poison.test.ts | 44 +-- packages/cli/test/lib/seer-trial.test.ts | 18 +- .../cli/test/lib/sentry-client.auth.test.ts | 12 +- .../test/lib/sentry-client.base-url.test.ts | 22 +- .../lib/sentry-client.response-body.test.ts | 13 +- packages/cli/test/lib/sentry-client.test.ts | 12 +- .../cli/test/lib/sentry-url-parser.test.ts | 71 ++-- .../test/lib/sentry-urls.credential.test.ts | 8 +- .../cli/test/lib/sentry-urls.property.test.ts | 24 +- .../cli/test/lib/sentryclirc.property.test.ts | 6 +- packages/cli/test/lib/sentryclirc.test.ts | 49 +-- packages/cli/test/lib/sixel-image.test.ts | 3 +- packages/cli/test/lib/sixel.test.ts | 20 +- packages/cli/test/lib/telemetry-ci.test.ts | 7 +- .../test/lib/telemetry-credentials.test.ts | 13 +- .../cli/test/lib/telemetry-session.test.ts | 17 +- packages/cli/test/lib/telemetry.test.ts | 22 +- .../test/lib/telemetry/offline-store.test.ts | 4 +- .../telemetry/offline-transport.e2e.test.ts | 7 +- .../lib/telemetry/zstd-transport.e2e.test.ts | 11 +- .../test/lib/telemetry/zstd-transport.test.ts | 139 ++++---- .../cli/test/lib/time-range.property.test.ts | 3 +- packages/cli/test/lib/timezone.mocked.test.ts | 18 +- packages/cli/test/lib/timezone.test.ts | 24 +- packages/cli/test/lib/tips.test.ts | 2 +- .../lib/trace-log-schema.property.test.ts | 2 +- packages/cli/test/lib/trace-target.test.ts | 28 +- packages/cli/test/lib/trials.test.ts | 6 +- .../lib/unknown-command-telemetry.test.ts | 12 +- packages/cli/test/lib/upgrade.test.ts | 11 +- packages/cli/test/lib/version-check.test.ts | 19 +- packages/cli/test/lib/wasm/helpers.ts | 7 +- packages/cli/test/lib/windows-path.test.ts | 18 +- packages/cli/test/mock-exports.ts | 27 ++ packages/cli/test/mocks/multiregion.ts | 28 +- packages/cli/test/mocks/routes.ts | 108 +++--- packages/cli/test/mocks/server.ts | 51 ++- packages/cli/test/preload.ts | 34 +- packages/cli/test/script/command-api.test.ts | 56 +++ packages/cli/test/script/dev-runner.test.ts | 7 +- .../cli/test/script/eval-provider.test.ts | 18 +- .../test/script/generate-api-schema.test.ts | 1 + .../cli/test/script/source-api-usage.test.ts | 3 +- .../test/script/ts-codegen.property.test.ts | 2 +- .../test/script/zod-v3-stub-plugin.test.ts | 9 +- .../cli/test/skill-eval/helpers/llm-client.ts | 6 +- .../cli/test/skill-eval/helpers/verify.ts | 3 +- .../cli/test/types/dashboard.property.test.ts | 5 +- packages/cli/test/types/dashboard.test.ts | 5 +- 663 files changed, 8777 insertions(+), 7403 deletions(-) create mode 100644 packages/cli/src/lib/bytes.ts create mode 100644 packages/cli/src/lib/omit-undefined.ts create mode 100644 packages/cli/src/lib/rethrow.ts create mode 100644 packages/cli/test/lib/bytes.test.ts create mode 100644 packages/cli/test/lib/omit-undefined.test.ts create mode 100644 packages/cli/test/mock-exports.ts create mode 100644 packages/cli/test/script/command-api.test.ts diff --git a/packages/cli/.vscode/settings.json b/packages/cli/.vscode/settings.json index 5359e4ecfe..e0c49189e5 100644 --- a/packages/cli/.vscode/settings.json +++ b/packages/cli/.vscode/settings.json @@ -1,6 +1,7 @@ { "editor.defaultFormatter": "oxc.oxc-vscode", - "typescript.tsdk": "node_modules/typescript/lib", + "js/ts.experimental.useTsgo": true, + "js/ts.tsdk.path": "./node_modules/typescript", "editor.formatOnSave": true, "editor.formatOnPaste": true, "emmet.showExpandedAbbreviation": "never", diff --git a/packages/cli/DEVELOPMENT.md b/packages/cli/DEVELOPMENT.md index eb0c62afa8..19f2e68e5f 100644 --- a/packages/cli/DEVELOPMENT.md +++ b/packages/cli/DEVELOPMENT.md @@ -4,7 +4,7 @@ - [Node.js](https://nodejs.org/) v22.15+ installed -- [pnpm](https://pnpm.io/) v11.8+ installed +- [pnpm](https://pnpm.io/) v12.18+ installed - A Sentry OAuth application client ID for builds, self-hosted Sentry, or a custom OAuth app (create one at https://sentry.io/settings/account/api/applications/) diff --git a/packages/cli/README.md b/packages/cli/README.md index 9b535b030e..57a4151336 100644 --- a/packages/cli/README.md +++ b/packages/cli/README.md @@ -136,7 +136,7 @@ Errors are thrown as `SentryError` with `.exitCode` and `.stderr`. ### Prerequisites -- [Node.js](https://nodejs.org) v22.15+ and [pnpm](https://pnpm.io) v11.8+ +- [Node.js](https://nodejs.org) v22.15+ and [pnpm](https://pnpm.io) v12.18+ ### Setup diff --git a/packages/cli/script/bench-sweep.ts b/packages/cli/script/bench-sweep.ts index cfe1a13b98..06190f1ced 100644 --- a/packages/cli/script/bench-sweep.ts +++ b/packages/cli/script/bench-sweep.ts @@ -133,7 +133,6 @@ function parseArgs(argv: readonly string[]): SweepArgs { case "--help": { printHelp(); process.exit(0); - break; } default: throw new Error(`Unknown flag: ${arg}`); @@ -233,7 +232,8 @@ async function runSweep(args: SweepArgs): Promise { const results: SweepResult[] = []; // Silence CLI telemetry — we don't want Sentry events from bench runs. - process.env.SENTRY_CLI_NO_TELEMETRY = "1"; + // Silence CLI telemetry — we don't want Sentry events from bench runs. + process.env["SENTRY_CLI_NO_TELEMETRY"] = "1"; for (const fx of fixtures) { if (!existsSync(fx.rootDir)) { @@ -262,10 +262,11 @@ async function sweepFixture( ): Promise { for (const op of ops) { for (const concurrency of args.values) { + const setup = op.setup; const samples = await measure(() => op.run(fx.rootDir, concurrency), { runs: args.runs, warmup: args.warmup, - beforeEach: op.setup ? () => op.setup?.(fx.rootDir) : undefined, + ...(setup && { beforeEach: () => setup(fx.rootDir) }), }); const stats = summarize(samples); results.push({ diff --git a/packages/cli/script/bench.ts b/packages/cli/script/bench.ts index 62d17e58f7..2492bed6ac 100644 --- a/packages/cli/script/bench.ts +++ b/packages/cli/script/bench.ts @@ -39,7 +39,13 @@ * 1 - Invalid args, or --compare detected a p50 regression over threshold */ -import { existsSync, mkdirSync, readFileSync, rmSync } from "node:fs"; +import { + type Dirent, + existsSync, + mkdirSync, + readFileSync, + rmSync, +} from "node:fs"; import { readdir } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join, resolve } from "node:path"; @@ -167,12 +173,10 @@ function applyFlag( case "-h": { printHelp(); process.exit(0); - break; } case "--help": { printHelp(); process.exit(0); - break; } default: throw new Error(`Unknown flag: ${arg}`); @@ -183,18 +187,21 @@ function parseArgs(argv: readonly string[]): CliArgs { const state: ParseState = { sizes: [...PRESET_NAMES], opFilter: undefined, - repo: process.env.BENCH_REPO, - runs: Number(process.env.BENCH_RUNS ?? 10), - warmup: Number(process.env.BENCH_WARMUP ?? 3), + repo: process.env["BENCH_REPO"], + runs: Number(process.env["BENCH_RUNS"] ?? 10), + warmup: Number(process.env["BENCH_WARMUP"] ?? 3), json: false, saveBaseline: false, compare: false, regenFixtures: false, }; - const thresholdPct = Number(process.env.BENCH_THRESHOLD ?? 0.2); + const thresholdPct = Number(process.env["BENCH_THRESHOLD"] ?? 0.2); for (let i = 0; i < argv.length; i += 1) { const arg = argv[i]; + if (arg === undefined) { + continue; + } const next = argv[i + 1]; if (applyFlag(state, arg, next)) { i += 1; @@ -287,7 +294,7 @@ async function roughFileCount(root: string): Promise { ]); let count = 0; async function walk(dir: string): Promise { - let entries: Awaited>; + let entries: Dirent[]; try { entries = await readdir(dir, { withFileTypes: true }); } catch { @@ -477,7 +484,9 @@ async function buildOps(): Promise { ]; for (let i = 0; i < 10_000; i += 1) { const q = queries[i % queries.length]; - stack.isIgnored(q, false); + if (q !== undefined) { + stack.isIgnored(q, false); + } } }, }, @@ -534,11 +543,17 @@ async function runAll( } await withBenchDb(async () => { for (const op of ops) { - const samples = await measure(() => op.run(fx.rootDir), { - runs: args.runs, - warmup: args.warmup, - beforeEach: op.setup ? () => op.setup?.(fx.rootDir) : undefined, - }); + const setup = op.setup; + const samples = await measure( + async () => { + await op.run(fx.rootDir); + }, + { + runs: args.runs, + warmup: args.warmup, + ...(setup && { beforeEach: () => setup(fx.rootDir) }), + }, + ); const stats = summarize(samples); entries.push({ fixture: fx.label, @@ -593,7 +608,8 @@ async function main(): Promise { } // Silence CLI telemetry — we don't want bench runs filing Sentry events. - process.env.SENTRY_CLI_NO_TELEMETRY = "1"; + // Silence CLI telemetry — we don't want bench runs filing Sentry events. + process.env["SENTRY_CLI_NO_TELEMETRY"] = "1"; let fixtures: FixtureHandle[]; let ops: OpEntry[]; diff --git a/packages/cli/script/build.ts b/packages/cli/script/build.ts index 0520a6768a..431adc61fa 100644 --- a/packages/cli/script/build.ts +++ b/packages/cli/script/build.ts @@ -67,7 +67,7 @@ const NODE_VERSION = "lts"; * Optional OAuth client ID override baked into the binary. When unset, the * binary uses the committed sentry.io default in src/lib/oauth.ts. */ -const SENTRY_CLIENT_ID = process.env.SENTRY_CLIENT_ID; +const SENTRY_CLIENT_ID = process.env["SENTRY_CLIENT_ID"]; /** Build targets configuration */ type BuildTarget = { @@ -267,7 +267,7 @@ async function uploadSourcemapsToSentry( if (injected.length === 0) { return; } - if (!process.env.SENTRY_AUTH_TOKEN) { + if (!process.env["SENTRY_AUTH_TOKEN"]) { logger.info("No SENTRY_AUTH_TOKEN, skipping sourcemap upload"); return; } @@ -357,9 +357,9 @@ async function compileAllTargets( assets, outDir: "dist-bin", outputName: "sentry", - cacheDir: process.env.FOSSILIZE_CACHE_DIR ?? ".node-cache", + cacheDir: process.env["FOSSILIZE_CACHE_DIR"] ?? ".node-cache", concurrencyLimit: Number( - process.env.FOSSILIZE_CONCURRENCY_LIMIT ?? "3", + process.env["FOSSILIZE_CONCURRENCY_LIMIT"] ?? "3", ), noBundle: true, holePunch: true, @@ -370,7 +370,7 @@ async function compileAllTargets( // writes. process.env is untouched, so child processes still // inherit the user's NODE_OPTIONS. ignoreNodeOptions: true, - sign: envFlag(process.env.FOSSILIZE_SIGN), + sign: envFlag(process.env["FOSSILIZE_SIGN"]), }, SEA_MAIN_JS, ); @@ -423,7 +423,7 @@ async function postProcessTarget(target: BuildTarget): Promise { // On main and release branches (RELEASE_BUILD=1), create gzip-compressed // copies for release downloads / GHCR nightly (~70% smaller with hole-punch). - if (process.env.RELEASE_BUILD) { + if (process.env["RELEASE_BUILD"]) { const binary = await readFile(outfile); const compressed = await gzipAsync(Buffer.from(binary), { level: 6 }); await writeFile(`${outfile}.gz`, compressed); diff --git a/packages/cli/script/bundle.ts b/packages/cli/script/bundle.ts index 8bc214702e..f0f02a759f 100644 --- a/packages/cli/script/bundle.ts +++ b/packages/cli/script/bundle.ts @@ -31,7 +31,7 @@ import { logger } from "../src/lib/logger.js"; const VERSION = pkg.version; /** Optional OAuth client ID override; unset uses the default in src/lib/oauth.ts. */ -const SENTRY_CLIENT_ID = process.env.SENTRY_CLIENT_ID; +const SENTRY_CLIENT_ID = process.env["SENTRY_CLIENT_ID"]; logger.start(`Bundling sentry v${VERSION} for npm`); @@ -108,7 +108,7 @@ const plugins: Plugin[] = [ requireAliasPlugin, ]; -if (process.env.SENTRY_AUTH_TOKEN) { +if (process.env["SENTRY_AUTH_TOKEN"]) { logger.info("Sentry auth token found, source maps will be uploaded"); } else { logger.info( @@ -225,7 +225,7 @@ const jsFiles = [...cjsFiles, ...esm.files]; // Always inject debug IDs (even without auth token); upload needs a token. const injected = await injectDebugIds(jsFiles); logger.log(` Debug IDs injected into ${injected.length} files`); -if (process.env.SENTRY_AUTH_TOKEN && injected.length > 0) { +if (process.env["SENTRY_AUTH_TOKEN"] && injected.length > 0) { // Only delete .map files after a successful upload — preserving them on // failure allows retrying without a full rebuild. if ( diff --git a/packages/cli/script/check-doc-examples.ts b/packages/cli/script/check-doc-examples.ts index fc2a49ddd6..2bd358ca7e 100644 --- a/packages/cli/script/check-doc-examples.ts +++ b/packages/cli/script/check-doc-examples.ts @@ -32,7 +32,7 @@ import { readdirSync } from "node:fs"; import { readFile } from "node:fs/promises"; import { join } from "node:path"; -import ts from "typescript"; +import ts from "@typescript/typescript6"; import { exampleSteps } from "../src/lib/command-example.js"; import type { Command, diff --git a/packages/cli/script/check-env-coverage.ts b/packages/cli/script/check-env-coverage.ts index b1b8fde6ce..c07ddd5fc9 100644 --- a/packages/cli/script/check-env-coverage.ts +++ b/packages/cli/script/check-env-coverage.ts @@ -118,9 +118,10 @@ for (const file of files) { const content = await readFile(file, "utf-8"); fileContents.set(file, content); for (const match of content.matchAll(ENV_CONST_RE)) { + const [, name] = match; const value = match.at(2) ?? match.at(3); - if (value && isUserFacing(value)) { - constMap.set(match[1], value); + if (name && value && isUserFacing(value)) { + constMap.set(name, value); } } } @@ -138,7 +139,10 @@ function record(name: string, file: string, content: string, index: number) { for (const [file, content] of fileContents) { for (const match of content.matchAll(ENV_MEMBER_RE)) { - record(match[1], file, content, match.index); + const [, name] = match; + if (name) { + record(name, file, content, match.index); + } } for (const match of content.matchAll(ENV_BRACKET_RE)) { const ident = match[3]; diff --git a/packages/cli/script/check-patches.ts b/packages/cli/script/check-patches.ts index 7a5d507f02..68555f5985 100644 --- a/packages/cli/script/check-patches.ts +++ b/packages/cli/script/check-patches.ts @@ -50,7 +50,7 @@ import { logger } from "../src/lib/logger.js"; /** * Read `patchedDependencies` from the workspace configuration. * - * pnpm 11 reads workspace-root settings from `pnpm-workspace.yaml`. + * pnpm reads workspace-root settings from `pnpm-workspace.yaml`. */ const WORKSPACE_PATH = "../../pnpm-workspace.yaml"; const PATCHED_DEPENDENCIES_SECTION = /^patchedDependencies:\n((?: {2}.+\n)*)/m; @@ -71,13 +71,12 @@ function parsePatchedDependencies(source: string): Record { const patches: Record = {}; for (const line of section.trimEnd().split("\n")) { - const entry = line.match(PATCHED_DEPENDENCY_ENTRY); - if (!entry) { + const [, key, patchPath] = line.match(PATCHED_DEPENDENCY_ENTRY) ?? []; + if (key === undefined || patchPath === undefined) { throw new Error( `Unsupported patchedDependencies entry in ${WORKSPACE_PATH}: ${line}`, ); } - const [, key, patchPath] = entry; patches[key] = patchPath; } return patches; @@ -137,10 +136,8 @@ function resolveMainEntry(pkgName: string): string { * @returns Absolute path to the resolved file, or null if unresolvable. */ function resolvePackageFile(subpath: string): string | null { - const parts = subpath.split("/"); - const pkgName = subpath.startsWith("@") - ? `${parts[0]}/${parts[1]}` - : parts[0]; + const [first = "", second = ""] = subpath.split("/"); + const pkgName = subpath.startsWith("@") ? `${first}/${second}` : first; const inner = subpath.slice(pkgName.length + 1); try { // Resolve the package's main entry to locate the exact installed copy. @@ -351,7 +348,7 @@ for (const assertion of CONTENT_ASSERTIONS) { } // Emit GitHub Actions annotations for CI visibility -const isCI = !!process.env.CI; +const isCI = !!process.env["CI"]; for (const w of warnings) { if (isCI) { // oxlint-disable-next-line no-console -- GitHub Actions reads workflow commands from stdout; the logger writes to stderr. diff --git a/packages/cli/script/check-stale-references.ts b/packages/cli/script/check-stale-references.ts index 02eedb0f28..ae83400232 100644 --- a/packages/cli/script/check-stale-references.ts +++ b/packages/cli/script/check-stale-references.ts @@ -127,8 +127,7 @@ for (const filePath of FILES_TO_SCAN) { const scannable = isMarkdown ? blankCodeBlocks(content) : content; const lines = scannable.split("\n"); - for (let i = 0; i < lines.length; i++) { - const line = lines[i]; + for (const [i, line] of lines.entries()) { for (const { pattern, reason } of PATTERNS) { if (pattern.test(line)) { findings.push({ diff --git a/packages/cli/script/eval-skill.ts b/packages/cli/script/eval-skill.ts index 8181615352..0e9b8ef786 100644 --- a/packages/cli/script/eval-skill.ts +++ b/packages/cli/script/eval-skill.ts @@ -110,8 +110,8 @@ async function main(): Promise { const client = createClient(provider); const skillContent = await readFile(SKILL_PATH, "utf-8"); const testCases = cases as unknown as TestCase[]; - const threshold = process.env.EVAL_THRESHOLD - ? Number.parseFloat(process.env.EVAL_THRESHOLD) + const threshold = process.env["EVAL_THRESHOLD"] + ? Number.parseFloat(process.env["EVAL_THRESHOLD"]) : DEFAULT_THRESHOLD; logger.info( diff --git a/packages/cli/script/generate-banner-image.ts b/packages/cli/script/generate-banner-image.ts index d872de46ab..84089f247f 100644 --- a/packages/cli/script/generate-banner-image.ts +++ b/packages/cli/script/generate-banner-image.ts @@ -58,6 +58,9 @@ function gradientAt(t: number): [number, number, number] { const f = seg - i; const a = GRADIENT_ANCHORS[i]; const b = GRADIENT_ANCHORS[i + 1]; + if (!(a && b)) { + throw new Error(`No gradient anchors around segment ${i}`); + } return [ Math.round(a[0] + (b[0] - a[0]) * f), Math.round(a[1] + (b[1] - a[1]) * f), @@ -106,7 +109,12 @@ function encodePngBase64(mask: PNG): string { const model = maskModel(mask); const out = new PNG({ width: mask.width, height: mask.height }); for (let y = 0; y < mask.height; y++) { - const [r, g, b] = palette[model.bandForRow(y)]; + const band = model.bandForRow(y); + const color = palette[band]; + if (!color) { + throw new Error(`No palette color for band ${band}`); + } + const [r, g, b] = color; for (let x = 0; x < mask.width; x++) { const i = (y * mask.width + x) * 4; out.data[i] = r; diff --git a/packages/cli/script/generate-command-docs.ts b/packages/cli/script/generate-command-docs.ts index e115dc78c3..b0bfba26d0 100644 --- a/packages/cli/script/generate-command-docs.ts +++ b/packages/cli/script/generate-command-docs.ts @@ -182,7 +182,7 @@ function generateCommandSection(cmd: CommandInfo): string { function isStandaloneCommand(route: RouteInfo): boolean { return ( route.commands.length === 1 && - route.commands[0].path === `sentry ${route.name}` + route.commands[0]?.path === `sentry ${route.name}` ); } diff --git a/packages/cli/script/generate-docs-sections.ts b/packages/cli/script/generate-docs-sections.ts index 2ae604eae4..7901047334 100644 --- a/packages/cli/script/generate-docs-sections.ts +++ b/packages/cli/script/generate-docs-sections.ts @@ -144,7 +144,7 @@ const SKIP_ROUTES = new Set(["help"]); function isStandaloneCommand(route: RouteInfo): boolean { return ( route.commands.length === 1 && - route.commands[0].path === `sentry ${route.name}` + route.commands[0]?.path === `sentry ${route.name}` ); } @@ -210,13 +210,15 @@ function generateProjectStructure(allRoutes: RouteInfo[]): string { // for doc generation but still exists in the filesystem). // Add help before sorting so it lands in correct alphabetical position. const allStandaloneEntries: { name: string; brief: string }[] = - standalones.map((r) => ({ name: r.name, brief: r.commands[0].brief })); + standalones.map((r) => ({ + name: r.name, + brief: r.commands[0]?.brief ?? "", + })); allStandaloneEntries.push({ name: "help", brief: "Help command" }); allStandaloneEntries.sort((a, b) => a.name.localeCompare(b.name)); // Render standalone command files - for (let i = 0; i < allStandaloneEntries.length; i += 1) { - const entry = allStandaloneEntries[i]; + for (const [i, entry] of allStandaloneEntries.entries()) { const isLast = i === allStandaloneEntries.length - 1; const prefix = isLast ? "└──" : "├──"; lines.push( @@ -255,7 +257,7 @@ function groupScopesByResource( ): Map { const groups = new Map(); for (const scope of scopes) { - const resource = scope.split(":")[0]; + const [resource = scope] = scope.split(":"); const existing = groups.get(resource); if (existing) { existing.push(scope); @@ -303,14 +305,14 @@ const SEMVER_RE = /(\d+\.\d+)/; */ function extractPnpmVersion(): string { const pm: string = workspace.packageManager ?? ""; - const match = pm.match(PNPM_VERSION_RE); - if (!match) { + const [, captured] = pm.match(PNPM_VERSION_RE) ?? []; + if (captured === undefined) { throw new Error( `Cannot extract pnpm version from packageManager: "${pm}". ` + "Expected format: pnpm@X.Y.Z", ); } - return match[1]; + return captured; } /** @@ -324,14 +326,14 @@ function extractNodeVersion(): string { if (!constraint) { throw new Error("Missing engines.node in package.json"); } - const match = constraint.match(SEMVER_RE); - if (!match) { + const [, captured] = constraint.match(SEMVER_RE) ?? []; + if (captured === undefined) { throw new Error( `Cannot extract Node.js version from engines.node: "${constraint}". ` + "Expected a semver-like version (e.g., >=22.15)", ); } - return match[1]; + return captured; } /** @@ -349,14 +351,14 @@ function extractDevNodeVersion(): string { if (!constraint) { throw new Error("Missing devEngines.runtime.version and engines.node"); } - const match = constraint.match(SEMVER_RE); - if (!match) { + const [, captured] = constraint.match(SEMVER_RE) ?? []; + if (captured === undefined) { throw new Error( `Cannot extract dev Node.js version from "${constraint}". ` + "Expected a semver-like version (e.g., >=22.15)", ); } - return match[1]; + return captured; } /** Generate dev prerequisite line for README.md. */ @@ -658,7 +660,10 @@ function generateTargetSyntax(): string { const annotations = readGrammarAnnotations(lines); const target = peggy.parser - .parse(targetGrammar, { grammarSource: TARGET_GRAMMAR }) + .parse(targetGrammar, { + grammarSource: TARGET_GRAMMAR, + reservedWords: peggy.RESERVED_WORDS, + }) .rules.find((rule) => rule.name === "target"); if (target?.expression.type !== "choice") { throw new Error( diff --git a/packages/cli/script/generate-sdk.ts b/packages/cli/script/generate-sdk.ts index f1228e72a4..008f1d0c06 100644 --- a/packages/cli/script/generate-sdk.ts +++ b/packages/cli/script/generate-sdk.ts @@ -17,7 +17,7 @@ */ import { writeFile } from "node:fs/promises"; -import ts from "typescript"; +import ts from "@typescript/typescript6"; import { routes } from "../src/app.js"; import type { SchemaFieldInfo } from "../src/lib/formatters/output.js"; import { @@ -81,7 +81,7 @@ type SdkFlagInfo = { kind: "boolean" | "parsed" | "enum"; type: ts.TypeNode; optional: boolean; - brief?: string; + brief?: string | undefined; }; // --------------------------------------------------------------------------- @@ -203,7 +203,7 @@ function extractSdkFlags(command: Command): SdkFlagInfo[] { * - Variadic (e.g., "") → { name, variadic: true } */ /** One entry of a tuple positional, mapped to its own SDK param. */ -type PositionalEntry = { name: string; brief?: string }; +type PositionalEntry = { name: string; brief?: string | undefined }; type PositionalInfo = | null @@ -406,11 +406,11 @@ type SdkMethod = { /** Flags that switch the command into streaming mode (`AsyncIterable` result). */ streamingFlags: SdkFlagInfo[]; /** Name of the params type, when the command has named params. */ - paramsTypeName?: string; + paramsTypeName?: string | undefined; /** Whether a required flag makes the params object mandatory. */ paramsRequired: boolean; /** Name of the schema-derived result type, or `unknown` when there is none. */ - resultTypeName?: string; + resultTypeName?: string | undefined; }; /** The method's result type (`FooResult`, or `unknown`). */ diff --git a/packages/cli/script/generate-skill.ts b/packages/cli/script/generate-skill.ts index 034a533ec7..be5983d8bd 100644 --- a/packages/cli/script/generate-skill.ts +++ b/packages/cli/script/generate-skill.ts @@ -137,7 +137,7 @@ async function loadDoc(relativePath: string): Promise { /** Extract npm command from PackageManagerCode Astro component */ function extractPackageManagerCommand(rawContent: string): string | null { const match = rawContent.match(PACKAGE_MANAGER_REGEX); - return match ? match[1] : null; + return match?.[1] ?? null; } /** Generate installation section from docs content */ @@ -407,7 +407,10 @@ function generateReferenceFile( groupRoutes: RouteInfo[], version: string, ): string { - const route = groupRoutes[0]; + const [route] = groupRoutes; + if (!route) { + throw new Error(`No route for reference file ${refName}`); + } const title = `${capitalize(refName)} Commands`; const description = route.brief; diff --git a/packages/cli/script/generate.ts b/packages/cli/script/generate.ts index 8c84f3b8fa..3a14479a82 100644 --- a/packages/cli/script/generate.ts +++ b/packages/cli/script/generate.ts @@ -120,7 +120,12 @@ function grammarFiles(): StepFiles { ...sources.map((file) => `grammar/${file}`), GRAMMAR_SCRIPT, packageManifest("peggy", GRAMMAR_SCRIPT), - packageManifest("typescript", GRAMMAR_SCRIPT), + // The TypeScript 6 compiler API prints the declarations. Its package + // re-exports `@typescript/old`, which can update on its own. + packageManifest( + "@typescript/old", + packageManifest("@typescript/typescript6", GRAMMAR_SCRIPT), + ), ], outputs: names.flatMap((name) => [ `src/generated/${name}-grammar.js`, diff --git a/packages/cli/script/lib/chunk-build.ts b/packages/cli/script/lib/chunk-build.ts index 091652b0c6..a3274f9c19 100644 --- a/packages/cli/script/lib/chunk-build.ts +++ b/packages/cli/script/lib/chunk-build.ts @@ -145,7 +145,7 @@ export async function buildMainScript( target: options.target, format: "cjs", outfile: options.outfile, - banner: options.banner ? { js: options.banner } : undefined, + ...(options.banner && { banner: { js: options.banner } }), define: { CHUNK_BUILD: JSON.stringify(options.chunks), CHUNK_ASSET_DIR: diff --git a/packages/cli/script/lib/split-bundle.ts b/packages/cli/script/lib/split-bundle.ts index 917c998523..5e40db6c43 100644 --- a/packages/cli/script/lib/split-bundle.ts +++ b/packages/cli/script/lib/split-bundle.ts @@ -302,10 +302,10 @@ async function convertToCommonJs( bundle: false, platform: "node", format: "cjs", - target, - minify, - sourcemap, - logLevel, + ...(target !== undefined && { target }), + ...(minify !== undefined && { minify }), + ...(sourcemap !== undefined && { sourcemap }), + ...(logLevel !== undefined && { logLevel }), loader: { ".cjs": "js" }, outExtension: { ".js": ".cjs" }, footer: { diff --git a/packages/cli/script/lib/top-level-routes.ts b/packages/cli/script/lib/top-level-routes.ts index d71df954ec..250e2b5fed 100644 --- a/packages/cli/script/lib/top-level-routes.ts +++ b/packages/cli/script/lib/top-level-routes.ts @@ -8,7 +8,7 @@ * route tree instead of anyone writing them down. */ -import type { DocumentationConfig } from "@stricli/core"; +import type { DocumentationConfiguration } from "@stricli/core"; import type { CliRoutes } from "../../src/lib/route-registry.js"; import { getPositionalString, @@ -22,7 +22,7 @@ import type { TopLevelRoutes } from "../../src/root-help-routes.js"; type UsageLineFormatter = { formatUsageLine: (args: { prefix: readonly string[]; - config: DocumentationConfig; + config: DocumentationConfiguration; }) => string; }; @@ -34,7 +34,7 @@ type UsageLineFormatter = { */ export function describeTopLevelRoutes( routes: CliRoutes, - config: DocumentationConfig, + config: DocumentationConfiguration, ): TopLevelRoutes { const described: TopLevelRoutes = {}; for (const entry of (routes as unknown as RouteMap).getAllEntries()) { diff --git a/packages/cli/script/markdown.ts b/packages/cli/script/markdown.ts index c226e04cf3..a531a23b28 100644 --- a/packages/cli/script/markdown.ts +++ b/packages/cli/script/markdown.ts @@ -14,7 +14,7 @@ export type MarkdownHeading = { depth: number; text: string }; export function markdownHeadings(md: string): MarkdownHeading[] { return marked .lexer(md) - .filter((token) => token.type === "heading") + .filter((token): token is Tokens.Heading => token.type === "heading") .map((token) => ({ depth: token.depth, text: token.text })); } @@ -64,7 +64,7 @@ export type MarkdownCodeBlock = { code: string; lang: string }; export function markdownCodeBlocks(md: string): MarkdownCodeBlock[] { return marked .lexer(md) - .filter((token) => token.type === "code") + .filter((token): token is Tokens.Code => token.type === "code") .map((token) => ({ code: token.text.trim(), lang: (token.lang ?? "").split(" ")[0] ?? "", diff --git a/packages/cli/script/prepare-e2e-bundle.ts b/packages/cli/script/prepare-e2e-bundle.ts index 3a79556fcf..5d7ea07c64 100644 --- a/packages/cli/script/prepare-e2e-bundle.ts +++ b/packages/cli/script/prepare-e2e-bundle.ts @@ -4,7 +4,7 @@ const pnpm = process.platform === "win32" ? "pnpm.cmd" : "pnpm"; const child = spawn(pnpm, ["run", "bundle"], { env: { ...process.env, - SENTRY_CLIENT_ID: process.env.SENTRY_CLIENT_ID ?? "test-client-id", + SENTRY_CLIENT_ID: process.env["SENTRY_CLIENT_ID"] ?? "test-client-id", }, stdio: "inherit", }); diff --git a/packages/cli/script/sdk-declarations.ts b/packages/cli/script/sdk-declarations.ts index 1d98cdc614..fc17362fe5 100644 --- a/packages/cli/script/sdk-declarations.ts +++ b/packages/cli/script/sdk-declarations.ts @@ -5,7 +5,7 @@ * describes the library entry point itself. */ -import ts from "typescript"; +import ts from "@typescript/typescript6"; /** Location of the module `SentryOptions` is lifted from, relative to `packages/cli`. */ export const SDK_TYPES_PATH = "src/lib/sdk-types.ts"; diff --git a/packages/cli/script/sdk-run-calls.ts b/packages/cli/script/sdk-run-calls.ts index 827ff33b65..9bd2601b5d 100644 --- a/packages/cli/script/sdk-run-calls.ts +++ b/packages/cli/script/sdk-run-calls.ts @@ -7,7 +7,7 @@ * and multi-line calls are handled the way TypeScript sees them. */ -import ts from "typescript"; +import ts from "@typescript/typescript6"; import { markdownCodeBlocks } from "./markdown.js"; /** Markdown fence languages parsed as TypeScript. */ @@ -41,8 +41,9 @@ export function sdkRunCalls(code: string): string[][] { const visit = (node: ts.Node): void => { if (ts.isCallExpression(node) && isSdkRun(node)) { const args = node.arguments; - if (args.every(ts.isStringLiteralLike)) { - calls.push(args.map((arg) => arg.text)); + const literals = args.filter(ts.isStringLiteralLike); + if (literals.length === args.length) { + calls.push(literals.map((arg) => arg.text)); } } ts.forEachChild(node, visit); diff --git a/packages/cli/script/text-import-plugin.ts b/packages/cli/script/text-import-plugin.ts index 9bf2c226f5..610060d446 100644 --- a/packages/cli/script/text-import-plugin.ts +++ b/packages/cli/script/text-import-plugin.ts @@ -27,7 +27,7 @@ export const textImportPlugin: Plugin = { })); build.onResolve({ filter: ANY_FILTER }, (args) => { - if (args.with.type === "text") { + if (args.with["type"] === "text") { return { path: resolvePath(args.resolveDir, args.path), namespace: TEXT_IMPORT_NS, diff --git a/packages/cli/script/ts-codegen.ts b/packages/cli/script/ts-codegen.ts index 6d79598050..ac489ce9dd 100644 --- a/packages/cli/script/ts-codegen.ts +++ b/packages/cli/script/ts-codegen.ts @@ -7,7 +7,7 @@ * containing a quote cannot produce a broken file. */ -import ts from "typescript"; +import ts from "@typescript/typescript6"; /** Shorthand for the compiler's node factory. */ export const f = ts.factory; @@ -18,9 +18,20 @@ const COMMENT_CLOSE_RE = /\*\//g; /** Line breaks inside comment text; each continuation line needs a leading `*`. */ const NEWLINE_RE = /\r?\n/g; +/** + * ECMAScript IdentifierName, as `ts.isIdentifierText` checks it. That helper + * is internal: TypeScript 6's public declarations no longer export it. + */ +const IDENTIFIER_NAME_RE = /^[\p{ID_Start}$_][\p{ID_Continue}$\u200C\u200D]*$/u; + +/** Whether `name` can be written as a bare identifier (keywords included). */ +function isIdentifierText(name: string): boolean { + return IDENTIFIER_NAME_RE.test(name); +} + /** A property key: a bare identifier when valid, otherwise a quoted string literal. */ export function propertyName(name: string): ts.PropertyName { - return ts.isIdentifierText(name, ts.ScriptTarget.ESNext) + return isIdentifierText(name) ? f.createIdentifier(name) : f.createStringLiteral(name); } @@ -29,7 +40,7 @@ export function propertyName(name: string): ts.PropertyName { export function optionalAccess(object: string, name: string): ts.Expression { const target = f.createIdentifier(object); const questionDot = f.createToken(ts.SyntaxKind.QuestionDotToken); - return ts.isIdentifierText(name, ts.ScriptTarget.ESNext) + return isIdentifierText(name) ? f.createPropertyAccessChain(target, questionDot, name) : f.createElementAccessChain( target, @@ -41,7 +52,7 @@ export function optionalAccess(object: string, name: string): ts.Expression { /** `object.name`, or `object["name"]` when `name` is not a valid identifier. */ export function access(object: string, name: string): ts.Expression { const target = f.createIdentifier(object); - return ts.isIdentifierText(name, ts.ScriptTarget.ESNext) + return isIdentifierText(name) ? f.createPropertyAccessExpression(target, name) : f.createElementAccessExpression(target, f.createStringLiteral(name)); } diff --git a/packages/cli/src/app-for-args.ts b/packages/cli/src/app-for-args.ts index d19088a2b9..3bdb5abb65 100644 --- a/packages/cli/src/app-for-args.ts +++ b/packages/cli/src/app-for-args.ts @@ -132,7 +132,7 @@ export function isRootHelpRequest( !scanned || scanned.version || scanned.json || - env.SENTRY_OUTPUT_FORMAT === "json" + env["SENTRY_OUTPUT_FORMAT"] === "json" ) { return false; } diff --git a/packages/cli/src/bin.ts b/packages/cli/src/bin.ts index fc9683936e..2ee68f3018 100755 --- a/packages/cli/src/bin.ts +++ b/packages/cli/src/bin.ts @@ -16,7 +16,7 @@ import { SENTRY_CLI } from "./sentry-cli.js"; // place of NODE_BINARY/HERMES_CLI_PATH (see `react-native xcode`), forward to // the real Node/Hermes tool instead of running the CLI. Must run before any // command parsing. -if (process.env.__SENTRY_RN_WRAP_XCODE_CALL === "1") { +if (process.env["__SENTRY_RN_WRAP_XCODE_CALL"] === "1") { // oxlint-disable-next-line sentry-cli/no-process-exit -- forward the wrapped Node/Hermes tool's exit status; the CLI never started. process.exit(wrapCall()); } diff --git a/packages/cli/src/chunk-main.ts b/packages/cli/src/chunk-main.ts index a18eee7791..3926e126a7 100644 --- a/packages/cli/src/chunk-main.ts +++ b/packages/cli/src/chunk-main.ts @@ -80,7 +80,7 @@ function fileSource(): ChunkSource { const entry = CHUNK_BUILD.entries[ process.argv[2] === "__complete" && - process.env.__SENTRY_RN_WRAP_XCODE_CALL !== "1" + process.env["__SENTRY_RN_WRAP_XCODE_CALL"] !== "1" ? "complete" : "cli" ]; diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts index d12f595c5f..1814215efc 100644 --- a/packages/cli/src/cli.ts +++ b/packages/cli/src/cli.ts @@ -604,8 +604,8 @@ export async function runCli( * scan for the first slash-containing, non-flag token. */ function extractOrgProjectFromArgv(argv: string[]): { - org?: string; - project?: string; + org?: string | undefined; + project?: string | undefined; } { for (const token of argv) { if (token.startsWith("-") || !token.includes("/")) { diff --git a/packages/cli/src/commands/agent-conversation/list.ts b/packages/cli/src/commands/agent-conversation/list.ts index 09862e48f0..a8425cfb69 100644 --- a/packages/cli/src/commands/agent-conversation/list.ts +++ b/packages/cli/src/commands/agent-conversation/list.ts @@ -83,9 +83,9 @@ type ConversationListResult = { conversations: ConversationListItem[]; hasMore: boolean; hasPrev?: boolean; - nextCursor?: string; + nextCursor?: string | undefined; org: string; - project?: string; + project?: string | undefined; }; const PAGINATION_KEY = "agent-conversation-list"; diff --git a/packages/cli/src/commands/alert/issues/create.ts b/packages/cli/src/commands/alert/issues/create.ts index 8fdaa5cd93..48539c7e64 100644 --- a/packages/cli/src/commands/alert/issues/create.ts +++ b/packages/cli/src/commands/alert/issues/create.ts @@ -293,11 +293,13 @@ export const createCommand = buildCommand({ yield new CommandOutput({ org, project, - id: stringifyUnknown(created.id ?? ""), - name: stringifyUnknown(created.name ?? flags.name), + id: stringifyUnknown(created["id"] ?? ""), + name: stringifyUnknown(created["name"] ?? flags.name), status: stringifyUnknown( - created.status ?? (created.enabled === false ? "disabled" : "active"), + created["status"] ?? + (created["enabled"] === false ? "disabled" : "active"), ), } satisfies IssueAlertCreateOutput); + return; }, }); diff --git a/packages/cli/src/commands/alert/issues/edit.ts b/packages/cli/src/commands/alert/issues/edit.ts index e44c708f4b..73755f4190 100644 --- a/packages/cli/src/commands/alert/issues/edit.ts +++ b/packages/cli/src/commands/alert/issues/edit.ts @@ -93,7 +93,7 @@ function groupConditions( ): Record[] | undefined { const conditions = group !== null && typeof group === "object" - ? (group as Record).conditions + ? (group as Record)["conditions"] : undefined; return Array.isArray(conditions) ? conditions : undefined; } @@ -108,23 +108,25 @@ function applyIssueEdits( const filters = parseJsonObjectList(flags.filter, "filter"); if (flags.name !== undefined) { - body.name = flags.name; + body["name"] = flags.name; } if (flags.status !== undefined) { // Workflows use an `enabled` boolean rather than a status string. - body.enabled = flags.status === "active"; + // Workflows use an `enabled` boolean rather than a status string. + body["enabled"] = flags.status === "active"; } if (flags.frequency !== undefined) { - const config = (body.config as Record | undefined) ?? {}; - config.frequency = flags.frequency; - body.config = config; + const config = + (body["config"] as Record | undefined) ?? {}; + config["frequency"] = flags.frequency; + body["config"] = config; } if (flags.environment !== undefined) { - body.environment = + body["environment"] = flags.environment.trim() === "" ? null : flags.environment; } if (flags.owner !== undefined) { - body.owner = flags.owner.trim() === "" ? null : flags.owner; + body["owner"] = flags.owner.trim() === "" ? null : flags.owner; } // Triggers: the "when" data-condition group. Issue-alert triggers always use @@ -132,10 +134,10 @@ function applyIssueEdits( // conditions change rather than exposing a trigger match flag. if (conditions !== undefined) { const triggers = - (body.triggers as Record | undefined) ?? {}; - triggers.conditions = conditions; - triggers.logicType = triggerLogicType(); - body.triggers = triggers; + (body["triggers"] as Record | undefined) ?? {}; + triggers["conditions"] = conditions; + triggers["logicType"] = triggerLogicType(); + body["triggers"] = triggers; } // Action filter: the "if" group plus its actions. Issue alerts use one filter. @@ -144,8 +146,8 @@ function applyIssueEdits( filters !== undefined || flags["filter-match"] !== undefined ) { - const actionFilters = Array.isArray(body.actionFilters) - ? (body.actionFilters as Record[]) + const actionFilters = Array.isArray(body["actionFilters"]) + ? (body["actionFilters"] as Record[]) : []; const existingFilter = actionFilters[0]; // When the rule has no action filter yet, a partial edit (e.g. only @@ -158,25 +160,27 @@ function applyIssueEdits( conditions: [], }; if (actions !== undefined) { - filter.actions = actions; + filter["actions"] = actions; } if (filters !== undefined) { - filter.conditions = filters; + filter["conditions"] = filters; } if (flags["filter-match"] !== undefined) { - filter.logicType = matchToLogicType(flags["filter-match"]); + filter["logicType"] = matchToLogicType(flags["filter-match"]); } actionFilters[0] = filter; - body.actionFilters = actionFilters; + body["actionFilters"] = actionFilters; } // Check the rule as it will be after the edit: clearing either its // triggers or its filters must not leave an alert on every event. if (conditions !== undefined || filters !== undefined) { validateIssueTriggers( - groupConditions(body.triggers), + groupConditions(body["triggers"]), groupConditions( - Array.isArray(body.actionFilters) ? body.actionFilters[0] : undefined, + Array.isArray(body["actionFilters"]) + ? body["actionFilters"][0] + : undefined, ), ); } diff --git a/packages/cli/src/commands/alert/issues/list.ts b/packages/cli/src/commands/alert/issues/list.ts index ada48d56df..7fc87347ae 100644 --- a/packages/cli/src/commands/alert/issues/list.ts +++ b/packages/cli/src/commands/alert/issues/list.ts @@ -56,6 +56,7 @@ import { logger } from "../../../lib/logger.js"; import { dispatchOrgScopedList, type FetchResult as FetchResultOf, + type GroupFetchOptions, jsonTransformListResult, type ListCommandMeta, type ListResult, @@ -100,7 +101,7 @@ type AlertRuleListFetchResult = { target: ResolvedTarget; rules: IssueAlertRule[]; hasMore?: boolean; - nextCursor?: string; + nextCursor?: string | undefined; }; /** Success/failure wrapper for per-target fetches */ @@ -116,8 +117,8 @@ type AlertRuleRow = { rule: IssueAlertRule; target: ResolvedTarget }; type IssueAlertListResult = ListResult & { displayRows?: AlertRuleRow[]; title?: string; - moreHint?: string; - footer?: string; + moreHint?: string | undefined; + footer?: string | undefined; }; const issueAlertListMeta: ListCommandMeta = { @@ -134,7 +135,7 @@ const issueAlertListMeta: ListCommandMeta = { */ async function fetchRulesForTarget( target: ResolvedTarget, - options: { limit: number; startCursor?: string }, + options: GroupFetchOptions, ): Promise { const result = await withAuthGuard(async () => { const { data: rules, nextCursor } = await paginate( @@ -216,7 +217,7 @@ type ResolvedTargetsOptions = { parsed: ParsedOrgProject; flags: ListFlags; cwd: string; - projectSearchResolution?: ProjectSearchTargetResolution; + projectSearchResolution?: ProjectSearchTargetResolution | undefined; }; // inherent multi-target resolution, compound cursor, error handling, and display logic diff --git a/packages/cli/src/commands/alert/metrics/create.ts b/packages/cli/src/commands/alert/metrics/create.ts index 4772bababd..e71a66249d 100644 --- a/packages/cli/src/commands/alert/metrics/create.ts +++ b/packages/cli/src/commands/alert/metrics/create.ts @@ -263,9 +263,10 @@ export const createCommand = buildCommand({ const created = await createMetricAlertRule(orgSlug, body); yield new CommandOutput({ org: orgSlug, - id: stringifyUnknown(created.id ?? ""), - name: stringifyUnknown(created.name ?? flags.name), - status: metricAlertStatusLabel(created.status), + id: stringifyUnknown(created["id"] ?? ""), + name: stringifyUnknown(created["name"] ?? flags.name), + status: metricAlertStatusLabel(created["status"]), } satisfies MetricAlertCreateOutput); + return; }, }); diff --git a/packages/cli/src/commands/alert/metrics/edit.ts b/packages/cli/src/commands/alert/metrics/edit.ts index d996649dfc..70b1af3c7f 100644 --- a/packages/cli/src/commands/alert/metrics/edit.ts +++ b/packages/cli/src/commands/alert/metrics/edit.ts @@ -98,34 +98,34 @@ function applyMetricCoreFields( ): string | undefined { let notice: string | undefined; if (flags.name !== undefined) { - body.name = flags.name; + body["name"] = flags.name; } if (flags.status !== undefined) { - body.status = statusToMetricValue(flags.status); + body["status"] = statusToMetricValue(flags.status); } if (flags.query !== undefined) { - body.query = flags.query; + body["query"] = flags.query; } if (flags.aggregate !== undefined) { if (!flags.aggregate.trim()) { throw new ValidationError("aggregate cannot be empty.", "aggregate"); } - body.aggregate = flags.aggregate; + body["aggregate"] = flags.aggregate; } if (flags.dataset !== undefined) { // Resolve against the effective query (the just-applied --query flag, or the // rule's existing query) so a `transaction(s)` request routes to `spans` // with `is_transaction:true` added even when --query is not also passed. - const currentQuery = typeof body.query === "string" ? body.query : ""; + const currentQuery = typeof body["query"] === "string" ? body["query"] : ""; const resolved = resolveMetricDataset(flags.dataset, currentQuery); validateMetricDataset(resolved.dataset); - body.dataset = resolved.dataset; - body.query = resolved.query; + body["dataset"] = resolved.dataset; + body["query"] = resolved.query; notice = resolved.notice; } if (flags["time-window"] !== undefined) { validateMetricTimeWindow(flags["time-window"]); - body.timeWindow = flags["time-window"]; + body["timeWindow"] = flags["time-window"]; } return notice; } @@ -135,22 +135,22 @@ function applyMetricOptionalFields( flags: EditFlags, ): Record { if (flags.trigger !== undefined) { - body.triggers = parseMetricTriggers( + body["triggers"] = parseMetricTriggers( parseJsonObjectList(flags.trigger, "trigger"), ); } if (flags.project !== undefined) { - body.projects = normalizeProjectList(flags.project) ?? []; + body["projects"] = normalizeProjectList(flags.project) ?? []; } if (flags.environment !== undefined) { - body.environment = + body["environment"] = flags.environment.trim() === "" ? null : flags.environment; } if (flags.owner !== undefined) { - body.owner = flags.owner.trim() === "" ? null : flags.owner; + body["owner"] = flags.owner.trim() === "" ? null : flags.owner; } if (flags.workflow !== undefined) { - body.workflowIds = parseWorkflowIds(flags.workflow) ?? []; + body["workflowIds"] = parseWorkflowIds(flags.workflow) ?? []; } return body; } @@ -160,17 +160,17 @@ function validateMetricBody( flags: EditFlags, ): void { if (flags.dataset !== undefined) { - validateMetricDataset(normalizeMetricDataset(String(body.dataset))); + validateMetricDataset(normalizeMetricDataset(String(body["dataset"]))); } if (flags["time-window"] !== undefined) { - validateMetricTimeWindow(Number(body.timeWindow)); + validateMetricTimeWindow(Number(body["timeWindow"])); } - if (flags.query !== undefined && typeof body.query !== "string") { + if (flags.query !== undefined && typeof body["query"] !== "string") { throw new ValidationError("query must be a string.", "query"); } if ( flags.aggregate !== undefined && - (typeof body.aggregate !== "string" || body.aggregate.trim() === "") + (typeof body["aggregate"] !== "string" || body["aggregate"].trim() === "") ) { throw new ValidationError( "aggregate must be present and non-empty.", diff --git a/packages/cli/src/commands/alert/metrics/list.ts b/packages/cli/src/commands/alert/metrics/list.ts index b380a9f5d6..0e1a3b6f51 100644 --- a/packages/cli/src/commands/alert/metrics/list.ts +++ b/packages/cli/src/commands/alert/metrics/list.ts @@ -52,6 +52,7 @@ import { logger } from "../../../lib/logger.js"; import { dispatchOrgScopedList, type FetchResult as FetchResultOf, + type GroupFetchOptions, jsonTransformListResult, type ListCommandMeta, type ListResult, @@ -112,7 +113,7 @@ type MetricRuleFetchResult = { orgSlug: string; rules: MetricAlertRule[]; hasMore?: boolean; - nextCursor?: string; + nextCursor?: string | undefined; }; /** Success/failure wrapper for per-org fetches */ @@ -128,8 +129,8 @@ type MetricAlertRow = { rule: MetricAlertRule; orgSlug: string }; type MetricAlertListResult = ListResult & { displayRows?: MetricAlertRow[]; title?: string; - moreHint?: string; - footer?: string; + moreHint?: string | undefined; + footer?: string | undefined; }; const metricAlertListMeta: ListCommandMeta = { @@ -146,7 +147,7 @@ const metricAlertListMeta: ListCommandMeta = { */ async function fetchRulesForOrg( orgSlug: string, - options: { limit: number; startCursor?: string }, + options: GroupFetchOptions, ): Promise { const result = await withAuthGuard(async () => { const { data: rules, nextCursor } = await paginate( @@ -173,7 +174,7 @@ type ResolvedOrgsOptions = { parsed: ParsedOrgProject; flags: ListFlags; cwd: string; - projectSearchResolution?: ProjectSearchTargetResolution; + projectSearchResolution?: ProjectSearchTargetResolution | undefined; }; /** @@ -188,7 +189,7 @@ async function resolveOrgs( parsed: ParsedOrgProject, cwd: string, projectSearchResolution?: ProjectSearchTargetResolution, -): Promise<{ orgs: string[]; footer?: string }> { +): Promise<{ orgs: string[]; footer?: string | undefined }> { if (parsed.type === "explicit" || parsed.type === "org-all") { return { orgs: [parsed.org] }; } diff --git a/packages/cli/src/commands/alert/mutation-utils.ts b/packages/cli/src/commands/alert/mutation-utils.ts index 8392e7176c..7dc5658694 100644 --- a/packages/cli/src/commands/alert/mutation-utils.ts +++ b/packages/cli/src/commands/alert/mutation-utils.ts @@ -307,11 +307,11 @@ function toTriggerConditions( if (!isJsonObject(entry)) { return; } - const type = ISSUE_TRIGGER_TYPES.find((t) => t === entry.type); + const type = ISSUE_TRIGGER_TYPES.find((t) => t === entry["type"]); const exact = Object.keys(entry).every((key) => ISSUE_TRIGGER_KEYS.has(key)) && - (entry.comparison ?? true) === true && - (entry.conditionResult ?? true) === true; + (entry["comparison"] ?? true) === true && + (entry["conditionResult"] ?? true) === true; if (!(type && exact)) { return; } diff --git a/packages/cli/src/commands/api.ts b/packages/cli/src/commands/api.ts index e69e2ffc7a..3d2ff084d9 100644 --- a/packages/cli/src/commands/api.ts +++ b/packages/cli/src/commands/api.ts @@ -248,7 +248,7 @@ function hasBareApiPrefix(endpoint: string): boolean { function resolveApiTarget(endpoint: string): { normalizedEndpoint: string; - requestBaseUrl?: string; + requestBaseUrl?: string | undefined; strippedApiPrefix: boolean; } { const cleaned = endpoint.replace(LINE_BREAK_PATTERN, "").trim(); @@ -773,7 +773,7 @@ export function prepareRequestOptions( typedFields?: string[], rawFields?: string[], ): { - body?: Record; + body?: Record | undefined; params?: Record; } { const hasTypedFields = typedFields && typedFields.length > 0; @@ -951,8 +951,8 @@ function tryParseJsonField( * @internal Exported for testing */ export function extractJsonBody(fields: string[] | undefined): { - body?: Record | unknown[]; - remaining?: string[]; + body?: Record | unknown[] | undefined; + remaining?: string[] | undefined; } { if (!fields || fields.length === 0) { return {}; @@ -1334,8 +1334,8 @@ export function buildFromFields( method: HttpMethod, flags: Pick, ): { - body?: Record | unknown[]; - params?: Record; + body?: Record | unknown[] | undefined; + params?: Record | undefined; } { const field = normalizeFields(flags.field); let rawField = normalizeFields(flags["raw-field"]); @@ -1399,8 +1399,8 @@ export async function resolveBody( flags: Pick, stdin: NodeJS.ReadStream & { fd: 0 }, ): Promise<{ - body?: Record | unknown[] | string; - params?: Record; + body?: Record | unknown[] | string | undefined; + params?: Record | undefined; }> { if (flags.data !== undefined && flags.input !== undefined) { throw new ValidationError( @@ -1865,8 +1865,10 @@ export const apiCommand = buildCommand({ ); response.body = envelope ? { ...envelope, data: page.data } : page.data; pagination = { - nextCursor: page.nextCursor, - prevCursor: pagination.prevCursor, + ...(page.nextCursor !== undefined && { nextCursor: page.nextCursor }), + ...(pagination.prevCursor !== undefined && { + prevCursor: pagination.prevCursor, + }), }; } else if (navigation.position.skip > 0) { throw new ValidationError( diff --git a/packages/cli/src/commands/auth/login.ts b/packages/cli/src/commands/auth/login.ts index e2bced28fc..2b203ca958 100644 --- a/packages/cli/src/commands/auth/login.ts +++ b/packages/cli/src/commands/auth/login.ts @@ -349,8 +349,8 @@ export function applyLoginUrl(url: string | undefined): string { const env = getEnv(); if (url) { - env.SENTRY_HOST = url; - env.SENTRY_URL = url; + env["SENTRY_HOST"] = url; + env["SENTRY_URL"] = url; registerLoginTrustAnchor(url); return url; } @@ -737,5 +737,6 @@ export const loginCommand = buildCommand({ } // Error already displayed by runInteractiveLogin process.exitCode = 1; + return; }, }); diff --git a/packages/cli/src/commands/auth/logout.ts b/packages/cli/src/commands/auth/logout.ts index e59638e2b5..04f81099f1 100644 --- a/packages/cli/src/commands/auth/logout.ts +++ b/packages/cli/src/commands/auth/logout.ts @@ -48,7 +48,7 @@ export type LogoutResult = { /** Accounts that were removed */ removed?: AccountSummary[]; /** Account that is active after logout, if any remain */ - activeAccount?: AccountSummary; + activeAccount?: AccountSummary | undefined; /** Set when `all` was requested */ all?: boolean; }; diff --git a/packages/cli/src/commands/auth/refresh.ts b/packages/cli/src/commands/auth/refresh.ts index bb9b68f6bb..1abe83ca2c 100644 --- a/packages/cli/src/commands/auth/refresh.ts +++ b/packages/cli/src/commands/auth/refresh.ts @@ -40,8 +40,8 @@ type RefreshOutput = { success: boolean; refreshed: boolean; message: string; - expiresIn?: number; - expiresAt?: string; + expiresIn?: number | undefined; + expiresAt?: string | undefined; }; /** Whether the user asked for a scope change (--scope or --read-only). */ diff --git a/packages/cli/src/commands/auth/status.ts b/packages/cli/src/commands/auth/status.ts index febbf11846..ccfc5ef429 100644 --- a/packages/cli/src/commands/auth/status.ts +++ b/packages/cli/src/commands/auth/status.ts @@ -60,51 +60,69 @@ export type AuthStatusData = { /** Auth source: "oauth" or "env:SENTRY_AUTH_TOKEN" etc. */ source: string; /** Path to the SQLite config database (only for non-env tokens) */ - configPath?: string; + configPath?: string | undefined; /** User identity from cached user info */ - user?: { name?: string; email?: string; username?: string }; + user?: + | { + name?: string | undefined; + email?: string | undefined; + username?: string | undefined; + } + | undefined; /** Server the active stored account belongs to (only for non-env tokens) */ - host?: string; + host?: string | undefined; /** Number of stored accounts (only for non-env tokens) */ - accounts?: number; + accounts?: number | undefined; /** Token display and metadata */ - token?: { - /** Masked or full token string depending on --show-token */ - display: string; - /** Expiration timestamp (ms since epoch), if available */ - expiresAt?: number; - /** Whether auto-refresh via refresh token is enabled */ - refreshEnabled: boolean; - }; + token?: + | { + /** Masked or full token string depending on --show-token */ + display: string; + /** Expiration timestamp (ms since epoch), if available */ + expiresAt?: number | undefined; + /** Whether auto-refresh via refresh token is enabled */ + refreshEnabled: boolean; + } + | undefined; /** Default org/project settings */ - defaults?: { - organization?: string; - project?: string; - }; + defaults?: + | { + organization?: string | undefined; + project?: string | undefined; + } + | undefined; /** Credential verification results */ - verification?: { - /** Whether the API call succeeded */ - success: boolean; - /** Organizations accessible with the current token */ - organizations?: Array<{ name: string; slug: string }>; - /** Error message if verification failed */ - error?: string; - }; + verification?: + | { + /** Whether the API call succeeded */ + success: boolean; + /** Organizations accessible with the current token */ + organizations?: Array<{ name: string; slug: string }>; + /** Error message if verification failed */ + error?: string; + } + | undefined; /** Environment variable token info (present when SENTRY_AUTH_TOKEN or SENTRY_TOKEN is set) */ - envToken?: { - /** Name of the env var (e.g., "SENTRY_AUTH_TOKEN") */ - envVar: string; - /** Whether the env token is the effective auth source (vs bypassed for OAuth) */ - active: boolean; - /** - * Server the token is scoped to, when known from a trusted source. Then - * the token also acts as an account of its own: commands targeting an - * organization it can access use it even when stored OAuth is in effect. - */ - host?: string; - /** The token's user, from `/users/me/` (not for organization auth tokens) */ - user?: { name?: string; email?: string; username?: string }; - }; + envToken?: + | { + /** Name of the env var (e.g., "SENTRY_AUTH_TOKEN") */ + envVar: string; + /** Whether the env token is the effective auth source (vs bypassed for OAuth) */ + active: boolean; + /** + * Server the token is scoped to, when known from a trusted source. Then + * the token also acts as an account of its own: commands targeting an + * organization it can access use it even when stored OAuth is in effect. + */ + host?: string; + /** The token's user, from `/users/me/` (not for organization auth tokens) */ + user?: { + name?: string | undefined; + email?: string | undefined; + username?: string | undefined; + }; + } + | undefined; }; /** @@ -286,5 +304,6 @@ export const statusCommand = buildCommand({ : `Run \`${sentry`auth whoami`}\` to see which user this token belongs to`, }; } + return; }, }); diff --git a/packages/cli/src/commands/auth/switch.ts b/packages/cli/src/commands/auth/switch.ts index bbb6ae6687..c210479969 100644 --- a/packages/cli/src/commands/auth/switch.ts +++ b/packages/cli/src/commands/auth/switch.ts @@ -157,5 +157,6 @@ export const switchCommand = buildCommand({ hint: `${getActiveEnvVarName()} is set and overrides stored accounts.`, }; } + return; }, }); diff --git a/packages/cli/src/commands/auth/whoami.ts b/packages/cli/src/commands/auth/whoami.ts index 83d3a92506..70db772651 100644 --- a/packages/cli/src/commands/auth/whoami.ts +++ b/packages/cli/src/commands/auth/whoami.ts @@ -142,9 +142,9 @@ export const whoamiCommand = buildCommand({ */ export function formatOtherIdentitiesHint(user: { id: string; - name?: string | null; - email?: string | null; - username?: string | null; + name?: string | null | undefined; + email?: string | null | undefined; + username?: string | null | undefined; }): string | undefined { let others: AccountSummary[]; try { diff --git a/packages/cli/src/commands/build/upload.ts b/packages/cli/src/commands/build/upload.ts index 82b002c440..14a19c8cca 100644 --- a/packages/cli/src/commands/build/upload.ts +++ b/packages/cli/src/commands/build/upload.ts @@ -127,7 +127,7 @@ async function uploadOne( throw new ValidationError(`Path does not exist: ${path}`, "path"); } - const plugin = parsePluginFromPipeline(ctx.env.SENTRY_PIPELINE); + const plugin = parsePluginFromPipeline(ctx.env["SENTRY_PIPELINE"]); // Normalize into a wrapper ZIP on disk (streamed, so peak memory does not // scale with the build size), then upload it via the file-based chunk path. diff --git a/packages/cli/src/commands/cli/completion.ts b/packages/cli/src/commands/cli/completion.ts index 00b1e13dca..1108b94dc2 100644 --- a/packages/cli/src/commands/cli/completion.ts +++ b/packages/cli/src/commands/cli/completion.ts @@ -73,7 +73,7 @@ export const completionCommand = buildCommand({ ) { const shellType = shell ? detectShellType(shell) - : detectShellType(this.env.SHELL); + : detectShellType(this.env["SHELL"]); const script = getCompletionScript(shellType); if (script === null) { diff --git a/packages/cli/src/commands/cli/defaults.ts b/packages/cli/src/commands/cli/defaults.ts index 6c2012b2bf..42bbf2ddbd 100644 --- a/packages/cli/src/commands/cli/defaults.ts +++ b/packages/cli/src/commands/cli/defaults.ts @@ -225,10 +225,12 @@ export type DefaultsResult = { /** Current state of all defaults after the operation */ defaults: DefaultsState; /** Effective telemetry state considering env var overrides (display-only) */ - telemetryEffective?: { - enabled: boolean; - source: string; - }; + telemetryEffective?: + | { + enabled: boolean; + source: string; + } + | undefined; /** What was changed (for set/clear actions) */ changed?: { key: string; diff --git a/packages/cli/src/commands/cli/feedback.ts b/packages/cli/src/commands/cli/feedback.ts index 87af845017..8a16bc86d5 100644 --- a/packages/cli/src/commands/cli/feedback.ts +++ b/packages/cli/src/commands/cli/feedback.ts @@ -18,6 +18,7 @@ import { ConfigError, ValidationError } from "../../lib/errors.js"; import { formatFeedbackResult } from "../../lib/formatters/human.js"; import { CommandOutput } from "../../lib/formatters/output.js"; import { prompt } from "../../lib/prompt.js"; +import { omitUndefined } from "../../lib/omit-undefined.js"; /** Structured result of the feedback submission */ export type FeedbackResult = { @@ -88,11 +89,13 @@ export const feedbackCommand = buildCommand({ const { getUserInfo } = await import("../../lib/db/user.js"); const user = getUserInfo(); - Sentry.captureFeedback({ - message, - email: user?.email, - name: user?.name ?? user?.username, - }); + Sentry.captureFeedback( + omitUndefined({ + message, + email: user?.email, + name: user?.name ?? user?.username, + }), + ); // Flush to ensure feedback is sent before process exits const sent = await Sentry.flush(3000); diff --git a/packages/cli/src/commands/cli/fix.ts b/packages/cli/src/commands/cli/fix.ts index 020b6b1abf..1462666a70 100644 --- a/packages/cli/src/commands/cli/fix.ts +++ b/packages/cli/src/commands/cli/fix.ts @@ -62,7 +62,7 @@ export type FixResult = { /** True when at least one issue couldn't be repaired */ repairFailed: boolean; /** Manual instructions when automatic repair isn't possible */ - instructions?: string; + instructions?: string | undefined; }; /** Format a schema issue as a human-readable string for display. */ @@ -315,7 +315,7 @@ async function repairOwnership( /** Result of diagnosing a category of issues (used internally) */ type HandlerResult = { issues: FixIssue[]; - instructions?: string; + instructions?: string | undefined; repairFailed: boolean; }; diff --git a/packages/cli/src/commands/cli/import.ts b/packages/cli/src/commands/cli/import.ts index f6e0b6675e..784b454ea1 100644 --- a/packages/cli/src/commands/cli/import.ts +++ b/packages/cli/src/commands/cli/import.ts @@ -398,5 +398,6 @@ export const importCommand = buildCommand({ hint: "Your .sentryclirc file is still active via the env shim. You can remove it once you've verified everything works.", }; } + return; }, }); diff --git a/packages/cli/src/commands/cli/setup.ts b/packages/cli/src/commands/cli/setup.ts index 07f537989d..40a6556335 100644 --- a/packages/cli/src/commands/cli/setup.ts +++ b/packages/cli/src/commands/cli/setup.ts @@ -292,7 +292,7 @@ async function handlePathModification( return; } - const alreadyInPath = isInPath(binaryDir, env.PATH); + const alreadyInPath = isInPath(binaryDir, env["PATH"]); if (alreadyInPath) { emit(`PATH: ${binaryDir} is already in PATH`); @@ -543,7 +543,7 @@ type ConfigStepOptions = { */ async function runConfigurationSteps(opts: ConfigStepOptions) { const { flags, binaryPath, binaryDir, homeDir, env, emit, warn } = opts; - const shell = detectShell(env.SHELL, homeDir, env.XDG_CONFIG_HOME); + const shell = detectShell(env["SHELL"], homeDir, env["XDG_CONFIG_HOME"]); // 1. Record installation info const method = flags.method; @@ -596,8 +596,8 @@ async function runConfigurationSteps(opts: ConfigStepOptions) { const completionLines = await handleCompletions( shell, homeDir, - env.XDG_DATA_HOME, - env.PATH, + env["XDG_DATA_HOME"], + env["PATH"], ); for (const line of completionLines) { emit(line); diff --git a/packages/cli/src/commands/cli/uninstall.ts b/packages/cli/src/commands/cli/uninstall.ts index 01a399795e..49aadd43e0 100644 --- a/packages/cli/src/commands/cli/uninstall.ts +++ b/packages/cli/src/commands/cli/uninstall.ts @@ -217,7 +217,7 @@ function findSentryConfigFiles(home: string): string[] { */ function gatherArtifacts(home: string): UninstallArtifact[] { const artifacts: UninstallArtifact[] = []; - const xdgDataHome = process.env.XDG_DATA_HOME; + const xdgDataHome = process.env["XDG_DATA_HOME"]; // 1. Shell completions const completionShells: ShellType[] = ["bash", "zsh", "fish"]; @@ -565,5 +565,6 @@ export const uninstallCommand = buildDeleteCommand({ hint: `${result.removed.length} removed, ${result.failed.length} failed. Check permissions.`, }; } + return; }, }); diff --git a/packages/cli/src/commands/cli/upgrade.ts b/packages/cli/src/commands/cli/upgrade.ts index c40c027c35..fc7019ada6 100644 --- a/packages/cli/src/commands/cli/upgrade.ts +++ b/packages/cli/src/commands/cli/upgrade.ts @@ -115,11 +115,11 @@ type DatabasePlan = { /** Hand the database to a CLI that can't adapt a newer one (#1611). */ handOff: boolean; /** Undo: put back the target version's own database. */ - restore?: DatabaseBackup; + restore?: DatabaseBackup | undefined; /** Set once `restore` succeeded; the hand-off is then unnecessary. */ restored?: boolean; /** This version's database, saved before the new binary's setup. */ - backup?: DatabaseBackup; + backup?: DatabaseBackup | undefined; /** Notes about the database for the command result. */ warnings: string[]; }; @@ -344,9 +344,9 @@ async function resolveTargetWithFallback(opts: { kind: "target"; target: string; offline: OfflineMode; - source?: UpgradeSource; + source?: UpgradeSource | undefined; } - | { kind: "done"; result: UpgradeResult; source?: UpgradeSource } + | { kind: "done"; result: UpgradeResult; source?: UpgradeSource | undefined } > { const { resolveOpts, versionArg, offline, method, persistChannelFn } = opts; @@ -463,8 +463,12 @@ type ResolveTargetOptions = { * (check-only mode, or already up to date) */ type ResolveResult = - | { kind: "target"; target: string; source?: UpgradeSource } - | { kind: "done"; result: UpgradeResult; source?: UpgradeSource }; + | { kind: "target"; target: string; source?: UpgradeSource | undefined } + | { + kind: "done"; + result: UpgradeResult; + source?: UpgradeSource | undefined; + }; async function resolvePinnedVersion( lookupMethod: InstallationMethod, @@ -851,12 +855,12 @@ async function executeStandardUpgrade(opts: { versionArg: string | undefined; target: string; execPath: string; - entryPath?: string; - pathEnv?: string; + entryPath?: string | undefined; + pathEnv?: string | undefined; offline?: OfflineMode; - json?: boolean; + json?: boolean | undefined; noAgentSkills: boolean; - source?: UpgradeSource; + source?: UpgradeSource | undefined; database: DatabasePlan; }): Promise { const { @@ -964,8 +968,8 @@ async function migrateToStandaloneForNightly(opts: { target: string; versionArg: string | undefined; noAgentSkills: boolean; - json?: boolean; - source?: UpgradeSource; + json?: boolean | undefined; + source?: UpgradeSource | undefined; channel: ReleaseChannel; database: DatabasePlan; }): Promise { @@ -1100,7 +1104,7 @@ function startChangelogFetch(options: { currentVersion: string; targetVersion: string; offline: OfflineMode; - source?: UpgradeSource; + source?: UpgradeSource | undefined; }): Promise { const { channel, currentVersion, targetVersion, offline, source } = options; if (offline || currentVersion === targetVersion) { @@ -1132,7 +1136,10 @@ async function buildCheckResultWithChangelog(opts: { if (opts.offline) { result.offline = true; } - result.changelog = await opts.changelogPromise; + const changelog = await opts.changelogPromise; + if (changelog) { + result.changelog = changelog; + } return result; } @@ -1284,13 +1291,16 @@ export const upgradeCommand = buildCommand({ result.action === "checked" && result.currentVersion !== result.targetVersion ) { - result.changelog = await startChangelogFetch({ + const changelog = await startChangelogFetch({ channel: getArtifactChannel(result.targetVersion), currentVersion: CLI_VERSION, targetVersion: result.targetVersion, offline: false, source: resolved.source, }); + if (changelog) { + result.changelog = changelog; + } } return yield new CommandOutput(result); } @@ -1331,7 +1341,7 @@ export const upgradeCommand = buildCommand({ channel, method, forced: false, - offline: offline ? true : undefined, + ...(offline && { offline: true }), } satisfies UpgradeResult); } const downgrade = isDowngrade(CLI_VERSION, target); @@ -1369,7 +1379,7 @@ export const upgradeCommand = buildCommand({ target, execPath: this.process.execPath, entryPath: argv?.[1], - pathEnv: this.process.env.PATH, + pathEnv: this.process.env["PATH"], offline, json: flags.json, noAgentSkills: flags["no-agent-skills"], @@ -1387,10 +1397,10 @@ export const upgradeCommand = buildCommand({ channel, method, forced: flags.force, - offline: offline ? true : undefined, - warnings: allWarnings.length > 0 ? allWarnings : undefined, - restoredDatabase: database.restored ? target : undefined, - changelog, + ...(offline && { offline: true }), + ...(allWarnings.length > 0 && { warnings: allWarnings }), + ...(database.restored && { restoredDatabase: target }), + ...(changelog && { changelog }), } satisfies UpgradeResult); return; }, diff --git a/packages/cli/src/commands/dart-symbol-map/upload.ts b/packages/cli/src/commands/dart-symbol-map/upload.ts index 8a8a90a516..ba976e9431 100644 --- a/packages/cli/src/commands/dart-symbol-map/upload.ts +++ b/packages/cli/src/commands/dart-symbol-map/upload.ts @@ -129,7 +129,7 @@ function validateDartSymbolMap(content: Buffer, path: string): void { * @returns File content as a Buffer * @throws {ValidationError} On ENOENT, EISDIR, or other read failures */ -async function readMappingFile(path: string): Promise { +async function readMappingFile(path: string): Promise> { try { return await readFile(path); } catch (err) { diff --git a/packages/cli/src/commands/dashboard/arguments.ts b/packages/cli/src/commands/dashboard/arguments.ts index 71c387ed57..d49d2233f4 100644 --- a/packages/cli/src/commands/dashboard/arguments.ts +++ b/packages/cli/src/commands/dashboard/arguments.ts @@ -40,7 +40,7 @@ export type DashboardInput = { readonly ref: string; readonly target: ParsedOrgProject; /** Server of a pasted Sentry URL, for `applySentryUrlContext` */ - readonly baseUrl?: string; + readonly baseUrl?: string | undefined; readonly warnings: readonly string[]; /** * When the first argument is a bare word before a title (`My @@ -170,9 +170,9 @@ export function dashboardArguments(options: { export type DashboardListInput = { readonly target: ParsedOrgProject; /** Title glob to filter by */ - readonly titleFilter?: string; + readonly titleFilter?: string | undefined; /** Server of a pasted Sentry URL, for `applySentryUrlContext` */ - readonly baseUrl?: string; + readonly baseUrl?: string | undefined; readonly warnings: readonly string[]; }; @@ -215,7 +215,7 @@ export function dashboardListArguments(usageHint: LazyCommand) { /** Apply a pasted URL's server and log the parse's warnings. */ function applyInputContext(input: { - readonly baseUrl?: string; + readonly baseUrl?: string | undefined; readonly warnings: readonly string[]; }): void { if (input.baseUrl) { diff --git a/packages/cli/src/commands/dashboard/create.ts b/packages/cli/src/commands/dashboard/create.ts index 4c279da65f..2afb0c1da9 100644 --- a/packages/cli/src/commands/dashboard/create.ts +++ b/packages/cli/src/commands/dashboard/create.ts @@ -43,7 +43,7 @@ type CreateInput = { readonly title: string; readonly target: ParsedOrgProject; /** Server of a pasted Sentry URL, for `applySentryUrlContext` */ - readonly baseUrl?: string; + readonly baseUrl?: string | undefined; }; /** @@ -82,7 +82,7 @@ export type DashboardCreateArguments = BoundArguments< /** Enrich targets that lack a projectId by calling the project API */ async function enrichTargetProjectIds( - targets: { org: string; project: string; projectId?: number }[], + targets: { org: string; project: string; projectId?: number | undefined }[], ): Promise { const enriched = await Promise.all( targets.map(async (t) => { diff --git a/packages/cli/src/commands/dashboard/list.ts b/packages/cli/src/commands/dashboard/list.ts index ff85571cce..c2d328bf7c 100644 --- a/packages/cli/src/commands/dashboard/list.ts +++ b/packages/cli/src/commands/dashboard/list.ts @@ -62,10 +62,10 @@ type DashboardListResult = { dashboards: DashboardListItem[]; orgSlug: string; hasMore: boolean; - hasPrev?: boolean; - nextCursor?: string; + hasPrev?: boolean | undefined; + nextCursor?: string | undefined; /** The title filter used (for empty-state messaging) */ - titleFilter?: string; + titleFilter?: string | undefined; /** All titles seen during fetch (for fuzzy suggestions on empty filter results) */ allTitles?: string[]; }; diff --git a/packages/cli/src/commands/dashboard/resolve.ts b/packages/cli/src/commands/dashboard/resolve.ts index 4154efda2a..b8a7c97dc2 100644 --- a/packages/cli/src/commands/dashboard/resolve.ts +++ b/packages/cli/src/commands/dashboard/resolve.ts @@ -46,7 +46,7 @@ import { /** Shared widget query flags used by `add` and `edit` commands */ export type WidgetQueryFlags = { readonly display?: string; - readonly dataset?: string; + readonly dataset?: string | undefined; readonly query?: string[]; readonly where?: string; readonly "group-by"?: string[]; @@ -389,12 +389,12 @@ function warnUnknownAggregateFields( export function buildWidgetFromFlags(opts: { title: string; display: string; - dataset?: string; - query?: string[]; - where?: string; - groupBy?: string[]; - sort?: string; - limit?: number; + dataset?: string | undefined; + query?: string[] | undefined; + where?: string | undefined; + groupBy?: string[] | undefined; + sort?: string | undefined; + limit?: number | undefined; }): DashboardWidget { const aggregates = (opts.query ?? ["count"]).map(parseAggregate); validateAggregateNames(aggregates, opts.dataset); diff --git a/packages/cli/src/commands/dashboard/revisions.ts b/packages/cli/src/commands/dashboard/revisions.ts index dd1baeaa9e..f179e3fbdd 100644 --- a/packages/cli/src/commands/dashboard/revisions.ts +++ b/packages/cli/src/commands/dashboard/revisions.ts @@ -49,8 +49,8 @@ type RevisionsResult = { orgSlug: string; dashboardId: string; hasMore: boolean; - hasPrev?: boolean; - nextCursor?: string; + hasPrev?: boolean | undefined; + nextCursor?: string | undefined; }; function formatRevisionsHuman(result: RevisionsResult): string { diff --git a/packages/cli/src/commands/dashboard/view.ts b/packages/cli/src/commands/dashboard/view.ts index c770e47ecc..e15dad0d1b 100644 --- a/packages/cli/src/commands/dashboard/view.ts +++ b/packages/cli/src/commands/dashboard/view.ts @@ -103,8 +103,8 @@ function buildViewData( dashboard: { id: string; title: string; - dateCreated?: string; - environment?: string[]; + dateCreated?: string | undefined; + environment?: string[] | undefined; }, widgetResults: Map, widgets: DashboardWidget[], @@ -129,7 +129,7 @@ function buildViewData( title: w.title, displayType: w.displayType, widgetType: w.widgetType, - description: (w as Record).description as + description: (w as Record)["description"] as | string | undefined, layout: w.layout, diff --git a/packages/cli/src/commands/dashboard/widget/edit.ts b/packages/cli/src/commands/dashboard/widget/edit.ts index 70ff57a468..0baa204f78 100644 --- a/packages/cli/src/commands/dashboard/widget/edit.ts +++ b/packages/cli/src/commands/dashboard/widget/edit.ts @@ -194,12 +194,12 @@ function buildReplacement( // Only set widgetType if explicitly provided via --dataset or already on the widget. // Avoids parseWidgetInput defaulting to "spans" for widgets without a widgetType. if (flags.dataset) { - raw.widgetType = flags.dataset; + raw["widgetType"] = flags.dataset; } else if (existing.widgetType) { - raw.widgetType = existing.widgetType; + raw["widgetType"] = existing.widgetType; } if (limit !== undefined && limit !== null) { - raw.limit = limit; + raw["limit"] = limit; } return prepareWidgetQueries(parseWidgetInput(raw)); diff --git a/packages/cli/src/commands/debug-files/check.ts b/packages/cli/src/commands/debug-files/check.ts index 2364321e04..1a2d7aad8d 100644 --- a/packages/cli/src/commands/debug-files/check.ts +++ b/packages/cli/src/commands/debug-files/check.ts @@ -189,5 +189,6 @@ export const checkCommand = buildCommand({ hint: `No usable debug information found. Try: ${usageHint()}`, }; } + return; }, }); diff --git a/packages/cli/src/commands/debug-files/upload.ts b/packages/cli/src/commands/debug-files/upload.ts index 723d9dffcb..8c8f782a2c 100644 --- a/packages/cli/src/commands/debug-files/upload.ts +++ b/packages/cli/src/commands/debug-files/upload.ts @@ -110,7 +110,7 @@ type UploadedFileSummary = { /** Name stamped on the DIF. */ name: string; /** Advisory debug id, if known. */ - debugId?: string; + debugId?: string | undefined; /** Assembly state after upload (omitted for `--no-upload`). */ state?: DebugFileUploadResult["state"]; /** Server detail/error, if any. */ @@ -458,7 +458,7 @@ async function* doUpload( requireAll: boolean; oversizedCount: number; maxFileSize: number; - serverOptions?: ChunkServerOptions; + serverOptions?: ChunkServerOptions | undefined; }, ) { const results = await uploadDebugFiles(params); diff --git a/packages/cli/src/commands/dsn/list.ts b/packages/cli/src/commands/dsn/list.ts index b3414856ee..27a25298e7 100644 --- a/packages/cli/src/commands/dsn/list.ts +++ b/packages/cli/src/commands/dsn/list.ts @@ -112,7 +112,7 @@ type DsnProjectPage = { /** Whether the project has another page. */ hasMore: boolean; /** Server cursor, absent when the project is exhausted. */ - nextCursor?: string; + nextCursor?: string | undefined; }; /** Fetch a bounded project page, allowing callers to report partial failures. */ diff --git a/packages/cli/src/commands/event/send.ts b/packages/cli/src/commands/event/send.ts index a77b0f70df..969e248bc7 100644 --- a/packages/cli/src/commands/event/send.ts +++ b/packages/cli/src/commands/event/send.ts @@ -75,7 +75,8 @@ async function buildFilePayload( try { const firstLine = new TextDecoder().decode(bytes).split("\n")[0] ?? "{}"; const header = JSON.parse(firstLine) as Record; - eventId = typeof header.event_id === "string" ? header.event_id : ""; + const headerEventId = header["event_id"]; + eventId = typeof headerEventId === "string" ? headerEventId : ""; } catch (err) { log.debug("Could not extract event_id from envelope header", err); } diff --git a/packages/cli/src/commands/event/shared-events.ts b/packages/cli/src/commands/event/shared-events.ts index e396e38a91..776f96dda8 100644 --- a/packages/cli/src/commands/event/shared-events.ts +++ b/packages/cli/src/commands/event/shared-events.ts @@ -56,7 +56,7 @@ export type EventsResult = { /** Whether a previous page exists (for bidirectional hints) */ hasPrev: boolean; /** Opaque cursor for fetching the next page */ - nextCursor?: string | null; + nextCursor?: string | null | undefined; /** The issue short ID (for display in header) */ issueShortId: string; /** The numeric issue ID (for pagination context) */ diff --git a/packages/cli/src/commands/event/view.ts b/packages/cli/src/commands/event/view.ts index d6def64c1e..1b97c1827f 100644 --- a/packages/cli/src/commands/event/view.ts +++ b/packages/cli/src/commands/event/view.ts @@ -104,7 +104,7 @@ type SingleEventViewData = Pick & Partial> & { event: SentryEvent; /** Pre-formatted span tree lines for human output (not serialized) */ - spanTreeLines?: string[]; + spanTreeLines?: string[] | undefined; /** Resolved organization, including cross-org fallback results */ org?: string; }; @@ -274,7 +274,7 @@ type EventViewInput = { /** More event IDs, as typed, from more arguments or lines */ extraEventIds?: string[]; /** Server of a pasted Sentry URL, for `applySentryUrlContext` */ - baseUrl?: string; + baseUrl?: string | undefined; /** Warnings to log, such as for reversed arguments */ warnings: readonly string[]; }; @@ -648,7 +648,7 @@ export type ResolvedEventTarget = { project: string; orgDisplay: string; projectDisplay: string; - detectedFrom?: string; + detectedFrom?: string | undefined; /** Pre-fetched event from cross-project resolution — avoids a second API call */ prefetchedEvent?: ResolvedEvent["event"]; }; @@ -715,7 +715,7 @@ export async function resolveEventTarget( break; default: { - const _exhaustiveCheck: never = parsed; + parsed satisfies never; target = null; break; } diff --git a/packages/cli/src/commands/explore.ts b/packages/cli/src/commands/explore.ts index b4a1aba2ea..c6a3d2b85b 100644 --- a/packages/cli/src/commands/explore.ts +++ b/packages/cli/src/commands/explore.ts @@ -176,17 +176,19 @@ type ExploreFlags = { /** Data yielded by the explore command for both JSON and human output */ type ExploreData = { data: Record[]; - meta?: { - fields?: Record; - units?: Record; - }; + meta?: + | { + fields?: Record | undefined; + units?: Record | undefined; + } + | undefined; hasMore: boolean; hasPrev: boolean; - nextCursor?: string | null; + nextCursor?: string | null | undefined; dataset: string; org: string; /** Project filter, when target was `org/project` */ - project?: string; + project?: string | undefined; /** The fields the user requested, in their original order — drives column order */ requestedFields: string[]; }; @@ -321,7 +323,7 @@ function jsonTransformExplore( data.nextCursor !== undefined && data.nextCursor !== "" ) { - envelope.nextCursor = data.nextCursor; + envelope["nextCursor"] = data.nextCursor; } return envelope; } @@ -470,7 +472,7 @@ type DatasetConfig = { timeRange: TimeRange; }) => Promise<{ data: { data: Record[]; meta?: ExploreData["meta"] }; - nextCursor?: string; + nextCursor?: string | undefined; }>; }; @@ -641,7 +643,7 @@ function resolveDatasetConfig(params: { // duplicating and skipping rows (#1519) and makes --limit a top N (#1477). const { fields, sort } = resolveEventsSort({ fields: fieldList, - sort: flags.sort, + sort: flags.sort ?? null, }); const query = resolved.query; diff --git a/packages/cli/src/commands/info.ts b/packages/cli/src/commands/info.ts index 801bec3021..c93ec01c3d 100644 --- a/packages/cli/src/commands/info.ts +++ b/packages/cli/src/commands/info.ts @@ -45,7 +45,7 @@ type InfoStatus = { /** Whether a DSN is configured (via `SENTRY_DSN`). */ have_dsn: boolean; /** Identity of the verified user, when available. */ - user?: { email?: string; name?: string }; + user?: { email?: string | undefined; name?: string | undefined } | undefined; }; /** Flags accepted by `info`. */ @@ -64,9 +64,9 @@ function nonEmpty(value: string | null | undefined): string | null { /** Gather configuration + verify authentication. */ async function gatherStatus(ctx: SentryContext): Promise { const url = - nonEmpty(ctx.env.SENTRY_URL) ?? getDefaultUrl() ?? DEFAULT_SENTRY_URL; - const org = nonEmpty(ctx.env.SENTRY_ORG) ?? getDefaultOrganization(); - const project = nonEmpty(ctx.env.SENTRY_PROJECT) ?? getDefaultProject(); + nonEmpty(ctx.env["SENTRY_URL"]) ?? getDefaultUrl() ?? DEFAULT_SENTRY_URL; + const org = nonEmpty(ctx.env["SENTRY_ORG"]) ?? getDefaultOrganization(); + const project = nonEmpty(ctx.env["SENTRY_PROJECT"]) ?? getDefaultProject(); const authenticated = isAuthenticated(); let successful = false; @@ -87,7 +87,7 @@ async function gatherStatus(ctx: SentryContext): Promise { return { config: { org, project, url }, auth: { type: authenticated ? "token" : null, successful }, - have_dsn: nonEmpty(ctx.env.SENTRY_DSN) !== null, + have_dsn: nonEmpty(ctx.env["SENTRY_DSN"]) !== null, user, }; } diff --git a/packages/cli/src/commands/integration/delete.ts b/packages/cli/src/commands/integration/delete.ts index efe0df6158..459b6f60dc 100644 --- a/packages/cli/src/commands/integration/delete.ts +++ b/packages/cli/src/commands/integration/delete.ts @@ -253,5 +253,6 @@ export const deleteCommand = buildDeleteCommand({ throw enrichDeleteError(error, elevation === "unavailable"); } yield new CommandOutput({ ...result, deleted: true }); + return; }, }); diff --git a/packages/cli/src/commands/issue/list.ts b/packages/cli/src/commands/issue/list.ts index cc80c96419..7079575201 100644 --- a/packages/cli/src/commands/issue/list.ts +++ b/packages/cli/src/commands/issue/list.ts @@ -149,9 +149,9 @@ export type IssueListResult = ListResult & { /** Whether to use compact (single-line) table rendering */ compact?: boolean; /** "More issues available" hint with actionable flags */ - moreHint?: string; + moreHint?: string | undefined; /** DSN detection or multi-project summary footer */ - footer?: string; + footer?: string | undefined; }; /** @internal */ export type SortValue = @@ -398,9 +398,9 @@ function formatListFooter(mode: "single" | "multi" | "none"): string { target: ResolvedTarget; issues: SentryIssue[]; /** Whether the project has more issues beyond what was fetched. */ - hasMore?: boolean; + hasMore?: boolean | undefined; /** Cursor to resume fetching from this project (for Phase 2 / next page). */ - nextCursor?: string; + nextCursor?: string | undefined; }; /** @@ -489,21 +489,21 @@ type FetchResult = FetchResultOf; async function fetchIssuesForTarget( target: ResolvedTarget, options: { - query?: string; + query?: string | undefined; limit: number; sort: SortValue; - statsPeriod?: string; + statsPeriod?: string | undefined; /** Absolute start datetime (ISO-8601). Mutually exclusive with statsPeriod. */ - start?: string; + start?: string | undefined; /** Absolute end datetime (ISO-8601). Mutually exclusive with statsPeriod. */ - end?: string; + end?: string | undefined; /** Resume from this cursor (Phase 2 redistribution or next-page resume). */ - startCursor?: string; - onPage?: (fetched: number, limit: number) => void; + startCursor?: string | undefined; + onPage?: ((fetched: number, limit: number) => void) | undefined; /** Pre-computed API performance options. @see {@link buildListApiOptions} */ - collapse?: IssueCollapseField[]; + collapse?: IssueCollapseField[] | undefined; /** Stats period resolution — undefined when stats are collapsed. */ - groupStatsPeriod?: "" | "14d" | "24h" | "auto"; + groupStatsPeriod?: "" | "14d" | "24h" | "auto" | undefined; }, ): Promise { const result = await withAuthGuard(async () => { @@ -599,7 +599,7 @@ async function runPhase2( * Options for {@link fetchWithBudget}. */ type BudgetFetchOptions = { - query?: string; + query?: string | undefined; limit: number; sort: SortValue; statsPeriod?: string; @@ -612,7 +612,7 @@ type BudgetFetchOptions = { /** Pre-computed collapse fields for API performance. @see {@link buildListApiOptions} */ collapse?: IssueCollapseField[]; /** Stats period resolution — undefined when stats are collapsed. */ - groupStatsPeriod?: "" | "14d" | "24h" | "auto"; + groupStatsPeriod?: "" | "14d" | "24h" | "auto" | undefined; }; /** @@ -779,10 +779,10 @@ async function fetchOrganizationIssues( flags: Pick, timeRange: TimeRange, options: { - cursor?: string; + cursor?: string | undefined; /** Resolved numeric project IDs; omit for an org-wide listing. */ - projects?: readonly number[]; - onPage?: (fetched: number, limit: number) => void; + projects?: readonly number[] | undefined; + onPage?: ((fetched: number, limit: number) => void) | undefined; }, ): Promise { const apiOpts = buildListApiOptions(flags); @@ -1004,7 +1004,7 @@ type ResolvedTargetsOptions = { flags: ListFlags; cwd: string; timeRange: TimeRange; - projectSearchResolution?: ProjectSearchTargetResolution; + projectSearchResolution?: ProjectSearchTargetResolution | undefined; }; /** Default --period value (used to detect user-implicit vs explicit). */ @@ -1097,22 +1097,23 @@ function formatDetailWithSuggestions( * Enrich an API error from issue listing with actionable suggestions. * * Handles both 400 (query/parameter) and 403 (permission) errors. - * Re-throws non-ApiError and unhandled statuses unchanged. + * Returns the error to throw: non-ApiError values and unhandled statuses + * come back unchanged. */ function enrichIssueListError( error: unknown, flags: Pick, -): never { +): unknown { // A user-supplied --query the server cannot parse is a user input mistake, // not a CLI bug: surface it as a ValidationError. A 400 with no user --query // (the CLI built a bad query) falls through and stays a reported ApiError. const queryError = toSearchQueryError(error, flags.query); if (queryError !== error) { - throw queryError; + return queryError; } if (error instanceof ApiError) { if (error.status === 400) { - throw new ApiError( + return new ApiError( error.message, error.status, build400Detail(error.detail, flags), @@ -1125,12 +1126,12 @@ function enrichIssueListError( const detail = error.enriched403 ? appendProjectMembershipHint(error.detail) : build403Detail(error.detail); - throw new ApiError(error.message, error.status, detail, error.endpoint, { + return new ApiError(error.message, error.status, detail, error.endpoint, { enriched403: true, }); } } - throw error; + return error; } /** @@ -1619,9 +1620,9 @@ function jsonTransformIssueList( // query syntax when their search returned nothing. if (!Array.isArray(transformed)) { const envelope = transformed as Record; - const data = envelope.data; + const data = envelope["data"]; if (Array.isArray(data) && data.length === 0) { - envelope._searchSyntax = SEARCH_SYNTAX_REFERENCE; + envelope["_searchSyntax"] = SEARCH_SYNTAX_REFERENCE; } } return transformed; diff --git a/packages/cli/src/commands/issue/plan.ts b/packages/cli/src/commands/issue/plan.ts index ad7c0b1758..33359a1462 100644 --- a/packages/cli/src/commands/issue/plan.ts +++ b/packages/cli/src/commands/issue/plan.ts @@ -156,7 +156,10 @@ function buildPlanData(state: AutofixState): PlanData { }; if (!solution) { - data.no_solution_context = buildNoSolutionContext(state); + const noSolutionContext = buildNoSolutionContext(state); + if (noSolutionContext) { + data.no_solution_context = noSolutionContext; + } } return data; diff --git a/packages/cli/src/commands/issue/unlink.ts b/packages/cli/src/commands/issue/unlink.ts index 9e581f91b6..8541a87ba8 100644 --- a/packages/cli/src/commands/issue/unlink.ts +++ b/packages/cli/src/commands/issue/unlink.ts @@ -86,5 +86,6 @@ export const unlinkCommand = buildDeleteCommand({ dryRun: flags["dry-run"], }); yield new CommandOutput(result); + return; }, }); diff --git a/packages/cli/src/commands/issue/utils.ts b/packages/cli/src/commands/issue/utils.ts index b89d081737..fa5a571209 100644 --- a/packages/cli/src/commands/issue/utils.ts +++ b/packages/cli/src/commands/issue/utils.ts @@ -1036,7 +1036,7 @@ export async function resolveIssue( */ export async function resolveOrgAndIssueId( options: ResolveIssueOptions, -): Promise<{ org: string; issueId: string; projectId?: string }> { +): Promise<{ org: string; issueId: string; projectId?: string | undefined }> { const result = await resolveIssue(options); return { org: result.org, diff --git a/packages/cli/src/commands/local/control-plane.ts b/packages/cli/src/commands/local/control-plane.ts index d180d14348..33ad0afc92 100644 --- a/packages/cli/src/commands/local/control-plane.ts +++ b/packages/cli/src/commands/local/control-plane.ts @@ -96,7 +96,7 @@ function eventIdFrom(value: unknown): string | undefined { if (typeof value !== "object" || value === null || Array.isArray(value)) { return undefined; } - const id = (value as Record).event_id; + const id = (value as Record)["event_id"]; return typeof id === "string" && id.length > 0 ? id : undefined; } @@ -145,7 +145,7 @@ function eventSummary(parsed: { ) { return []; } - const type = (item[0] as Record).type; + const type = (item[0] as Record)["type"]; if (type !== "event" && type !== "transaction") { return []; } @@ -238,6 +238,7 @@ export function createLocalControlPlane({ ) return c.body(null, 403); await next(); + return; }); app.get("/health", (c) => { @@ -260,6 +261,7 @@ export function createLocalControlPlane({ return c.body(null, 401); } await next(); + return; }); const loopbackCors = cors({ allowHeaders: [ @@ -624,9 +626,12 @@ export function createLocalControlPlane({ ? c.json(sessionStore.getRetention(c.req.param("id")).getSettings()) : c.body(null, 404), ); - app.post(`${CONTROL_PLANE_PREFIX}/sessions/:id/retention`, (c) => - sessionExists(c.req.param("id")) ? updateRetention(c) : c.body(null, 404), - ); + app.post(`${CONTROL_PLANE_PREFIX}/sessions/:id/retention`, async (c) => { + if (!sessionExists(c.req.param("id"))) { + return c.body(null, 404); + } + return await updateRetention(c); + }); app.post(`${CONTROL_PLANE_PREFIX}/sessions/:id/reset`, (c) => { if (!sessionExists(c.req.param("id"))) { diff --git a/packages/cli/src/commands/local/daemon.ts b/packages/cli/src/commands/local/daemon.ts index 76ccc65230..293bed47aa 100644 --- a/packages/cli/src/commands/local/daemon.ts +++ b/packages/cli/src/commands/local/daemon.ts @@ -519,13 +519,17 @@ async function waitForLocalDaemon( if (!isProcessRunning(owner)) throw error; } } + return undefined; } /** Start the daemon child and wait until its authenticated discovery state is available. */ export async function ensureLocalDaemon({ host = "localhost", port = DEFAULT_PORT, -}: { host?: string; port?: number } = {}): Promise { +}: { + host?: string | undefined; + port?: number | undefined; +} = {}): Promise { if (!isLoopbackHost(host)) throw new Error("The Local control-plane host must be loopback-only."); if (port === 0) @@ -763,7 +767,7 @@ export async function createLocalDaemonSession({ maxEnvelopes, }: { readonly clientId?: string; - readonly maxEnvelopes?: number; + readonly maxEnvelopes?: number | undefined; readonly cwd: string; readonly host?: string; readonly label: string; diff --git a/packages/cli/src/commands/local/envelope.ts b/packages/cli/src/commands/local/envelope.ts index 26a66936c4..457d15f140 100644 --- a/packages/cli/src/commands/local/envelope.ts +++ b/packages/cli/src/commands/local/envelope.ts @@ -181,13 +181,13 @@ function frame(body: Buffer): { const item: unknown = JSON.parse(itemHeaderBytes.toString("utf8")); if ( !isEnvelopeObject(item) || - (item.type !== undefined && typeof item.type !== "string") + (item["type"] !== undefined && typeof item["type"] !== "string") ) return null; const itemHeader = item as ItemHeader; let bytes: Buffer; - if (itemHeader.length !== undefined) { - const length = itemHeader.length; + if (itemHeader["length"] !== undefined) { + const length = itemHeader["length"]; if ( typeof length !== "number" || !Number.isSafeInteger(length) || @@ -220,10 +220,10 @@ function decode( const items: ParsedReceiverEnvelope["envelope"][1] = []; for (const { header: itemHeader, bytes } of framed.items) { const contentType = - typeof itemHeader.content_type === "string" - ? itemHeader.content_type + typeof itemHeader["content_type"] === "string" + ? itemHeader["content_type"] : ""; - const metaLength = itemHeader.meta_length; + const metaLength = itemHeader["meta_length"]; let payload: Record | undefined; if ( typeof metaLength === "number" && @@ -248,16 +248,16 @@ function decode( payload = parsed; } if (payload) { - if (itemHeader.type) payload.type = itemHeader.type; + if (itemHeader.type) payload["type"] = itemHeader.type; } else { // Opaque or non-JSON items stay raw; the rest of the envelope decodes. if (itemHeader.type === "statsd" && !contentType) - itemHeader.content_type = "text/plain"; + itemHeader["content_type"] = "text/plain"; payload = { data: bytes.toString( TEXT_CONTENT_TYPES.has( - typeof itemHeader.content_type === "string" - ? itemHeader.content_type + typeof itemHeader["content_type"] === "string" + ? itemHeader["content_type"] : "", ) ? "utf8" @@ -267,8 +267,8 @@ function decode( } items.push([itemHeader, payload]); } - header.__spotlight_envelope_id = id; - if (userAgent) header.__spotlight_sender_user_agent = userAgent; + header["__spotlight_envelope_id"] = id; + if (userAgent) header["__spotlight_sender_user_agent"] = userAgent; return [{ ...header, __spotlight_envelope_id: id }, items]; } @@ -351,25 +351,25 @@ function withoutOwnRequests( const isOwnSpan = (span: unknown) => isOwnRequestSpan(span, isOwnRoute); if (type === "span") { // Legacy standalone span, or a v2 container of spans. - if (!Array.isArray(payload.items)) return isOwnSpan(payload) ? null : item; + if (!Array.isArray(payload["items"])) return isOwnSpan(payload) ? null : item; if (!prune(payload, "items", isOwnSpan)) return item; - const { length } = payload.items as unknown[]; + const { length } = payload["items"] as unknown[]; if (!length) return null; - if (header.item_count !== undefined) header.item_count = length; + if (header["item_count"] !== undefined) header["item_count"] = length; } else { const isOwnCrumb = (crumb: unknown) => isEnvelopeObject(crumb) && - isEnvelopeObject(crumb.data) && - isOwnRoute(crumb.data.url); + isEnvelopeObject(crumb["data"]) && + isOwnRoute(crumb["data"]["url"]); // Breadcrumbs are a list (JavaScript) or `{ values }` (Python). - const crumbsPruned = isEnvelopeObject(payload.breadcrumbs) - ? prune(payload.breadcrumbs, "values", isOwnCrumb) + const crumbsPruned = isEnvelopeObject(payload["breadcrumbs"]) + ? prune(payload["breadcrumbs"], "values", isOwnCrumb) : prune(payload, "breadcrumbs", isOwnCrumb); const spansPruned = prune(payload, "spans", isOwnSpan); if (!crumbsPruned && !spansPruned) return item; } const bytes = Buffer.from(JSON.stringify(payload)); - header.length = bytes.length; + header["length"] = bytes.length; return { header, headerBytes: Buffer.from(JSON.stringify(header)), bytes }; } @@ -413,7 +413,7 @@ export function withoutOwnDeliveries( export function createReceiverEnvelope(input: { body: Buffer; contentType?: string; - userAgent?: string; + userAgent?: string | undefined; }): ReceiverEnvelope { const contentType = input.contentType?.split(";")[0]?.trim().toLowerCase() || diff --git a/packages/cli/src/commands/local/receiver-ingest.ts b/packages/cli/src/commands/local/receiver-ingest.ts index 9f6e570b2e..3ddac4526f 100644 --- a/packages/cli/src/commands/local/receiver-ingest.ts +++ b/packages/cli/src/commands/local/receiver-ingest.ts @@ -123,10 +123,10 @@ export function ingestReceiverEnvelope( input: { body: Buffer; contentType?: string; - encoding?: string; + encoding?: string | undefined; /** URL the delivery was posted to, which identifies the receiver's own routes. */ receiverUrl?: string; - userAgent?: string; + userAgent?: string | undefined; }, ): Promise<204 | 400 | 413 | 415 | 503> { const contentType = input.contentType?.split(";")[0]?.trim().toLowerCase(); diff --git a/packages/cli/src/commands/local/retention-buffer.ts b/packages/cli/src/commands/local/retention-buffer.ts index b8e5dc9c57..d0a7255ac2 100644 --- a/packages/cli/src/commands/local/retention-buffer.ts +++ b/packages/cli/src/commands/local/retention-buffer.ts @@ -18,7 +18,7 @@ import { type Subscriber = { callback: Parameters[0]; position: number; - scheduled?: NodeJS.Immediate; + scheduled?: NodeJS.Immediate | undefined; }; type RetainedEnvelope = { item: ReceiverEnvelope; @@ -73,15 +73,15 @@ function record(value: unknown): Record { } function hasStackFilename(payload: unknown, filename: string): boolean { - const values = record(record(payload).exception).values; + const values = record(record(payload)["exception"])["values"]; return ( Array.isArray(values) && values.some((value) => { - const frames = record(record(value).stacktrace).frames; + const frames = record(record(value)["stacktrace"])["frames"]; return ( Array.isArray(frames) && frames.some((frame) => { - const candidate = record(frame).filename; + const candidate = record(frame)["filename"]; return typeof candidate === "string" && candidate.endsWith(filename); }) ); @@ -139,7 +139,6 @@ export function createLocalRetentionBuffer( .filter((entry) => { if ( "timeWindow" in filters && - filters.timeWindow !== undefined && entry.arrivedAt <= Date.now() - filters.timeWindow * 1000 ) return false; diff --git a/packages/cli/src/commands/local/run.ts b/packages/cli/src/commands/local/run.ts index 0a5ab0d586..d235365e6b 100644 --- a/packages/cli/src/commands/local/run.ts +++ b/packages/cli/src/commands/local/run.ts @@ -173,7 +173,7 @@ type EventTailOptions = { activeFilters: ReadonlySet; useJson: boolean; showAttributes: boolean; - maxEnvelopes?: number; + maxEnvelopes?: number | undefined; }; /** Keep stdout exclusively for NDJSON when an agent requests JSON output. */ @@ -379,7 +379,7 @@ export function augmentPathForNode( ): Record { const binDir = resolve(cwd, "node_modules", ".bin"); if (platform !== "win32") { - return { ...env, PATH: env.PATH ? `${binDir}:${env.PATH}` : binDir }; + return { ...env, PATH: env["PATH"] ? `${binDir}:${env["PATH"]}` : binDir }; } const key = windowsEnvKey(env, "PATH") ?? "PATH"; const current = env[key]; @@ -426,8 +426,8 @@ function buildChildEnv( ...process.env, ...clientSpotlightVars, SENTRY_SPOTLIGHT: spotlightUrl, - SENTRY_TRACES_SAMPLE_RATE: process.env.SENTRY_TRACES_SAMPLE_RATE ?? "1", - SENTRY_RELEASE: process.env.SENTRY_RELEASE ?? "sentry-cli-local", + SENTRY_TRACES_SAMPLE_RATE: process.env["SENTRY_TRACES_SAMPLE_RATE"] ?? "1", + SENTRY_RELEASE: process.env["SENTRY_RELEASE"] ?? "sentry-cli-local", }; if (isPackageJsonSource(commandSource)) { env = augmentPathForNode(env, cwd); @@ -716,9 +716,9 @@ export const runCommand = buildCommand({ let timeoutId: ReturnType | undefined; if (flags.timeout > 0) { - timeoutId = setTimeout(async () => { + timeoutId = setTimeout(() => { logger.warn(`Timeout: killing child after ${flags.timeout}s`); - await gracefulKill(child); + void gracefulKill(child); }, flags.timeout * 1000); } diff --git a/packages/cli/src/commands/local/server.ts b/packages/cli/src/commands/local/server.ts index bd34ec51aa..d8e7cd08b7 100644 --- a/packages/cli/src/commands/local/server.ts +++ b/packages/cli/src/commands/local/server.ts @@ -235,7 +235,7 @@ export { isLoopbackHost } from "./loopback.js"; * own `toString()`. */ export function spotlightEnvelopeId(header: Record): string { - const id = header.__spotlight_envelope_id as + const id = header["__spotlight_envelope_id"] as | { toString(): string } | null | undefined; @@ -311,7 +311,7 @@ export function buildSSEHandler( } stream .writeSSE({ - id: envelopeId || undefined, + ...(envelopeId ? { id: envelopeId } : {}), event: `${container.getContentType()}${base64Indicator}`, data, }) @@ -669,7 +669,7 @@ export function tryListen( const boundPort = typeof addr === "object" && addr ? addr.port : port; resolve({ server, port: boundPort }); }); - server.once("error", async (err: NodeJS.ErrnoException) => { + server.once("error", (err: NodeJS.ErrnoException) => { server.close(); if (err.code === "EADDRINUSE") { attempts += 1; @@ -680,8 +680,7 @@ export function tryListen( logger.warn( `Port ${port} is in use, retrying in ${PORT_RETRY_DELAY_MS / 1000}s (attempt ${attempts}/${retries})...`, ); - await sleep(PORT_RETRY_DELAY_MS); - resolve(attempt()); + resolve(sleep(PORT_RETRY_DELAY_MS).then(attempt)); return; } reject(err); @@ -835,7 +834,7 @@ const SSE_MAX_RETRY_MS = 30_000; export type ConsumeSSEOptions = { url: string; /** A full scoped stream URL, when consuming a daemon-owned session. */ - streamUrl?: string; + streamUrl?: string | undefined; activeFilters: ReadonlySet; signal: AbortSignal; quiet?: boolean; @@ -1016,7 +1015,7 @@ async function attemptSSEConnection( /** Options for a single SSE connection attempt. */ type ConsumeSSEOnceOptions = { url: string; - streamUrl?: string; + streamUrl?: string | undefined; activeFilters: ReadonlySet; signal: AbortSignal; quiet: boolean; diff --git a/packages/cli/src/commands/local/session-store.ts b/packages/cli/src/commands/local/session-store.ts index 062b01e978..93bf43905c 100644 --- a/packages/cli/src/commands/local/session-store.ts +++ b/packages/cli/src/commands/local/session-store.ts @@ -23,7 +23,7 @@ export type LocalSessionState = "open" | "retained"; /** Public session metadata, excluding telemetry buffers and secret capabilities. */ export type LocalSession = { - readonly clientId?: string; + readonly clientId?: string | undefined; readonly id: string; readonly label: string; readonly cwd: string; @@ -43,10 +43,10 @@ type StoredSession = LocalSession & { /** Session label, working directory, and optional retry idempotency key. */ export type CreateLocalSessionInput = { - readonly clientId?: string; + readonly clientId?: string | undefined; readonly label: string; readonly cwd: string; - readonly maxEnvelopes?: number; + readonly maxEnvelopes?: number | undefined; }; /** `code` of the control plane's 409 body for an ambiguous session name. */ diff --git a/packages/cli/src/commands/local/viewer-protocol.ts b/packages/cli/src/commands/local/viewer-protocol.ts index a38f9e3eda..103b782483 100644 --- a/packages/cli/src/commands/local/viewer-protocol.ts +++ b/packages/cli/src/commands/local/viewer-protocol.ts @@ -7,7 +7,7 @@ export type LocalSessionEvent = { state: "open" | "retained"; action?: "reset"; /** Existing retained-session deadline, in epoch milliseconds. */ - expiresAt?: number; + expiresAt?: number | undefined; }; /** diff --git a/packages/cli/src/commands/log/list.ts b/packages/cli/src/commands/log/list.ts index 31709115c2..94d237a47c 100644 --- a/packages/cli/src/commands/log/list.ts +++ b/packages/cli/src/commands/log/list.ts @@ -106,7 +106,7 @@ type LogListResult = { /** Whether more results are available beyond the limit */ hasMore: boolean; /** Extra field names requested via `--fields`, used to render additional columns in human mode. */ - extraFields?: string[]; + extraFields?: string[] | undefined; }; /** Output yielded by log list: either a batch (single-fetch) or an individual item (follow). */ @@ -152,7 +152,7 @@ function parseFollow(value: string): number { type LogLike = BaseLogLike & { /** Nanosecond-precision timestamp used for dedup in follow mode. * Optional because TraceLog may omit it when the API response doesn't include it. */ - timestamp_precise?: number; + timestamp_precise?: number | undefined; }; /** Result from a single fetch: logs to yield + hint for the footer. */ @@ -171,7 +171,7 @@ type LogListInput = readonly mode: "project"; readonly target: ParsedOrgProject; /** Server of a pasted Sentry URL, for `applySentryUrlContext` */ - readonly baseUrl?: string; + readonly baseUrl?: string | undefined; } | { readonly mode: "trace"; readonly trace: TraceTargetInput }; @@ -183,7 +183,7 @@ type LogListTarget = readonly org: string; readonly traceId: string; /** Project the user named, to filter the trace's logs by */ - readonly projectFilter?: string; + readonly projectFilter?: string | undefined; }; /** The arguments of `log list`. */ @@ -243,7 +243,7 @@ async function executeSingleFetch( org: string, project: string, flags: ListFlags, - options: { timeRange: TimeRange; projectId?: number }, + options: { timeRange: TimeRange; projectId?: number | undefined }, ): Promise { const { timeRange, projectId } = options; const logs = await listLogs(org, project, { @@ -340,7 +340,7 @@ type FollowGeneratorConfig = { * External abort signal (library mode). When aborted, the follow * generator stops on the next poll cycle. Complements SIGINT handling. */ - abortSignal?: AbortSignal; + abortSignal?: AbortSignal | undefined; }; /** Find the highest timestamp_precise in a batch, or undefined if none have it. */ @@ -543,7 +543,7 @@ type TraceFetchOptions = { flags: ListFlags; timeRange: TimeRange; /** Project slug for API-level filtering (from org/project/trace-id syntax) */ - projectFilter?: string; + projectFilter?: string | undefined; }; /** diff --git a/packages/cli/src/commands/log/view.ts b/packages/cli/src/commands/log/view.ts index bb1b1cf3e9..0a1f86f115 100644 --- a/packages/cli/src/commands/log/view.ts +++ b/packages/cli/src/commands/log/view.ts @@ -153,7 +153,7 @@ async function validateAndRecoverLogId( export type ResolvedLogTarget = { org: string; project: string; - detectedFrom?: string; + detectedFrom?: string | undefined; }; /** @@ -417,9 +417,9 @@ type LogViewData = { /** Org slug — needed by human formatter for trace URLs, also useful context in JSON */ orgSlug: string; /** Full attribute sets from the trace-items detail endpoint (index matches logs) */ - details?: (TraceItemDetail | undefined)[]; + details?: (TraceItemDetail | undefined)[] | undefined; /** --fields filter: limits which custom attributes are shown in human output */ - extraFields?: string[]; + extraFields?: string[] | undefined; }; /** diff --git a/packages/cli/src/commands/org/list.ts b/packages/cli/src/commands/org/list.ts index d044f843ad..14d2094a07 100644 --- a/packages/cli/src/commands/org/list.ts +++ b/packages/cli/src/commands/org/list.ts @@ -58,6 +58,7 @@ import type { OrgListAccountSchema, OrgListEntryFields, } from "../../output-schemas/org.js"; +import { rethrow } from "../../lib/rethrow.js"; type ListFlags = { readonly limit: number; @@ -77,7 +78,7 @@ type OrgListEntry = WithOutputFields< /** One account's fetched orgs plus its slug → region URL cache. */ type AccountOrgs = { - account?: AccountSummary; + account?: AccountSummary | undefined; orgs: SentryOrganization[]; regions: Map; }; @@ -276,7 +277,7 @@ async function fetchOrgsAcrossAccounts( ); } if (fetched.length === 0 && firstError !== undefined) { - throw firstError; + rethrow(firstError); } return fetched; } diff --git a/packages/cli/src/commands/proguard/upload.ts b/packages/cli/src/commands/proguard/upload.ts index df5e34848d..63d85f5f1a 100644 --- a/packages/cli/src/commands/proguard/upload.ts +++ b/packages/cli/src/commands/proguard/upload.ts @@ -92,8 +92,8 @@ function validateUuidFormat(uuid: string): void { * @returns File content as a Buffer * @throws {ValidationError} On ENOENT, EISDIR, or other read failures */ -async function readMappingFile(path: string): Promise { - let content: Buffer; +async function readMappingFile(path: string): Promise> { + let content: Buffer; try { content = await readFile(path); } catch (err) { diff --git a/packages/cli/src/commands/project/create.ts b/packages/cli/src/commands/project/create.ts index 9a8a26b598..c17d0f7311 100644 --- a/packages/cli/src/commands/project/create.ts +++ b/packages/cli/src/commands/project/create.ts @@ -156,7 +156,7 @@ async function handleCreateProject404(opts: { teamSlug: string; name: string; platform: string; - detectedFrom?: string; + detectedFrom?: string | undefined; }): Promise { const { orgSlug, teamSlug, name, platform, detectedFrom } = opts; @@ -219,8 +219,8 @@ async function handleCreateProject404(opts: { async function resolveDryRunTeam( orgSlug: string, opts: { - team?: string; - detectedFrom?: string; + team?: string | undefined; + detectedFrom?: string | undefined; autoCreateSlug: string; }, ): Promise { @@ -260,7 +260,7 @@ type CreateProjectOpts = CreateProjectBaseOpts & { /** Team slug that will own the project. */ teamSlug: string; /** Source used to resolve the organization, when auto-detected. */ - detectedFrom?: string; + detectedFrom?: string | undefined; }; /** @@ -376,7 +376,7 @@ async function createProjectWithErrors( /** A validated project specification parsed from the command positionals. */ type ParsedProjectSpec = { /** Explicit organization slug, when the name used org/name syntax. */ - org?: string; + org?: string | undefined; /** Project display name. */ name: string; /** Validated Sentry platform identifier. */ @@ -386,10 +386,10 @@ type ParsedProjectSpec = { /** `project create`'s positionals, parsed. */ type ProjectSpecsInput = { /** Org prefix the names share, if any */ - readonly explicitOrg?: string; + readonly explicitOrg?: string | undefined; readonly parsed: readonly ParsedProjectSpec[]; /** Server of a pasted Sentry URL, for `applySentryUrlContext` */ - readonly baseUrl?: string; + readonly baseUrl?: string | undefined; readonly warnings: readonly string[]; }; @@ -580,13 +580,13 @@ async function createOneProject(opts: { name: string; platform: string; flags: CreateFlags; - detectedFrom?: string; + detectedFrom?: string | undefined; /** * Slug to use when auto-creating a team in an org with no teams. Shared * across a multi-project batch so every project lands in (or previews) the * one team the first project creates — rather than each resolving its own. */ - teamAutoCreateSlug?: string; + teamAutoCreateSlug?: string | undefined; }): Promise { const { orgSlug, name, platform, flags, detectedFrom } = opts; const expectedSlug = slugify(name); diff --git a/packages/cli/src/commands/project/delete.ts b/packages/cli/src/commands/project/delete.ts index 594b860b5b..b868fb569a 100644 --- a/packages/cli/src/commands/project/delete.ts +++ b/packages/cli/src/commands/project/delete.ts @@ -74,7 +74,9 @@ async function buildPermissionError( // oxlint-disable-next-line sentry-cli/no-silent-catch -- grandfathered silent catch — see #1531; drain by adding log.debug()/log.warn() or re-throwing. try { const org = await getOrganization(orgSlug); - orgRole = (org as Record).orgRole as string | undefined; + orgRole = (org as Record)["orgRole"] as + | string + | undefined; } catch { // Fall through to generic message } diff --git a/packages/cli/src/commands/project/list.ts b/packages/cli/src/commands/project/list.ts index b9c9d05896..7ba8a9a6d5 100644 --- a/packages/cli/src/commands/project/list.ts +++ b/packages/cli/src/commands/project/list.ts @@ -94,7 +94,7 @@ type ListFlags = { * {@link ListFlags} plus the name filter taken from the target * (`sentry project list /web-*`), which the handlers apply. */ -type ProjectListFlags = ListFlags & { readonly filter?: string }; +type ProjectListFlags = ListFlags & { readonly filter?: string | undefined }; /** * Project with optional organization context for display. @@ -275,8 +275,8 @@ export function buildContextKey( /** Result of resolving organizations to fetch projects from */ type OrgResolution = { orgs: string[]; - footer?: string; - skippedSelfHosted?: number; + footer?: string | undefined; + skippedSelfHosted?: number | undefined; }; /** @@ -324,7 +324,10 @@ export function displayProjectTable(projects: ProjectWithOrg[]): string { * that mirrors `fetchOrgProjectsSafe` — re-throws auth errors but * silently returns empty for other failures (403, network errors). */ -type PaginatedResult = { projects: ProjectWithOrg[]; nextCursor?: string }; +type PaginatedResult = { + projects: ProjectWithOrg[]; + nextCursor?: string | undefined; +}; async function fetchPaginatedSafe( org: string, @@ -351,7 +354,7 @@ async function fetchPaginatedSafe( async function fetchAutoDetectProjects( orgs: string[], flags: ProjectListFlags, -): Promise<{ projects: ProjectWithOrg[]; nextCursor?: string }> { +): Promise<{ projects: ProjectWithOrg[]; nextCursor?: string | undefined }> { if (orgs.length === 1 && !flags.platform && !flags.filter) { return await fetchPaginatedSafe(orgs[0] as string, flags.limit); } @@ -749,11 +752,11 @@ export async function handleProjectSearch( flags: ProjectListFlags, options?: { /** Original user input before normalization — for clearer messages. */ - originalSlug?: string; + originalSlug?: string | undefined; /** Organization slug to scope the search to (e.g. from "org/My Project"). */ - scopedOrg?: string; + scopedOrg?: string | undefined; /** Classification supplied by the dispatcher after its target pre-check. */ - projectSearchResolution?: ProjectSearchTargetResolution; + projectSearchResolution?: ProjectSearchTargetResolution | undefined; }, ): Promise> { const { originalSlug, scopedOrg, projectSearchResolution } = options ?? {}; diff --git a/packages/cli/src/commands/project/view.ts b/packages/cli/src/commands/project/view.ts index 01b39b45d9..4a2f2449d6 100644 --- a/packages/cli/src/commands/project/view.ts +++ b/packages/cli/src/commands/project/view.ts @@ -97,7 +97,7 @@ type ProjectViewEntry = WithOutputFields< typeof ProjectViewOutputFields > & { /** Where the project was auto-detected from (human output only) */ - detectedFrom?: string; + detectedFrom?: string | undefined; }; /** Result of fetching a single project with its DSN */ @@ -267,7 +267,7 @@ function formatProjectViewHuman(entries: ProjectViewEntry[]): string { } /** Project view targets: one for an explicit or searched project, all detected ones for auto-detect. */ -type ViewTargets = { targets: ResolvedTarget[]; footer?: string }; +type ViewTargets = { targets: ResolvedTarget[]; footer?: string | undefined }; /** Resolve the `project view` positional to the projects to show. */ async function resolveViewTargets( diff --git a/packages/cli/src/commands/react-native/gradle.ts b/packages/cli/src/commands/react-native/gradle.ts index 6e7a7034db..23f022edd6 100644 --- a/packages/cli/src/commands/react-native/gradle.ts +++ b/packages/cli/src/commands/react-native/gradle.ts @@ -54,8 +54,8 @@ type GradleResult = { bundle: string; sourcemap: string; debugId: string; - release?: string; - dist?: string[]; + release?: string | undefined; + dist?: string[] | undefined; /** Number of upload operations performed (one per distribution). */ uploads: number; }; diff --git a/packages/cli/src/commands/react-native/xcode.ts b/packages/cli/src/commands/react-native/xcode.ts index c008a9ce90..8ab1707bdf 100644 --- a/packages/cli/src/commands/react-native/xcode.ts +++ b/packages/cli/src/commands/react-native/xcode.ts @@ -76,9 +76,9 @@ type XcodeResult = { mode: "debug" | "fetch" | "wrap"; bundle?: string; sourcemap?: string; - debugId?: string; - release?: string; - dist?: string[]; + debugId?: string | undefined; + release?: string | undefined; + dist?: string[] | undefined; uploads: number; }; @@ -110,7 +110,7 @@ function shouldWrap(flags: XcodeFlags, env: NodeJS.ProcessEnv): boolean { if (flags.force) { return true; } - const configuration = env.CONFIGURATION; + const configuration = env["CONFIGURATION"]; if (configuration === undefined) { throw new ValidationError( "Need to run this from Xcode (CONFIGURATION is not set).", @@ -240,8 +240,8 @@ function runWrappedBuild( __SENTRY_RN_WRAP_XCODE_CALL: "1", }; if (existsSync(hermesc)) { - env.HERMES_CLI_PATH = self; - env.SENTRY_RN_REAL_HERMES_CLI_PATH = hermesc; + env["HERMES_CLI_PATH"] = self; + env["SENTRY_RN_REAL_HERMES_CLI_PATH"] = hermesc; } const status = runScript(script, scriptArgs, env); @@ -299,8 +299,8 @@ async function uploadPair( ctx: SentryContext, flags: XcodeFlags, ): Promise<{ - debugId?: string; - release?: string; + debugId?: string | undefined; + release?: string | undefined; dist: string[]; uploads: number; }> { @@ -517,7 +517,7 @@ export const xcodeCommand = buildCommand({ const wrap = shouldWrap(flags, this.env); const script = resolveScript(flags, this.cwd); - const simulator = this.env.PLATFORM_NAME?.endsWith("simulator") ?? false; + const simulator = this.env["PLATFORM_NAME"]?.endsWith("simulator") ?? false; const fetchUrl = flags["allow-fetch"] && simulator ? (flags["fetch-from"] ?? DEFAULT_PACKAGER_URL) diff --git a/packages/cli/src/commands/release/create.ts b/packages/cli/src/commands/release/create.ts index 82a46d82c9..2d54ea144b 100644 --- a/packages/cli/src/commands/release/create.ts +++ b/packages/cli/src/commands/release/create.ts @@ -25,6 +25,7 @@ import type { SentryRelease, WithOutputFields } from "../../types/index.js"; import { type ReleaseTarget, releaseParameter } from "./parse.js"; import { ReleaseCreateOutputSchema } from "../../generated/output-schemas/release.js"; import type { ReleaseCreateOutputFields } from "../../output-schemas/release.js"; +import { omitUndefined } from "../../lib/omit-undefined.js"; const usageHint = () => sentry`release create [/]`; @@ -188,14 +189,14 @@ export const createCommand = buildCommand({ // Dry-run mode: show what would be created without calling the API if (flags["dry-run"]) { - const preview: ReleaseCreateDryRun = { - dryRun: true, + const preview: ReleaseCreateDryRun = omitUndefined({ + dryRun: true as const, version, projects: (body.projects ?? []).map((slug) => ({ slug })), ref: body.ref, url: body.url, dateReleased: body.dateReleased, - }; + }); yield new CommandOutput(preview); return { hint: "Dry run — no release was created." }; } diff --git a/packages/cli/src/commands/release/delete.ts b/packages/cli/src/commands/release/delete.ts index 2dfdcff3d8..538eb536d3 100644 --- a/packages/cli/src/commands/release/delete.ts +++ b/packages/cli/src/commands/release/delete.ts @@ -154,5 +154,6 @@ export const deleteCommand = buildDeleteCommand({ throw enrichDeleteError(error, org, version); } yield new CommandOutput({ deleted: true, org, version }); + return; }, }); diff --git a/packages/cli/src/commands/release/deploy.ts b/packages/cli/src/commands/release/deploy.ts index eb6453c8b1..6a2a81c9f7 100644 --- a/packages/cli/src/commands/release/deploy.ts +++ b/packages/cli/src/commands/release/deploy.ts @@ -24,6 +24,7 @@ import { type ReleaseTarget, releaseParameter } from "./parse.js"; import { ReleaseDeployOutputSchema } from "../../generated/output-schemas/release.js"; import type { ReleaseDeployOutputFields } from "../../output-schemas/release.js"; import { sentry } from "../../lib/app-identity.js"; +import { omitUndefined } from "../../lib/omit-undefined.js"; const usageHint = () => sentry`release deploy [/] [name]`; @@ -74,7 +75,7 @@ function formatDeployCreated(deploy: DeployOutput): string { function parseDeployArgs( environment: string | undefined, name?: string, -): { environment: string; name?: string } { +): { environment: string; name?: string | undefined } { if (!environment) { throw new ContextError("Environment", usageHint(), []); } @@ -210,19 +211,22 @@ export const deployCommand = buildCommand({ } if (flags["dry-run"]) { - yield new CommandOutput({ - dryRun: true, - version, - environment, - name, - url: flags.url, - dateStarted: body.dateStarted, - dateFinished: body.dateFinished, - }); + yield new CommandOutput( + omitUndefined({ + dryRun: true as const, + version, + environment, + name, + url: flags.url, + dateStarted: body.dateStarted, + dateFinished: body.dateFinished, + }), + ); return { hint: "Dry run — no deploy was created." }; } const deploy = await createReleaseDeploy(org, version, body); yield new CommandOutput(deploy); + return; }, }); diff --git a/packages/cli/src/commands/release/finalize.ts b/packages/cli/src/commands/release/finalize.ts index fbdfbf5469..c2ef2a6106 100644 --- a/packages/cli/src/commands/release/finalize.ts +++ b/packages/cli/src/commands/release/finalize.ts @@ -128,7 +128,7 @@ export const finalizeCommand = buildCommand({ dateReleased: flags.released || new Date().toISOString(), }; if (flags.url) { - body.url = flags.url; + body["url"] = flags.url; } const release = await updateRelease(org, version, body); yield new CommandOutput(release); diff --git a/packages/cli/src/commands/release/parse.ts b/packages/cli/src/commands/release/parse.ts index 830af906f7..4636a5ffb5 100644 --- a/packages/cli/src/commands/release/parse.ts +++ b/packages/cli/src/commands/release/parse.ts @@ -71,7 +71,7 @@ export type ResolvedReleaseTarget = { /** The resolved organization slug. */ org: string; /** Source description when the org was auto-detected (e.g. from a DSN). */ - detectedFrom?: string; + detectedFrom?: string | undefined; }; /** A parsed `[/]` positional, bound to its org resolver. */ diff --git a/packages/cli/src/commands/release/set-commits.ts b/packages/cli/src/commands/release/set-commits.ts index 8f1aa7cc59..70951bbda7 100644 --- a/packages/cli/src/commands/release/set-commits.ts +++ b/packages/cli/src/commands/release/set-commits.ts @@ -64,7 +64,7 @@ function setCommitsFromLocal( org: string, version: string, cwd: string, - options: { depth?: number; paths?: string[]; from?: string }, + options: { depth?: number; paths?: string[]; from?: string | undefined }, ): Promise { const { depth, paths, from } = options; if (!isInsideGitWorkTree(cwd)) { @@ -108,7 +108,7 @@ function setCommitsFromLocal( const repoName = getRepositoryName(cwd); const commitsWithRepo = commits.map((c) => ({ ...c, - repository: repoName, + ...(repoName !== undefined && { repository: repoName }), })); return setCommitsLocal(org, version, commitsWithRepo); @@ -282,7 +282,7 @@ function parseLocalScope(flags: { commit?: string; path?: string; from?: string; -}): { paths: string[]; from?: string } { +}): { paths: string[]; from?: string | undefined } { const serverExpanded = flags.auto || Boolean(flags.commit); const paths = diff --git a/packages/cli/src/commands/replay/list.ts b/packages/cli/src/commands/replay/list.ts index f31993e061..4ad88fc764 100644 --- a/packages/cli/src/commands/replay/list.ts +++ b/packages/cli/src/commands/replay/list.ts @@ -79,9 +79,9 @@ type ReplayListResult = { replays: ReplayListItem[]; hasMore: boolean; hasPrev: boolean; - nextCursor?: string | null; + nextCursor?: string | null | undefined; org: string; - project?: string; + project?: string | undefined; }; type ReplaySortKey = "date" | "oldest" | "duration" | "errors" | "activity"; diff --git a/packages/cli/src/commands/replay/view.ts b/packages/cli/src/commands/replay/view.ts index 993ad9e7bb..0ff15f3d5a 100644 --- a/packages/cli/src/commands/replay/view.ts +++ b/packages/cli/src/commands/replay/view.ts @@ -100,7 +100,7 @@ export type ReplayArgumentsInput = { readonly replayId: string; readonly target: ParsedOrgProject; /** Server of a pasted Sentry URL, for `applySentryUrlContext` */ - readonly baseUrl?: string; + readonly baseUrl?: string | undefined; /** Warnings to log, such as for reversed arguments */ readonly warnings: readonly string[]; }; @@ -152,8 +152,8 @@ export function replayArguments( type ReplayProjectScope = { org: string; - project?: string; - expectedProjectId?: string; + project?: string | undefined; + expectedProjectId?: string | undefined; replayId: string; replay: ReplayDetails; /** Subcommand named in the error's usage hint. */ diff --git a/packages/cli/src/commands/schema.ts b/packages/cli/src/commands/schema.ts index 8c9c6a5079..75d0645db6 100644 --- a/packages/cli/src/commands/schema.ts +++ b/packages/cli/src/commands/schema.ts @@ -256,7 +256,7 @@ function queryLabel(resource: string, operation?: string): string { function resolvePathQuery( resource: string, operation?: string, -): { method?: string; path: string } | undefined { +): { method?: string | undefined; path: string } | undefined { const raw = operation ? `${resource} ${operation}` : resource; const parsed = parseEndpointQuery(raw); if (parsed.path) { @@ -278,8 +278,8 @@ function lastConcreteSegment(path: string): string | undefined { function pathNotFoundError( label: string, - query: { method?: string; path: string }, -): never { + query: { method?: string | undefined; path: string }, +): ResolutionError { const samePath = findEndpointsByPath(query.path); if (query.method && samePath.length > 0) { const methods = [...new Set(samePath.map((endpoint) => endpoint.method))] @@ -287,7 +287,7 @@ function pathNotFoundError( .join(", "); const example = samePath.find((endpoint) => endpoint.method === "GET") ?? samePath[0]; - throw new ResolutionError( + return new ResolutionError( `Endpoint '${label}'`, "does not exist in the schema", example @@ -312,7 +312,7 @@ function pathNotFoundError( sentry`schema --search ${segment} Search endpoints by keyword`, ); } - throw new ResolutionError( + return new ResolutionError( `Endpoint '${label}'`, "does not exist in the schema", hint, @@ -321,7 +321,7 @@ function pathNotFoundError( } function resolvePathLookup( - query: { method?: string; path: string }, + query: { method?: string | undefined; path: string }, resource: string, operation?: string, ): SchemaResult { diff --git a/packages/cli/src/commands/snapshots/download.ts b/packages/cli/src/commands/snapshots/download.ts index 057857ec92..4f04dedcb1 100644 --- a/packages/cli/src/commands/snapshots/download.ts +++ b/packages/cli/src/commands/snapshots/download.ts @@ -108,7 +108,7 @@ function validateSnapshotFlags(flags: DownloadFlags): void { * configured default project. */ function resolveOptionalProject(env: NodeJS.ProcessEnv): string | undefined { - const raw = env.SENTRY_PROJECT?.trim(); + const raw = env["SENTRY_PROJECT"]?.trim(); if (raw) { const parts = raw.split("/"); return parts.length === 2 ? parts[1] : raw; diff --git a/packages/cli/src/commands/snapshots/upload.ts b/packages/cli/src/commands/snapshots/upload.ts index 8bee46037b..bf3b81eb96 100644 --- a/packages/cli/src/commands/snapshots/upload.ts +++ b/packages/cli/src/commands/snapshots/upload.ts @@ -56,6 +56,7 @@ import { validateImageSizes, } from "../../lib/snapshots/images.js"; import { sentry } from "../../lib/app-identity.js"; +import { omitUndefined } from "../../lib/omit-undefined.js"; const log = logger.withTag("snapshots.upload"); @@ -182,7 +183,7 @@ function collectVcs( async function resolveSelective( flags: UploadFlags, images: CollectedImage[], -): Promise<{ selective: boolean; allImageNames?: string[] }> { +): Promise<{ selective: boolean; allImageNames?: string[] | undefined }> { const allImageNames = await resolveAllImageNames(flags); const selective = Boolean(flags.selective) || allImageNames !== undefined; if (allImageNames) { @@ -236,7 +237,7 @@ async function uploadImages( images: CollectedImage[], ): Promise { const { objectstore } = await fetchSnapshotsUploadOptions(org, project); - const config: ObjectstoreConfig = objectstore; + const config: ObjectstoreConfig = omitUndefined(objectstore); const findScope = (name: string): string | undefined => config.scopes.find(([key]) => key === name)?.[1]; @@ -288,9 +289,9 @@ async function uploadImages( type ManifestOptions = { appId: string; entries: ManifestImages; - diffThreshold?: number; + diffThreshold?: number | undefined; selective: boolean; - allImageNames?: string[]; + allImageNames?: string[] | undefined; vcs: VcsInfo; }; diff --git a/packages/cli/src/commands/sourcemap/resolve.ts b/packages/cli/src/commands/sourcemap/resolve.ts index 22ececb2d0..7de6fd74d7 100644 --- a/packages/cli/src/commands/sourcemap/resolve.ts +++ b/packages/cli/src/commands/sourcemap/resolve.ts @@ -36,15 +36,15 @@ type ResolveFileEntry = { /** JS path relative to the scanned directory. */ path: string; /** Companion sourcemap path relative to the scanned directory, if any. */ - mapPath?: string; + mapPath?: string | undefined; /** Raw `sourceMappingURL` directive value, if any. */ - sourceMappingUrl?: string; + sourceMappingUrl?: string | undefined; /** True when the sourceMappingURL is an inline data: URL. */ inline: boolean; /** True when the sourceMappingURL is a remote http(s) reference. */ remote: boolean; /** The embedded `//# debugId=` value, if any. */ - debugId?: string; + debugId?: string | undefined; }; /** Result type for the resolve command output. */ diff --git a/packages/cli/src/commands/sourcemap/upload.ts b/packages/cli/src/commands/sourcemap/upload.ts index ffac92771e..328acac1e1 100644 --- a/packages/cli/src/commands/sourcemap/upload.ts +++ b/packages/cli/src/commands/sourcemap/upload.ts @@ -49,9 +49,9 @@ type UploadCommandResult = { /** Project slug. Omitted in the same short-circuit case. */ project?: string; /** Release version, if provided. */ - release?: string; + release?: string | undefined; /** Distribution identifier, if provided. */ - dist?: string; + dist?: string | undefined; /** Number of file pairs uploaded. */ filesUploaded: number; }; @@ -491,5 +491,6 @@ export const uploadCommand = buildCommand({ dist: flags.dist, filesUploaded, }); + return; }, }); diff --git a/packages/cli/src/commands/span/list.ts b/packages/cli/src/commands/span/list.ts index e355c3d790..d06fbcdb93 100644 --- a/packages/cli/src/commands/span/list.ts +++ b/packages/cli/src/commands/span/list.ts @@ -212,7 +212,7 @@ type SpanListInput = readonly mode: "project"; readonly target: ParsedOrgProject; /** Server of a pasted Sentry URL, for `applySentryUrlContext` */ - readonly baseUrl?: string; + readonly baseUrl?: string | undefined; } | { readonly mode: "trace"; readonly trace: TraceTargetInput }; @@ -344,7 +344,7 @@ type SpanListData = { /** Whether a previous page exists (for bidirectional hints) */ hasPrev?: boolean; /** Opaque cursor for fetching the next page (null/undefined when no more) */ - nextCursor?: string | null; + nextCursor?: string | null | undefined; /** The trace ID being queried (only in trace mode) */ traceId?: string; /** Org slug for project-mode header */ @@ -352,7 +352,7 @@ type SpanListData = { /** Project slug for project-mode header */ project?: string; /** Extra attribute names from --fields for human table columns */ - extraAttributes?: string[]; + extraAttributes?: string[] | undefined; }; /** @@ -424,7 +424,7 @@ type ModeContext = { /** Parsed time range from the --period flag */ timeRange: TimeRange; /** Extra API field names derived from --fields (undefined when none needed) */ - extraApiFields?: string[]; + extraApiFields?: string[] | undefined; }; /** @@ -436,7 +436,7 @@ type ModeContext = { async function handleTraceMode( { traceId, org, project }: ResolvedTraceOrgProject, ctx: ModeContext, -): Promise<{ output: SpanListData; hint?: string }> { +): Promise<{ output: SpanListData; hint?: string | undefined }> { const { flags, extraApiFields, timeRange } = ctx; const queryParts = [`trace:${traceId}`]; if (flags.query) { @@ -519,7 +519,7 @@ async function handleTraceMode( async function handleProjectMode( { org, project }: { readonly org: string; readonly project: string }, ctx: ModeContext, -): Promise<{ output: SpanListData; hint?: string }> { +): Promise<{ output: SpanListData; hint?: string | undefined }> { const { flags, extraApiFields, timeRange } = ctx; // Resolve slug → numeric ID so the Events query scopes via the `project` // param. `project:` only matches actively-selected projects (#1317). diff --git a/packages/cli/src/commands/span/view.ts b/packages/cli/src/commands/span/view.ts index e47c869794..98950baca5 100644 --- a/packages/cli/src/commands/span/view.ts +++ b/packages/cli/src/commands/span/view.ts @@ -287,7 +287,7 @@ function buildJsonResults( if (detail) { const data = attributesToDict(detail.attributes); if (Object.keys(data).length > 0) { - base.data = data; + base["data"] = data; } } diff --git a/packages/cli/src/commands/status/show.ts b/packages/cli/src/commands/status/show.ts index b0e6acaff6..9fdc08b82b 100644 --- a/packages/cli/src/commands/status/show.ts +++ b/packages/cli/src/commands/status/show.ts @@ -70,5 +70,6 @@ export const showCommand = buildCommand({ hint: `Run \`${sentry`status`}\` again to refresh, or open ${status.url}`, }; } + return; }, }); diff --git a/packages/cli/src/commands/token/delete.ts b/packages/cli/src/commands/token/delete.ts index 005f2996d9..a8792f23fa 100644 --- a/packages/cli/src/commands/token/delete.ts +++ b/packages/cli/src/commands/token/delete.ts @@ -284,5 +284,6 @@ export const deleteCommand = buildDeleteCommand({ throw explainTokenForbidden(error, DELETE_SCOPES, scopeMissing); } yield new CommandOutput({ ...result, deleted: true }); + return; }, }); diff --git a/packages/cli/src/commands/token/list.ts b/packages/cli/src/commands/token/list.ts index 861612393f..73a56d9d54 100644 --- a/packages/cli/src/commands/token/list.ts +++ b/packages/cli/src/commands/token/list.ts @@ -111,5 +111,6 @@ export const listCommand = buildCommand({ hint: `Create one with: ${sentry`token create ${resolved.org}/`}`, }; } + return; }, }); diff --git a/packages/cli/src/commands/trace/list.ts b/packages/cli/src/commands/trace/list.ts index 8e23f62937..1918aead02 100644 --- a/packages/cli/src/commands/trace/list.ts +++ b/packages/cli/src/commands/trace/list.ts @@ -75,7 +75,7 @@ type TraceListResult = { /** Whether a previous page exists (for bidirectional hints) */ hasPrev?: boolean; /** Opaque cursor for fetching the next page (null/undefined when no more) */ - nextCursor?: string | null; + nextCursor?: string | null | undefined; /** Org slug (used by human formatter for display and next-page hint) */ org: string; /** Project slug (used by human formatter for display and next-page hint) */ diff --git a/packages/cli/src/commands/trace/logs.ts b/packages/cli/src/commands/trace/logs.ts index cca0557496..1b19bebb9f 100644 --- a/packages/cli/src/commands/trace/logs.ts +++ b/packages/cli/src/commands/trace/logs.ts @@ -62,8 +62,8 @@ type LogsFlags = { /** Minimal log shape shared with the formatters. */ type LogLike = { timestamp: string; - severity?: string | null; - message?: string | null; + severity?: string | null | undefined; + message?: string | null | undefined; trace?: string | null; }; @@ -108,7 +108,7 @@ function parseLimit(value: string): number { /** `trace logs` arguments, resolved. */ type TraceLogsTarget = ResolvedTraceOrg & { /** Project the user named, to filter the trace's logs by */ - readonly projectFilter?: string; + readonly projectFilter?: string | undefined; }; /** The arguments of `trace logs`. */ diff --git a/packages/cli/src/commands/trace/view.ts b/packages/cli/src/commands/trace/view.ts index acca226a37..dec84e21f4 100644 --- a/packages/cli/src/commands/trace/view.ts +++ b/packages/cli/src/commands/trace/view.ts @@ -169,13 +169,13 @@ export type TraceViewData = { summary: ReturnType; spans: unknown[]; /** Pre-formatted span tree lines for human output (not serialized) */ - spanTreeLines?: string[]; + spanTreeLines?: string[] | undefined; /** Per-span attribute details from trace-items endpoint (when --full or --json) */ - details?: Map; + details?: Map | undefined; /** Shared interpretation used by the request and JSON projection. */ - fieldSelection?: TraceFieldSelection; + fieldSelection?: TraceFieldSelection | undefined; /** Newest stored replay linked to the trace, or null if there's none */ - replayId?: string | null; + replayId?: string | null | undefined; }; /** @@ -388,9 +388,9 @@ function jsonTransformTraceView( type ResolvedTrace = { traceId: string; org: string; - project?: string; + project?: string | undefined; /** Project slug when user explicitly provided org/project/trace-id */ - projectFilter?: string; + projectFilter?: string | undefined; }; /** diff --git a/packages/cli/src/context.ts b/packages/cli/src/context.ts index fe0e4f85cd..5e6ffe3cac 100644 --- a/packages/cli/src/context.ts +++ b/packages/cli/src/context.ts @@ -53,7 +53,7 @@ function resolveCwd(process: NodeJS.Process): string { try { return process.cwd(); } catch (error) { - const pwd = process.env.PWD; + const pwd = process.env["PWD"]; if (!(pwd && isAbsolute(pwd))) { throw error; } diff --git a/packages/cli/src/global.d.ts b/packages/cli/src/global.d.ts index 1433484f6e..76f1ae59e3 100644 --- a/packages/cli/src/global.d.ts +++ b/packages/cli/src/global.d.ts @@ -8,18 +8,25 @@ // Web Worker API — used by src/lib/scan/worker-pool.ts // Node 22+ supports the standard Web Worker API for Blob-URL workers. +// Neither lib ESNext nor @types/node declares a global `ErrorEvent`. These are +// the fields of the DOM type that the pool reads; runtimes may omit them. +interface WorkerErrorEvent extends Event { + readonly message?: string; + readonly error?: unknown; +} + type WorkerEventMap = { message: MessageEvent; messageerror: MessageEvent; - error: ErrorEvent; + error: WorkerErrorEvent; }; declare class Worker { constructor(url: string | URL, options?: { type?: string }); - postMessage(message: unknown, transfer?: Transferable[]): void; + postMessage(message: unknown): void; terminate(): void; onmessage: ((event: MessageEvent) => void) | null; - onerror: ((event: ErrorEvent) => void) | null; + onerror: ((event: WorkerErrorEvent) => void) | null; addEventListener( type: K, listener: (event: WorkerEventMap[K]) => void, @@ -34,13 +41,6 @@ declare class Worker { unref(): void; } -// RegExp.escape — ES2025 proposal, available in Node 23.6+ -// Used by src/lib/api/projects.ts with a runtime feature-detection guard. -// interface augmentation requires `interface`, not `type` -interface RegExpConstructor { - escape?(s: string): string; -} - // Typechecking does not need the generated OpenAPI data; builds generate it. // This declaration also supports a fresh checkout without src/generated/. declare module "*/generated/api-schema.json" { diff --git a/packages/cli/src/lib/account-selection.ts b/packages/cli/src/lib/account-selection.ts index 1dba4c8071..b8652644e0 100644 --- a/packages/cli/src/lib/account-selection.ts +++ b/packages/cli/src/lib/account-selection.ts @@ -27,7 +27,7 @@ export type AccountSelectorOptions = { * Only consider accounts on this server (`--url`). Disambiguates the same * email or username stored for several servers. */ - url?: string; + url?: string | undefined; /** * Use a sole fuzzy match (with a warning) when nothing matches exactly. * Off by default; destructive commands like `logout` only suggest. diff --git a/packages/cli/src/lib/api-schema.ts b/packages/cli/src/lib/api-schema.ts index e96517f05e..0fba0758a4 100644 --- a/packages/cli/src/lib/api-schema.ts +++ b/packages/cli/src/lib/api-schema.ts @@ -22,7 +22,7 @@ export type ApiQueryParameter = { /** Whether the request must include this parameter. */ required: boolean; /** Allowed scalar values, or item values for an array parameter. */ - enum?: (string | number | boolean | null)[]; + enum?: (string | number | boolean | null)[] | undefined; }; /** An API used by a command, with context rather than a claim of equivalence. */ @@ -61,9 +61,9 @@ export type ApiEndpoint = { /** Human-readable description of the endpoint */ description: string; /** Short endpoint description from OpenAPI. */ - summary?: string; + summary?: string | undefined; /** OpenAPI categories available for discovery. */ - tags?: string[]; + tags?: string[] | undefined; /** Path parameter names extracted from the URL template */ pathParams: string[]; /** Query parameter names from the OpenAPI spec */ @@ -98,7 +98,7 @@ const WHITESPACE = /\s/; /** Parsed `METHOD /path` or `/api/...` query used by `sentry schema`. */ export type ParsedEndpointQuery = { /** Uppercase HTTP method when the query starts with one */ - method?: string; + method?: string | undefined; /** Normalized API path when the query looks like one */ path?: string; /** Remainder after stripping a leading HTTP method */ diff --git a/packages/cli/src/lib/api/alerts.ts b/packages/cli/src/lib/api/alerts.ts index 1317037be5..37c945a124 100644 --- a/packages/cli/src/lib/api/alerts.ts +++ b/packages/cli/src/lib/api/alerts.ts @@ -37,9 +37,11 @@ import { ApiError, ValidationError } from "../errors.js"; import { getOrgSdkConfig, type PaginatedResponse, + paginatedResponse, unwrapPaginatedResult, unwrapResult, } from "./infrastructure.js"; +import { omitUndefined } from "../omit-undefined.js"; // Types @@ -191,10 +193,10 @@ function resolveThresholdSource( ? (value as Record) : undefined; - const queryObj = asRecord(source.queryObj); - const snubaQuery = asRecord(source.snubaQuery); + const queryObj = asRecord(source["queryObj"]); + const snubaQuery = asRecord(source["snubaQuery"]); const candidates = [ - queryObj && asRecord(queryObj.snubaQuery), + queryObj && asRecord(queryObj["snubaQuery"]), queryObj, snubaQuery, source, @@ -215,21 +217,21 @@ function mapDetectorToMetricAlertRule( const nested = resolveThresholdSource(source); const environment = - pickDetectorString(nested.environment) || detector.environment || null; + pickDetectorString(nested["environment"]) || detector.environment || null; // The detector payload exposes timeWindow in seconds, but MetricAlertRule // (and every CLI formatter, which appends "m") treats it as whole minutes. - const timeWindowSeconds = pickDetectorNumber(nested.timeWindow); + const timeWindowSeconds = pickDetectorNumber(nested["timeWindow"]); return { id: String(detector.id), name: detector.name, status: detector.enabled === false ? 1 : 0, - query: pickDetectorString(nested.query), - aggregate: pickDetectorString(nested.aggregate), + query: pickDetectorString(nested["query"]), + aggregate: pickDetectorString(nested["aggregate"]), dataset: metricAlertDatasetName( - pickDetectorString(nested.dataset), - Array.isArray(nested.eventTypes) ? nested.eventTypes : [], + pickDetectorString(nested["dataset"]), + Array.isArray(nested["eventTypes"]) ? nested["eventTypes"] : [], ), timeWindow: timeWindowSeconds > 0 ? Math.round(timeWindowSeconds / 60) : 0, environment, @@ -273,24 +275,24 @@ function filterAttachedIssueAlertRules( export async function listIssueAlertsPaginated( orgSlug: string, projectSlug: string, - options: { perPage?: number; cursor?: string } = {}, + options: { perPage?: number | undefined; cursor?: string | undefined } = {}, ): Promise> { const config = getOrgSdkConfig(); const result = await listOrganizationWorkflows({ ...config, path: { organization_id_or_slug: orgSlug }, - query: { + query: omitUndefined({ project: [projectSlug], sortBy: "-id", per_page: options.perPage, cursor: options.cursor, - }, + }), }); const { data, nextCursor } = unwrapPaginatedResult( result, "Failed to list issue alert rules", ); - return { data: filterAttachedIssueAlertRules(data), nextCursor }; + return paginatedResponse(filterAttachedIssueAlertRules(data), nextCursor); } /** @@ -414,24 +416,23 @@ const METRIC_DETECTOR_QUERY = "type:metric_issue"; */ export async function listMetricAlertsPaginated( orgSlug: string, - options: { perPage?: number; cursor?: string } = {}, + options: { perPage?: number | undefined; cursor?: string | undefined } = {}, ): Promise> { const config = getOrgSdkConfig(); const result = await listOrganizationDetectors({ ...config, path: { organization_id_or_slug: orgSlug }, query: { + ...omitUndefined({ cursor: options.cursor, per_page: options.perPage }), query: METRIC_DETECTOR_QUERY, sortBy: "-id", - cursor: options.cursor, - per_page: options.perPage, }, }); const { data, nextCursor } = unwrapPaginatedResult( result, "Failed to list metric alert rules", ); - return { data: data.map(mapDetectorToMetricAlertRule), nextCursor }; + return paginatedResponse(data.map(mapDetectorToMetricAlertRule), nextCursor); } /** @@ -457,9 +458,13 @@ export async function getMetricAlertRule( const detector = await getMetricDetector(orgSlug, ruleId); return { ...mapDetectorToMetricAlertRule(detector), - config: detector.config ?? undefined, - conditionGroup: detector.conditionGroup, - workflowIds: detector.workflowIds, + ...(detector.config && { config: detector.config }), + ...(detector.conditionGroup !== undefined && { + conditionGroup: detector.conditionGroup, + }), + ...(detector.workflowIds !== undefined && { + workflowIds: detector.workflowIds, + }), }; } @@ -606,7 +611,7 @@ type DetectorSourceFields = Omit & { function detectorSourceFields( body: Record, ): DetectorSourceFields { - const dataset = pickDetectorString(body.dataset); + const dataset = pickDetectorString(body["dataset"]); const named = metricAlertSource(dataset); if (named) { return named; @@ -667,17 +672,17 @@ function buildDetectorDataSource( ): Record { const native = detectorSourceFields(body); const timeWindowMinutes = - typeof body.timeWindow === "number" ? body.timeWindow : 0; + typeof body["timeWindow"] === "number" ? body["timeWindow"] : 0; const source: Record = { - aggregate: typeof body.aggregate === "string" ? body.aggregate : "", + aggregate: typeof body["aggregate"] === "string" ? body["aggregate"] : "", dataset: native.dataset, - query: typeof body.query === "string" ? body.query : "", + query: typeof body["query"] === "string" ? body["query"] : "", queryType: native.queryType, eventTypes: [...native.eventTypes], timeWindow: timeWindowMinutes * 60, }; - if (typeof body.environment === "string" && body.environment !== "") { - source.environment = body.environment; + if (typeof body["environment"] === "string" && body["environment"] !== "") { + source["environment"] = body["environment"]; } return source; } @@ -699,37 +704,37 @@ function buildDetectorBody( body: Record, ): Record { // create/edit store triggers already parsed by parseMetricTriggers. - const triggers = body.triggers as MetricTriggers | undefined; + const triggers = body["triggers"] as MetricTriggers | undefined; // Threshold triggers are static thresholds. Otherwise edits carry the stored // config so percent and dynamic detectors keep their detection mode, and // creates default to static. const keepStoredConfig = - isDetectorConfig(body.detectorConfig) && + isDetectorConfig(body["detectorConfig"]) && !(triggers && !isDetectorConditionList(triggers)); const detectorBody: Record = { - name: typeof body.name === "string" ? body.name : "", + name: typeof body["name"] === "string" ? body["name"] : "", type: "metric_issue", dataSources: [buildDetectorDataSource(body)], config: keepStoredConfig - ? body.detectorConfig + ? body["detectorConfig"] : { detectionType: "static" }, }; if (triggers) { - detectorBody.conditionGroup = { + detectorBody["conditionGroup"] = { logicType: "any", conditions: buildDetectorConditions(triggers), }; } - if (Array.isArray(body.workflowIds)) { - detectorBody.workflowIds = body.workflowIds; + if (Array.isArray(body["workflowIds"])) { + detectorBody["workflowIds"] = body["workflowIds"]; } - if (body.status !== undefined) { - detectorBody.enabled = Number(body.status) !== 1; + if (body["status"] !== undefined) { + detectorBody["enabled"] = Number(body["status"]) !== 1; } - if (body.owner !== undefined) { - detectorBody.owner = body.owner; + if (body["owner"] !== undefined) { + detectorBody["owner"] = body["owner"]; } return detectorBody; } @@ -745,7 +750,7 @@ function buildDetectorBody( * @throws {ValidationError} when no project slug is present */ function resolveDetectorProject(body: Record): string { - const projects = Array.isArray(body.projects) ? body.projects : []; + const projects = Array.isArray(body["projects"]) ? body["projects"] : []; const project = projects.find( (value): value is string => typeof value === "string" && value.trim() !== "", @@ -806,14 +811,14 @@ export async function getMetricAlertRuleDocument( const document: Record = { ...mapDetectorToMetricAlertRule(detector), }; - if (Array.isArray(source.eventTypes)) { - document.eventTypes = source.eventTypes; + if (Array.isArray(source["eventTypes"])) { + document["eventTypes"] = source["eventTypes"]; } - if (typeof source.queryType === "number") { - document.queryType = source.queryType; + if (typeof source["queryType"] === "number") { + document["queryType"] = source["queryType"]; } if (isDetectorConfig(detector.config)) { - document.detectorConfig = detector.config; + document["detectorConfig"] = detector.config; } return document; } diff --git a/packages/cli/src/lib/api/attribute-pagination.ts b/packages/cli/src/lib/api/attribute-pagination.ts index dacd47d73e..4f70eb8e9c 100644 --- a/packages/cli/src/lib/api/attribute-pagination.ts +++ b/packages/cli/src/lib/api/attribute-pagination.ts @@ -25,7 +25,7 @@ export type AttributeTypePage = { positions: (string | undefined)[]; /** Keys on each raw page fetched, by that page's cursor ("" for the first). */ pageKeys: Map>; - nextCursor?: string; + nextCursor?: string | undefined; }; /** Map key for a raw page's cursor (the first page has none). */ diff --git a/packages/cli/src/lib/api/chunk-upload.ts b/packages/cli/src/lib/api/chunk-upload.ts index 99629b5ca8..25f7cac089 100644 --- a/packages/cli/src/lib/api/chunk-upload.ts +++ b/packages/cli/src/lib/api/chunk-upload.ts @@ -238,9 +238,9 @@ export function pickUploadEncoding( * with `concurrency=8`, eight uploads truly compress in parallel. */ export async function encodeChunk( - buf: Buffer, + buf: Buffer, encoding: UploadEncoding | undefined, -): Promise { +): Promise> { if (encoding === "zstd") { // pickUploadEncoding never selects zstd when the runtime lacks it, so this // should be unreachable. Fail loudly rather than return raw bytes that the @@ -295,7 +295,7 @@ export async function uploadChunk(params: { const { chunk, tmpZipPath, encoding, fetch: authFetch, url } = params; const chunkFh = await open(tmpZipPath, "r"); - let buf: Buffer; + let buf: Buffer; try { buf = Buffer.alloc(chunk.size); await chunkFh.read(buf, 0, chunk.size, chunk.offset); @@ -369,7 +369,7 @@ export async function hashChunks( * @returns Per-chunk metadata and an overall SHA-1 checksum of the entire buffer */ export function hashBuffer( - content: Buffer, + content: Buffer, chunkSize: number, ): { chunks: ChunkInfo[]; overallChecksum: string } { const chunks: ChunkInfo[] = []; @@ -503,7 +503,7 @@ export async function uploadMissingChunks(params: { /** One chunk's bytes, keyed by its checksum, ready to upload. */ export type ChunkPayload = { sha1: string; - data: Buffer; + data: Buffer; }; /** @@ -613,7 +613,7 @@ export async function uploadChunkPayloads(params: { export async function uploadMissingBufferChunks(params: { chunks: ChunkInfo[]; missingChecksums: Set; - content: Buffer; + content: Buffer; serverOptions: ChunkServerOptions; encoding: UploadEncoding | undefined; regionUrl: string; diff --git a/packages/cli/src/lib/api/completion-seed.ts b/packages/cli/src/lib/api/completion-seed.ts index f6caea9727..5232e6881c 100644 --- a/packages/cli/src/lib/api/completion-seed.ts +++ b/packages/cli/src/lib/api/completion-seed.ts @@ -454,7 +454,7 @@ const SOURCE_PATTERNS = COMPLETION_SOURCES.map((source) => ({ })); /** A source matching a request URL, with the organization its path names. */ -type SourceMatch = { source: CompletionSource; orgSlug?: string }; +type SourceMatch = { source: CompletionSource; orgSlug?: string | undefined }; /** * The sources for a URL and the organization each names, if any. One diff --git a/packages/cli/src/lib/api/conversations.ts b/packages/cli/src/lib/api/conversations.ts index 7b1a1426e8..c785747fc4 100644 --- a/packages/cli/src/lib/api/conversations.ts +++ b/packages/cli/src/lib/api/conversations.ts @@ -33,22 +33,24 @@ import { getSdkClientConfig } from "../sentry-sdk-client.js"; import { getOrgSdkConfig, MAX_PAGINATION_PAGES, - type PaginatedResponse, paginate, + type PaginatedResponse, + paginatedResponse, unwrapPaginatedResult, validateResponse, } from "./infrastructure.js"; +import { omitUndefined } from "../omit-undefined.js"; const log = logger.withTag("api.conversations"); type ConversationListOptions = { - query?: string; + query?: string | undefined; sort?: NonNullable["sort"]; - cursor?: string; + cursor?: string | undefined; statsPeriod?: string; start?: string; end?: string; - project?: string; + project?: string | undefined; }; /** @@ -66,7 +68,7 @@ async function fetchConversationsPage( const result = await listOrganizationAiConversations({ ...getSdkClientConfig(regionUrl), path: { organization_id_or_slug: orgSlug }, - query: { + query: omitUndefined({ per_page: perPage, statsPeriod: options.statsPeriod || undefined, start: options.start || undefined, @@ -75,7 +77,7 @@ async function fetchConversationsPage( query: options.query || undefined, sort: options.sort, project: options.project ? [options.project] : undefined, - }, + }), }); const page = unwrapPaginatedResult( result, @@ -87,7 +89,7 @@ async function fetchConversationsPage( `/organizations/${orgSlug}/agents/conversations/`, page.response?.status ?? 0, ); - return { data, nextCursor: page.nextCursor }; + return paginatedResponse(data, page.nextCursor); } /** @@ -120,7 +122,7 @@ export async function getConversationSpans( } = {}, ): Promise<{ spans: AgentConversationSpan[]; - stats?: ConversationStats; + stats?: ConversationStats | undefined; truncated: boolean; title: string | null; }> { @@ -139,12 +141,12 @@ export async function getConversationSpans( organization_id_or_slug: orgSlug, conversation_id: conversationId, }, - query: { + query: omitUndefined({ per_page: options.perPage ?? 1000, statsPeriod: options.statsPeriod ?? "30d", project: options.project ? [options.project] : undefined, cursor, - }, + }), }); const pageResult = unwrapPaginatedResult( result, diff --git a/packages/cli/src/lib/api/dart-symbols.ts b/packages/cli/src/lib/api/dart-symbols.ts index 52da154b85..a982b81bee 100644 --- a/packages/cli/src/lib/api/dart-symbols.ts +++ b/packages/cli/src/lib/api/dart-symbols.ts @@ -38,7 +38,7 @@ export type DartSymbolMap = { /** The debug ID to associate with this map. */ debugId: string; /** Pre-read content buffer. */ - content: Buffer; + content: Buffer; }; /** Options for {@link uploadDartSymbolMap}. */ diff --git a/packages/cli/src/lib/api/dashboards.ts b/packages/cli/src/lib/api/dashboards.ts index 546021974a..180a681aab 100644 --- a/packages/cli/src/lib/api/dashboards.ts +++ b/packages/cli/src/lib/api/dashboards.ts @@ -57,6 +57,7 @@ import { unwrapValidatedResult, validateResponse, } from "./infrastructure.js"; +import { omitUndefined } from "../omit-undefined.js"; /** * List dashboards in an organization with cursor-based pagination. @@ -70,14 +71,14 @@ import { */ export async function listDashboardsPaginated( orgSlug: string, - options: { perPage?: number; cursor?: string } = {}, + options: { perPage?: number | undefined; cursor?: string | undefined } = {}, ): Promise> { const config = getOrgSdkConfig(); const result = await listOrganizationDashboards({ ...config, path: { organization_id_or_slug: orgSlug }, - query: { per_page: options.perPage, cursor: options.cursor }, + query: omitUndefined({ per_page: options.perPage, cursor: options.cursor }), }); return unwrapPaginatedResult( @@ -122,7 +123,11 @@ export async function getDashboard( */ export async function createDashboard( orgSlug: string, - body: { title: string; widgets?: DashboardWidget[]; projects?: number[] }, + body: { + title: string; + widgets?: DashboardWidget[]; + projects?: number[] | undefined; + }, ): Promise { const config = getOrgSdkConfig(); @@ -152,9 +157,9 @@ export async function updateDashboard( body: { title: string; widgets: DashboardWidget[]; - projects?: number[]; - environment?: string[]; - period?: string | null; + projects?: number[] | undefined; + environment?: string[] | undefined; + period?: string | null | undefined; }, ): Promise { const config = getOrgSdkConfig(); @@ -165,9 +170,9 @@ export async function updateDashboard( organization_id_or_slug: orgSlug, dashboard_id: dashboardId as unknown as number, }, - body: body as unknown as Parameters< - typeof updateOrganizationDashboard - >[0]["body"], + body: body as unknown as NonNullable< + Parameters[0]["body"] + >, }); return unwrapResult( @@ -191,7 +196,7 @@ export async function updateDashboard( export async function listDashboardRevisionsPaginated( orgSlug: string, dashboardId: string, - options: { perPage?: number; cursor?: string } = {}, + options: { perPage?: number | undefined; cursor?: string | undefined } = {}, ): Promise> { const config = getOrgSdkConfig(); const result = await listOrganizationDashboardRevisions({ @@ -200,7 +205,7 @@ export async function listDashboardRevisionsPaginated( organization_id_or_slug: orgSlug, dashboard_id: dashboardId as unknown as number, }, - query: { per_page: options.perPage, cursor: options.cursor }, + query: omitUndefined({ per_page: options.perPage, cursor: options.cursor }), }); const { response, ...page } = unwrapPaginatedResult( result, @@ -254,15 +259,15 @@ type WidgetQueryOptions = { /** Override the dashboard's time period (e.g., "24h", "7d") */ period?: string; /** Absolute start datetime (ISO-8601). Mutually exclusive with period. */ - start?: string; + start?: string | undefined; /** Absolute end datetime (ISO-8601). Mutually exclusive with period. */ - end?: string; + end?: string | undefined; /** Pre-computed total seconds for interval computation (for absolute ranges). */ - periodSeconds?: number; + periodSeconds?: number | undefined; /** Filter by environment(s) — from dashboard.environment */ - environment?: string[]; + environment?: string[] | undefined; /** Filter by project ID(s) — from dashboard.projects */ - project?: number[]; + project?: number[] | undefined; }; // --------------------------------------------------------------------------- @@ -521,11 +526,11 @@ function buildTopEventsParams( > { const { fields, sort } = resolveEventsSort({ fields: [...columns, ...aggregates], - sort: orderby, + sort: orderby ?? null, }); const params: ReturnType = { groupBy: fields, - sort, + ...(sort !== undefined && { sort }), topEvents: widget.limit ?? 5, }; if (aggregates.length !== 1 || (widget.queries?.length ?? 1) !== 1) { @@ -552,13 +557,13 @@ type WidgetQueryParams = { orgSlug: string; widget: DashboardWidget; /** Relative period (e.g., "24h"). Omit when using absolute start/end. */ - statsPeriod?: string; + statsPeriod?: string | undefined; /** Absolute start datetime (ISO-8601). Mutually exclusive with statsPeriod. */ - start?: string; + start?: string | undefined; /** Absolute end datetime (ISO-8601). Mutually exclusive with statsPeriod. */ - end?: string; + end?: string | undefined; /** Pre-computed total seconds for interval computation (for absolute ranges). */ - periodSeconds?: number; + periodSeconds?: number | undefined; options?: WidgetQueryOptions; }; @@ -591,7 +596,7 @@ async function queryWidgetTimeseries( const result = await listOrganizationEventsTimeseries({ ...getSdkClientConfig(regionUrl), path: { organization_id_or_slug: orgSlug }, - query: { + query: omitUndefined({ yAxis: aggregates, query: query.conditions || undefined, dataset, @@ -604,7 +609,7 @@ async function queryWidgetTimeseries( // Group-by columns enable topEvents mode ...(columns.length > 0 && buildTopEventsParams(widget, columns, aggregates, query.orderby)), - }, + }), }); const data = unwrapValidatedResult( result, @@ -655,12 +660,15 @@ async function queryWidgetTable( ...(query?.columns ?? []), ...(query?.aggregates ?? []), ]; - const request = resolveEventsSort({ fields, sort: query?.orderby }); + const request = resolveEventsSort({ + fields, + sort: query?.orderby ?? null, + }); const result = await listOrganizationEvents({ ...getSdkClientConfig(regionUrl), path: { organization_id_or_slug: orgSlug }, - query: { + query: omitUndefined({ field: request.fields, query: query?.conditions || undefined, dataset, @@ -671,7 +679,7 @@ async function queryWidgetTable( per_page: widget.limit ?? 10, environment: options.environment, project: options.project, - }, + }), }); const data = unwrapValidatedResult( result, @@ -709,7 +717,7 @@ async function queryWidgetData( // Text widgets carry markdown in `description`, no API query needed if (widget.displayType === "text") { - const description = (widget as Record).description; + const description = (widget as Record)["description"]; return { type: "text", content: typeof description === "string" ? description : "", diff --git a/packages/cli/src/lib/api/debug-files.ts b/packages/cli/src/lib/api/debug-files.ts index 02d212bb1e..d8b7ebe400 100644 --- a/packages/cli/src/lib/api/debug-files.ts +++ b/packages/cli/src/lib/api/debug-files.ts @@ -51,7 +51,7 @@ export type DebugFileUpload = { * uploaded bytes and indexes every contained slice itself, so this is * `skip_serializing_if none` in the wire format — omitted when absent. */ - debugId?: string; + debugId?: string | undefined; /** * Code id for file types the server cannot read it from (a DXIL shader's * Aftermath hash). Omitted from the wire format when absent. @@ -60,7 +60,7 @@ export type DebugFileUpload = { /** Shader group of a DXIL shader, stored with the file. Omitted when absent. */ shaderGroup?: string; /** Pre-read raw file content (chunked as-is). */ - content: Buffer; + content: Buffer; }; /** Options for {@link uploadDebugFiles}. */ @@ -84,7 +84,7 @@ export type DebugFilesUploadOptions = { * `getChunkUploadOptions` call is skipped (the caller already fetched them, * e.g. to size-gate the scan against the server's `maxFileSize`). */ - serverOptions?: ChunkServerOptions; + serverOptions?: ChunkServerOptions | undefined; }; /** Per-file result of a debug information file upload. */ @@ -92,7 +92,7 @@ export type DebugFileUploadResult = { /** Name stamped on the assembled DIF. */ name: string; /** Advisory debug id, if one was provided. */ - debugId?: string; + debugId?: string | undefined; /** Overall SHA-1 checksum of the uploaded file. */ checksum: string; /** diff --git a/packages/cli/src/lib/api/dropped-events.ts b/packages/cli/src/lib/api/dropped-events.ts index c8c11c9e3f..cc8c1ea988 100644 --- a/packages/cli/src/lib/api/dropped-events.ts +++ b/packages/cli/src/lib/api/dropped-events.ts @@ -11,13 +11,14 @@ import { listOrganizationEventsDropped, } from "@sentry/api"; import { getOrgSdkConfig, unwrapResult } from "./infrastructure.js"; +import { omitUndefined } from "../omit-undefined.js"; /** Options for {@link getDroppedEvents}. */ export type DroppedEventsOptions = { /** API-level dataset name. Callers resolve user-facing aliases first. */ dataset?: ListOrganizationEventsDroppedData["query"]["dataset"]; /** Numeric project ID. Omit to span every project the token can read. */ - projectId?: string; + projectId?: string | undefined; /** Relative time period (e.g. "24h", "7d"). Mutually exclusive with start/end. */ statsPeriod?: string; /** Absolute start datetime (ISO-8601). Mutually exclusive with statsPeriod. */ @@ -40,7 +41,7 @@ export async function getDroppedEvents( const result = await listOrganizationEventsDropped({ ...config, path: { organization_id_or_slug: orgSlug }, - query: { + query: omitUndefined({ dataset: options.dataset ?? "errors", project: options.projectId === undefined ? undefined : [options.projectId], @@ -48,7 +49,7 @@ export async function getDroppedEvents( options.start || options.end ? undefined : options.statsPeriod, start: options.start, end: options.end, - }, + }), }); return unwrapResult( result, diff --git a/packages/cli/src/lib/api/events.ts b/packages/cli/src/lib/api/events.ts index 3e232cc946..29af5164c9 100644 --- a/packages/cli/src/lib/api/events.ts +++ b/packages/cli/src/lib/api/events.ts @@ -30,6 +30,7 @@ import { unwrapResult, } from "./infrastructure.js"; import { listOrganizations } from "./organizations.js"; +import { omitUndefined } from "../omit-undefined.js"; /** * Get the latest event for an issue. @@ -170,7 +171,7 @@ export async function resolveEventInOrg( /** Options for {@link findEventAcrossOrgs}. */ export type FindEventAcrossOrgsOptions = { /** Org slugs to skip (already searched by the caller). */ - excludeOrgs?: string[]; + excludeOrgs?: string[] | undefined; }; /** @@ -227,11 +228,11 @@ export type ListIssueEventsOptions = { /** Max items to return (total across all auto-paginated pages). @default 25 */ limit?: number; /** Search query (Sentry search syntax). */ - query?: string; + query?: string | undefined; /** Include full event body (stacktraces, breadcrumbs). */ full?: boolean; /** Pagination cursor from a previous response. */ - cursor?: string; + cursor?: string | undefined; /** Relative time period (e.g., "7d", "24h"). Overrides start/end on the API. */ statsPeriod?: string; /** Absolute start datetime (ISO-8601). Mutually exclusive with statsPeriod. */ @@ -268,7 +269,7 @@ export async function listIssueEvents( organization_id_or_slug: orgSlug, issue_id: issueId, }, - query: { + query: omitUndefined({ query: query || undefined, full, cursor: pageCursor, @@ -278,7 +279,7 @@ export async function listIssueEvents( // `per_page` is accepted at runtime but absent from the generated query // type, so widen via cast. per_page: perPage, - }, + }), }); return unwrapPaginatedResult( result, diff --git a/packages/cli/src/lib/api/explore.ts b/packages/cli/src/lib/api/explore.ts index 00759f4eae..b72a38dce1 100644 --- a/packages/cli/src/lib/api/explore.ts +++ b/packages/cli/src/lib/api/explore.ts @@ -21,12 +21,14 @@ import { API_MAX_PER_PAGE, getOrgSdkConfig, MAX_PAGINATION_PAGES, - type PaginatedResponse, paginate, + type PaginatedResponse, + paginatedResponse, unwrapPaginatedResult, unwrapResult, validateResponse, } from "./infrastructure.js"; +import { omitUndefined } from "../omit-undefined.js"; /** Options for querying the Explore/Events endpoint. */ export type ExploreQueryOptions = { @@ -35,13 +37,13 @@ export type ExploreQueryOptions = { /** Dataset to query. Defaults to `errors`. */ dataset?: EventsDataset; /** Sentry search query filter */ - query?: string; + query?: string | undefined; /** * Numeric project ID, sent as the `project` param. `project:` in * `query` only matches projects the requester is a member of, so a valid * slug can 400 with "not actively selected" (#1317). */ - projectId?: number; + projectId?: number | undefined; /** * Sort field. Prefix with `-` for descending. * Every Events dataset accepts it as long as the sort column is in @@ -49,17 +51,17 @@ export type ExploreQueryOptions = { * `@sentry/toolkit-core/events-sort`. A stable sort is required for correct * offset-based cursor pagination on grouped aggregate queries (#1519). */ - sort?: string; + sort?: string | undefined; /** Maximum number of rows to return */ limit?: number; /** Pagination cursor */ - cursor?: string; + cursor?: string | undefined; /** Relative time period (e.g., "24h", "7d"). Mutually exclusive with start/end. */ - statsPeriod?: string; + statsPeriod?: string | undefined; /** Absolute start datetime (ISO-8601). Mutually exclusive with statsPeriod. */ - start?: string; + start?: string | undefined; /** Absolute end datetime (ISO-8601). Mutually exclusive with statsPeriod. */ - end?: string; + end?: string | undefined; }; /** Options for an ungrouped time series, with environment filters in `query`. */ @@ -104,7 +106,7 @@ export async function queryEventsTimeSeries( const result = await listOrganizationEventsTimeseries({ ...getOrgSdkConfig(), path: { organization_id_or_slug: orgSlug }, - query: { + query: omitUndefined({ dataset: options.dataset ?? "errors", yAxis: options.fields, query: options.query || undefined, @@ -117,7 +119,7 @@ export async function queryEventsTimeSeries( : (options.statsPeriod ?? "24h"), start: options.start, end: options.end, - }, + }), }); return unwrapResult( result, @@ -146,7 +148,7 @@ async function fetchEventsPage( const result = await listOrganizationEvents({ ...getSdkClientConfig(regionUrl), path: { organization_id_or_slug: orgSlug }, - query: { + query: omitUndefined({ dataset: options.dataset ?? "errors", field: options.fields, query: options.query || undefined, @@ -161,7 +163,7 @@ async function fetchEventsPage( start: options.start, end: options.end, cursor: options.cursor, - }, + }), }); const page = unwrapPaginatedResult(result, "Failed to query events"); const data: EventsTableResponse = validateResponse( @@ -170,7 +172,7 @@ async function fetchEventsPage( `/organizations/${orgSlug}/events/`, page.response?.status ?? 0, ); - return { data, nextCursor: page.nextCursor }; + return paginatedResponse(data, page.nextCursor); } /** Metric metadata returned by {@link queryMetricsMeta}. */ @@ -195,9 +197,9 @@ export async function queryMetricsMeta( statsPeriod?: string; start?: string; end?: string; - project?: string; + project?: string | undefined; /** Numeric ID for `project`; when set, replaces the `project:` filter. */ - projectId?: number; + projectId?: number | undefined; }, ): Promise { const regionUrl = await resolveOrgRegion(orgSlug); @@ -276,9 +278,12 @@ export async function queryEvents( ); // Meta is identical across pages; keep the first page's. meta ??= page.data.meta; - return { data: page.data.data, nextCursor: page.nextCursor }; + return paginatedResponse(page.data.data, page.nextCursor); }, 25, ); - return { data: { data, meta }, nextCursor }; + return paginatedResponse( + { data, ...(meta !== undefined && { meta }) }, + nextCursor, + ); } diff --git a/packages/cli/src/lib/api/feedback.ts b/packages/cli/src/lib/api/feedback.ts index 5e1eeebcbb..55a613f955 100644 --- a/packages/cli/src/lib/api/feedback.ts +++ b/packages/cli/src/lib/api/feedback.ts @@ -27,9 +27,9 @@ export type ListFeedbackOptions = { /** Feedback mailbox to query. */ status: FeedbackStatus; /** Optional user-provided Sentry issue-search expression. */ - query?: string; + query?: string | undefined; /** Cursor from a previous page. */ - cursor?: string; + cursor?: string | undefined; /** Relative time period such as `14d`. */ statsPeriod?: string; /** Inclusive absolute start time. */ @@ -37,7 +37,7 @@ export type ListFeedbackOptions = { /** Inclusive absolute end time. */ end?: string; /** Numeric project ID used for direct project selection. */ - projectId?: number; + projectId?: number | undefined; }; /** A page of feedback items plus the server cursor for the following page. */ @@ -45,7 +45,7 @@ export type FeedbackPage = { /** Feedback items returned by the issue index. */ feedback: SentryFeedback[]; /** Cursor for the next page, when more results are available. */ - nextCursor?: string; + nextCursor?: string | undefined; }; /** diff --git a/packages/cli/src/lib/api/infrastructure.ts b/packages/cli/src/lib/api/infrastructure.ts index fda180de08..5ad1f140da 100644 --- a/packages/cli/src/lib/api/infrastructure.ts +++ b/packages/cli/src/lib/api/infrastructure.ts @@ -61,6 +61,7 @@ import { isSentrySaasUrl } from "../sentry-urls.js"; import { OAUTH_SCOPES } from "../oauth.js"; import { parseSntrysClaim } from "../token-claims.js"; import { classifySentryToken } from "../token-type.js"; +import { omitUndefined } from "../omit-undefined.js"; /** User-facing detail for a 401/403, and the reason to record for it. */ type EnrichedDetail = { @@ -435,7 +436,7 @@ const SEER_DENIAL_REASONS: Record< * `invalid_function_argument`). */ function readErrorFields(body: unknown): { - code?: string; + code?: string | undefined; denialReason?: ApiDenialReason; functionArgument?: FunctionArgument; } { @@ -443,27 +444,28 @@ function readErrorFields(body: unknown): { return {}; } const fields = body as Record; - const code = typeof fields.code === "string" ? fields.code : undefined; + const code = + typeof fields["code"] === "string" ? fields["code"] : undefined; // Leave the key out otherwise, so it can't clear the 401/403 denial reason. const seerDenialReason = lookupKnownKey( SEER_DENIAL_REASONS, - fields.denialReason, + fields["denialReason"], ); const denialReason: { denialReason?: ApiDenialReason } = seerDenialReason ? { denialReason: seerDenialReason } : {}; if ( - typeof fields.function !== "string" || - typeof fields.argument !== "string" + typeof fields["function"] !== "string" || + typeof fields["argument"] !== "string" ) { return { code, ...denialReason }; } const functionArgument: FunctionArgument = { - function: fields.function, - argument: fields.argument, + function: fields["function"], + argument: fields["argument"], }; - if (typeof fields.hint === "string") { - functionArgument.hint = fields.hint; + if (typeof fields["hint"] === "string") { + functionArgument.hint = fields["hint"]; } return { code, ...denialReason, functionArgument }; } @@ -520,7 +522,9 @@ function findNetworkCause( */ function describeUrlSource(): string { if (getConfiguredSentryUrl()) { - const urlVar = getEnv().SENTRY_HOST?.trim() ? "SENTRY_HOST" : "SENTRY_URL"; + const urlVar = getEnv()["SENTRY_HOST"]?.trim() + ? "SENTRY_HOST" + : "SENTRY_URL"; return `This URL comes from ${urlVar}. If it is not your Sentry server, set ${urlVar} to the right URL.`; } return `This URL comes from your login. To use another server, run: ${getUrlLoginCommand()} `; @@ -770,7 +774,7 @@ export function getOrgSdkConfig( */ export const MAX_PAGINATION_PAGES = Math.max( 1, - Number(getEnv().SENTRY_MAX_PAGINATION_PAGES) || 50, + Number(getEnv()["SENTRY_MAX_PAGINATION_PAGES"]) || 50, ); /** @@ -810,6 +814,19 @@ export type PaginatedResponse = { response?: Response; }; +/** + * Build a {@link PaginatedResponse}, leaving `nextCursor` out on the last page. + * + * @param data - The page's data + * @param nextCursor - Cursor for the next page, if any + */ +export function paginatedResponse( + data: T, + nextCursor: string | undefined, +): PaginatedResponse { + return nextCursor === undefined ? { data } : { data, nextCursor }; +} + /** * Auto-paginate across multiple API pages, accumulating results up to `limit`. * @@ -848,7 +865,7 @@ export async function autoPaginate( if (allRows.length > limit) { return { data: allRows.slice(0, limit) }; } - return { data: allRows, nextCursor: result.nextCursor }; + return paginatedResponse(allRows, result.nextCursor); } cursor = result.nextCursor; @@ -880,7 +897,7 @@ export async function autoPaginate( * @returns Up to `limit` items with optional nextCursor */ export async function paginate( - options: { limit?: number; cursor?: string }, + options: { limit?: number | undefined; cursor?: string | undefined }, fetchPage: ( perPage: number, cursor: string | undefined, @@ -888,12 +905,12 @@ export async function paginate( defaultLimit = 10, ): Promise> { const { data, nextCursor, stoppedAtPageCap } = await paginateFrom( - { + omitUndefined({ limit: options.limit ?? defaultLimit, cursor: options.cursor, maxPages: MAX_PAGINATION_PAGES, - warn: (message) => logger.warn(message), - }, + warn: (message: string) => logger.warn(message), + }), fetchPage, ); if (stoppedAtPageCap) { @@ -902,7 +919,7 @@ export async function paginate( "Use the returned cursor to continue.", ); } - return nextCursor === undefined ? { data } : { data, nextCursor }; + return paginatedResponse(data, nextCursor); } /** Error message for each way {@link fetchAllPages} can fail. */ @@ -991,7 +1008,7 @@ export async function apiRequestToRegion( const response = await fetchFn(url, { method, headers, - body: body === undefined ? undefined : JSON.stringify(body), + ...(body !== undefined && { body: JSON.stringify(body) }), }); if (!response.ok) { @@ -1185,7 +1202,7 @@ export async function apiRequestToRegionNoContent( const response = await fetchFn(url, { method, headers, - body: body ? JSON.stringify(body) : undefined, + ...(body ? { body: JSON.stringify(body) } : {}), }); if (!response.ok) { @@ -1261,9 +1278,9 @@ export function isTextualContentType(contentType: string | null): boolean { /** Options for a raw request, retaining the CLI's transport and body policies. */ type RawApiRequestOptions = ApiRequestOptions & { /** Explicit caller headers, before authentication and proxy headers. */ - headers?: Record; + headers?: Record | undefined; /** Caller-selected Sentry origin or instance prefix, checked at dispatch. */ - baseUrl?: string; + baseUrl?: string | undefined; }; /** A request snapshot and the CLI transport that will authenticate it. */ @@ -1299,7 +1316,7 @@ export async function prepareRawApiRequest( method, // Relative to the API base path, which the client adds. url: `/${appendSearchParams(endpoint, params).replace(/^\/+/, "")}`, - query, + ...(query !== undefined && { query }), body, headers: isStringBody ? { "Content-Type": null, ...headers } : headers, ...(isStringBody ? { bodySerializer: null } : {}), diff --git a/packages/cli/src/lib/api/integrations.ts b/packages/cli/src/lib/api/integrations.ts index 541e597629..22076f8fb0 100644 --- a/packages/cli/src/lib/api/integrations.ts +++ b/packages/cli/src/lib/api/integrations.ts @@ -58,7 +58,7 @@ function getIntegrationSdkConfig(orgSlug: string) { */ export async function listIntegrationsPaginated( orgSlug: string, - options: { cursor?: string; perPage?: number } = {}, + options: { cursor?: string | undefined; perPage?: number | undefined } = {}, ): Promise> { const config = getIntegrationSdkConfig(orgSlug); @@ -69,7 +69,7 @@ export async function listIntegrationsPaginated( ...LIST_QUERY, cursor: options.cursor, per_page: options.perPage ?? 25, - } as ListOrganizationIntegrationsData["query"], + } as NonNullable, }); const paginated = unwrapPaginatedResult( diff --git a/packages/cli/src/lib/api/issue-app-links.ts b/packages/cli/src/lib/api/issue-app-links.ts index 924cf51734..8986b147ef 100644 --- a/packages/cli/src/lib/api/issue-app-links.ts +++ b/packages/cli/src/lib/api/issue-app-links.ts @@ -44,6 +44,7 @@ import { unwrapPaginatedResult, unwrapResult, } from "./infrastructure.js"; +import { omitUndefined } from "../omit-undefined.js"; /** A stored Sentry App association; id identifies the link, not the remote ticket. */ export type AppIssueLink = GroupExternalIssueResponse[number]; @@ -101,9 +102,9 @@ export type ResolveAppIssueLinkOptions = { /** Installed app slug selected by the caller. */ appSlug: string; /** Sentry project ID, forwarded to app searches that need project context. */ - projectId?: string; + projectId?: string | undefined; /** Additional form values keyed by names from the installed link schema. */ - fields?: Record; + fields?: Record | undefined; }; /** Read-only preflight result. Pass to linkAppIssue to execute the app action. */ @@ -123,7 +124,7 @@ export type PreparedAppIssueLink = { /** Validated form fields, sent at the top level of the action request. */ fields: Record; /** Existing association to the same target, supplying the canonical URL guard. */ - existing?: AppIssueLink; + existing?: AppIssueLink | undefined; }; const LINEAR_ISSUE_PATH = /^\/([^/]+)\/issue\/([a-z][a-z0-9]*-\d+)(?:\/|$)/i; @@ -218,7 +219,7 @@ export async function listAppIssueLinks( const result = await listOrganizationIssueExternalIssues({ ...config, path: { organization_id_or_slug: orgSlug, issue_id: issueId }, - query: { cursor }, + query: omitUndefined({ cursor }), }); return unwrapPaginatedResult(result, "Failed to list app issue links"); }, @@ -271,7 +272,7 @@ async function resolveInstallation( const result = await listOrganizationSentryAppInstallations({ ...config, path: { organization_id_or_slug: orgSlug }, - query: { cursor }, + query: omitUndefined({ cursor }), }); return unwrapPaginatedResult( result, @@ -309,7 +310,7 @@ async function getLinkForm( const result = await listOrganizationSentryAppComponents({ ...config, path: { organization_id_or_slug: orgSlug }, - query: { filter: "issue-link", cursor }, + query: omitUndefined({ filter: "issue-link", cursor }), }); return unwrapPaginatedResult(result, "Failed to list app components"); }, @@ -340,7 +341,7 @@ async function getLinkForm( const { schema } = component; const form = safeParse( LinkFormSchema, - schema.type === "issue-link" ? schema.link : undefined, + schema["type"] === "issue-link" ? schema.link : undefined, ); if (!form.success) { throw new ValidationError( @@ -361,9 +362,9 @@ async function getChoices({ }: { installationUuid: string; field: Field; - query?: string; + query?: string | undefined; values: Record; - projectId?: string; + projectId?: string | undefined; }): Promise> { if (!field.uri) { return { choices: field.choices ?? field.options ?? [] }; @@ -375,14 +376,14 @@ async function getChoices({ const result = await getSentryAppInstallationExternalRequestOptions({ ...getSdkClientConfig(getControlSiloUrl()), path: { uuid: installationUuid }, - query: { + query: omitUndefined({ uri: field.uri, query, projectId: projectId === undefined ? undefined : Number(projectId), dependentData: field.depends_on?.length ? JSON.stringify(dependentData) : undefined, - }, + }), }); const parsed = safeParse( ChoicesResponseSchema, diff --git a/packages/cli/src/lib/api/issue-integrations.ts b/packages/cli/src/lib/api/issue-integrations.ts index d6aa25ead4..d254afab78 100644 --- a/packages/cli/src/lib/api/issue-integrations.ts +++ b/packages/cli/src/lib/api/issue-integrations.ts @@ -2,7 +2,6 @@ import { deleteOrganizationIssueIntegration, type ExternalIssueLinkResponse, - type IssueIntegrationsResponse, listOrganizationIssueIntegrations, updateOrganizationIssueIntegration, } from "@sentry/api"; @@ -10,7 +9,7 @@ import { vExternalIssueLinkResponse, vIssueIntegrationsResponse, } from "@sentry/api/valibot"; -import { safeParse } from "valibot"; +import { type InferOutput, safeParse } from "valibot"; import { ApiError, ValidationError } from "../errors.js"; import { resolveOrgRegion } from "../region.js"; import { getSdkClientConfig } from "../sentry-sdk-client.js"; @@ -21,6 +20,7 @@ import { unwrapPaginatedResult, unwrapResult, } from "./infrastructure.js"; +import { omitUndefined } from "../omit-undefined.js"; /** An existing reference to a tracker issue, stored by a native integration. */ export type NativeIssueLink = Pick< @@ -34,10 +34,11 @@ export type NativeIssueLink = Pick< /** Native integration provider key, such as github or jira_server. */ provider: string; /** Issue title, when supplied by the list endpoint. */ - title?: string; + title?: string | undefined; }; -type NativeIntegration = IssueIntegrationsResponse[number]; +/** An integration as validated by {@link vIssueIntegrationsResponse}. */ +type NativeIntegration = InferOutput[number]; /** Read-only resolution result used for previews and a subsequent link mutation. */ export type PreparedNativeIssueLink = { @@ -54,7 +55,7 @@ export type PreparedNativeIssueLink = { /** External issue URL submitted to the backend for provider resolution. */ url: string; /** Reference found during preflight, used only to describe a dry run. */ - existing?: NativeIssueLink; + existing?: NativeIssueLink | undefined; }; const TRAILING_SLASH = /\/+$/; @@ -109,6 +110,7 @@ function azureAccount(url: URL): string | undefined { if (url.hostname.endsWith(".visualstudio.com")) { return url.hostname.slice(0, -".visualstudio.com".length); } + return undefined; } /** Jira copy links can select the issue in a path or board/backlog query. */ @@ -209,7 +211,7 @@ async function listIntegrations( const result = await listOrganizationIssueIntegrations({ ...config, path: { organization_id_or_slug: orgSlug, issue_id: issueId }, - query: { cursor, per_page: API_MAX_PER_PAGE }, + query: omitUndefined({ cursor, per_page: API_MAX_PER_PAGE }), }); return unwrapPaginatedResult(result, "Failed to list issue integrations"); }, @@ -328,7 +330,7 @@ export async function resolveNativeIssueLink(options: { orgSlug: string; issueId: string; url: string; - integrationId?: string; + integrationId?: string | undefined; }): Promise { const url = parseUrl(options.url); const integrations = await listIntegrations(options.orgSlug, options.issueId); diff --git a/packages/cli/src/lib/api/issue-tags.ts b/packages/cli/src/lib/api/issue-tags.ts index 5e95755ece..6d909f8fe1 100644 --- a/packages/cli/src/lib/api/issue-tags.ts +++ b/packages/cli/src/lib/api/issue-tags.ts @@ -7,6 +7,7 @@ import { getOrganizationIssueTag, } from "@sentry/api"; import { getOrgSdkConfig, unwrapResult } from "./infrastructure.js"; +import { omitUndefined } from "../omit-undefined.js"; /** * Retrieve a tag's aggregate counts and top values for one issue. @@ -30,9 +31,9 @@ export async function getIssueTag( issue_id: issueId, key, }, - query: { + query: omitUndefined({ environment: environment === undefined ? undefined : [environment], - }, + }), }); return unwrapResult( diff --git a/packages/cli/src/lib/api/issues.ts b/packages/cli/src/lib/api/issues.ts index dcc95978ca..60ad388844 100644 --- a/packages/cli/src/lib/api/issues.ts +++ b/packages/cli/src/lib/api/issues.ts @@ -40,6 +40,8 @@ import { unwrapPaginatedResult, unwrapResult, } from "./infrastructure.js"; +import { omitUndefined } from "../omit-undefined.js"; +import { rethrow } from "../rethrow.js"; const TRAILING_SLASH_RE = /\/$/; @@ -181,27 +183,27 @@ export async function listIssuesPaginated( orgSlug: string, projectSlug: string, options: { - query?: string; - cursor?: string; - perPage?: number; - sort?: IssueSort; - statsPeriod?: string; + query?: string | undefined; + cursor?: string | undefined; + perPage?: number | undefined; + sort?: IssueSort | undefined; + statsPeriod?: string | undefined; /** * Numeric project IDs sent as the repeated `project` query param. Selects * projects directly, bypassing the "actively selected" requirement that * `project:` search syntax is subject to. IDs only: self-hosted * releases before 26.6 reject slugs in this param. */ - projects?: readonly number[]; + projects?: readonly number[] | undefined; /** Controls the time resolution of inline stats data. "auto" adapts to statsPeriod. */ - groupStatsPeriod?: "" | "14d" | "24h" | "auto"; + groupStatsPeriod?: "" | "14d" | "24h" | "auto" | undefined; /** Fields to collapse (omit) from the response for performance. * @see {@link buildIssueListCollapse} */ - collapse?: IssueCollapseField[]; + collapse?: IssueCollapseField[] | undefined; /** Absolute start datetime (ISO-8601). Mutually exclusive with statsPeriod. */ - start?: string; + start?: string | undefined; /** Absolute end datetime (ISO-8601). Mutually exclusive with statsPeriod. */ - end?: string; + end?: string | undefined; } = {}, ): Promise> { // Prefer the API's repeated `project` parameter. A lone slug retains the @@ -216,7 +218,7 @@ export async function listIssuesPaginated( const result = await listOrganizationIssues({ ...config, path: { organization_id_or_slug: orgSlug }, - query: { + query: omitUndefined({ project: projects, // Convert empty string to undefined so the SDK omits the param entirely; // sending `query=` causes the Sentry API to behave differently than @@ -230,7 +232,7 @@ export async function listIssuesPaginated( end: options.end, groupStatsPeriod: options.groupStatsPeriod, collapse: options.collapse, - }, + }), }); return unwrapPaginatedResult(result, "Failed to list issues"); @@ -243,7 +245,7 @@ export type IssuesPage = { * Cursor for the next page of results, if more exist beyond the returned * issues. `undefined` when exhausted or a safe page boundary is unavailable. */ - nextCursor?: string; + nextCursor?: string | undefined; }; /** @@ -263,25 +265,25 @@ export async function listIssuesAllPages( orgSlug: string, projectSlug: string, options: { - query?: string; + query?: string | undefined; limit: number; - sort?: IssueSort; - statsPeriod?: string; + sort?: IssueSort | undefined; + statsPeriod?: string | undefined; /** Numeric project IDs to select in one organization-scoped request. */ - projects?: readonly number[]; + projects?: readonly number[] | undefined; /** Controls the time resolution of inline stats data. "auto" adapts to statsPeriod. */ - groupStatsPeriod?: "" | "14d" | "24h" | "auto"; + groupStatsPeriod?: "" | "14d" | "24h" | "auto" | undefined; /** Resume pagination from this cursor instead of starting from the beginning. */ - startCursor?: string; + startCursor?: string | undefined; /** Called after each page is fetched. Useful for progress indicators. */ - onPage?: (fetched: number, limit: number) => void; + onPage?: ((fetched: number, limit: number) => void) | undefined; /** Fields to collapse (omit) from the response for performance. * @see {@link buildIssueListCollapse} */ - collapse?: IssueCollapseField[]; + collapse?: IssueCollapseField[] | undefined; /** Absolute start datetime (ISO-8601). Mutually exclusive with statsPeriod. */ - start?: string; + start?: string | undefined; /** Absolute end datetime (ISO-8601). Mutually exclusive with statsPeriod. */ - end?: string; + end?: string | undefined; }, ): Promise { if (options.limit < 1) { @@ -333,7 +335,7 @@ export async function getIssueInOrg( const result = await getOrganizationIssue({ ...getOrgSdkConfig(), path: { organization_id_or_slug: orgSlug, issue_id: issueId }, - query: collapse ? { collapse } : undefined, + ...(collapse && { query: { collapse } }), }); return unwrapResult(result, "Failed to get issue"); } @@ -383,7 +385,7 @@ export async function findIssueInOrgs( ), ); if (!found && failure) { - throw failure; + rethrow(failure); } return found; } @@ -410,7 +412,7 @@ export async function getIssueByShortId( const result = await resolveOrganizationShortId({ ...config, path: { organization_id_or_slug: orgSlug, issue_id: normalizedShortId }, - query: options?.collapse ? { collapse: options.collapse } : undefined, + ...(options?.collapse && { query: { collapse: options.collapse } }), }); data = unwrapResult<{ group?: SentryIssue }>( result, @@ -645,9 +647,9 @@ export async function updateIssueStatus( issueId: string, status: "resolved" | "unresolved" | "ignored", options: { - statusDetails?: ResolveStatusDetails | IgnoreStatusDetails; + statusDetails?: ResolveStatusDetails | IgnoreStatusDetails | undefined; /** Substatus for archive granularity. */ - substatus?: IssueSubstatus; + substatus?: IssueSubstatus | undefined; orgSlug: string; }, ): Promise { diff --git a/packages/cli/src/lib/api/logs.ts b/packages/cli/src/lib/api/logs.ts index 7f2065ec1a..9e7e65e9c8 100644 --- a/packages/cli/src/lib/api/logs.ts +++ b/packages/cli/src/lib/api/logs.ts @@ -27,11 +27,13 @@ import { API_MAX_PER_PAGE, getOrgSdkConfig, paginate, + paginatedResponse, unwrapPaginatedResult, unwrapResult, validateResponse, } from "./infrastructure.js"; import { getTraceItemDetail } from "./traces.js"; +import { omitUndefined } from "../omit-undefined.js"; /** Sort direction for log queries: newest-first or oldest-first. */ export type LogSortDirection = "newest" | "oldest"; @@ -119,7 +121,7 @@ function safeParseResponse( type ListLogsOptions = { /** Search query using Sentry query syntax */ - query?: string; + query?: string | undefined; /** Maximum number of log entries to return */ limit?: number; /** @@ -131,7 +133,7 @@ type ListLogsOptions = { /** Sort direction: "newest" (default) or "oldest" */ sort?: LogSortDirection; /** Only return logs after this timestamp_precise value (for streaming) */ - afterTimestamp?: number; + afterTimestamp?: number | undefined; /** Absolute start datetime (ISO-8601). Mutually exclusive with statsPeriod. */ start?: string; /** Absolute end datetime (ISO-8601). Mutually exclusive with statsPeriod. */ @@ -142,7 +144,7 @@ type ListLogsOptions = { * and returned in the API response alongside standard fields. * Used by `--fields` to surface custom structured log attributes. */ - extraFields?: string[]; + extraFields?: string[] | undefined; /** * Numeric project ID. When provided, the request scopes to the project via * the `project` query param instead of `project:` search syntax. @@ -152,7 +154,7 @@ type ListLogsOptions = { * the project has logs. Passing the numeric ID selects the project directly * and avoids that gap. Mirrors {@link listIssuesPaginated}. */ - projectId?: number; + projectId?: number | undefined; }; /** @@ -204,20 +206,22 @@ export async function listLogs( ...config, path: { organization_id_or_slug: orgSlug }, query: { + ...omitUndefined({ + project: + numericProjectId === undefined ? undefined : [numericProjectId], + query: fullQuery || undefined, + cursor, + statsPeriod: + options.start || options.end + ? undefined + : (options.statsPeriod ?? "30d"), + start: options.start, + end: options.end, + sort: toApiSort(options.sort), + }), dataset: "logs", field: fields, - project: - numericProjectId === undefined ? undefined : [numericProjectId], - query: fullQuery || undefined, per_page: perPage, - cursor, - statsPeriod: - options.start || options.end - ? undefined - : (options.statsPeriod ?? "30d"), - start: options.start, - end: options.end, - sort: toApiSort(options.sort), }, }); @@ -230,7 +234,7 @@ export async function listLogs( raw, "Failed to list logs", ); - return { data: logsResponse.data, nextCursor }; + return paginatedResponse(logsResponse.data, nextCursor); }, API_MAX_PER_PAGE, ); @@ -303,9 +307,9 @@ function getLogLookupWindow( */ type GetLogsBatchOptions = { config: ReturnType; - extraFields?: string[]; + extraFields?: string[] | undefined; /** Numeric project ID for direct project selection. @see {@link ListLogsOptions.projectId} */ - projectId?: number; + projectId?: number | undefined; }; async function getLogsBatch( @@ -336,7 +340,7 @@ async function getLogsBatch( const queryParams = { dataset: "logs" as const, field: fields, - project: numericProjectId === undefined ? undefined : [numericProjectId], + ...(numericProjectId !== undefined && { project: [numericProjectId] }), query: `${projectFilter}sentry.item_id:[${ids.join(",")}]`, per_page: ids.length, sampling, @@ -356,7 +360,7 @@ async function getLogsBatch( } const response = await fetchBatch(batchIds, "NORMAL"); - if (response.meta?.dataScanned !== "partial") { + if (response.meta?.["dataScanned"] !== "partial") { return response.data; } @@ -380,12 +384,12 @@ async function getLogsBatch( /** Options for {@link getLogs}. */ type GetLogsOptions = { /** Additional fields to request beyond {@link DETAILED_LOG_FIELDS}. */ - extraFields?: string[]; + extraFields?: string[] | undefined; /** * Numeric project ID for direct project selection via the `project` query * param. @see {@link ListLogsOptions.projectId} */ - projectId?: number; + projectId?: number | undefined; }; /** @@ -438,7 +442,7 @@ export async function getLogs( type ListTraceLogsOptions = { /** Additional search query to filter results (Sentry query syntax) */ - query?: string; + query?: string | undefined; /** Maximum number of log entries to return (max 9999) */ limit?: number; /** @@ -484,7 +488,7 @@ export async function listTraceLogs( const result = await listOrganizationTraceLogs({ ...config, path: { organization_id_or_slug: orgSlug }, - query: { + query: omitUndefined({ traceId: [traceId], statsPeriod: options.start || options.end @@ -496,7 +500,7 @@ export async function listTraceLogs( cursor, query: options.query, sort: [toApiSort(options.sort)], - }, + }), }); const page = unwrapPaginatedResult( @@ -509,7 +513,7 @@ export async function listTraceLogs( `/organizations/${orgSlug}/trace-logs/`, page.response?.status ?? 0, ); - return { data: response.data, nextCursor: page.nextCursor }; + return paginatedResponse(response.data, page.nextCursor); }, API_MAX_PER_PAGE, ); diff --git a/packages/cli/src/lib/api/monitors.ts b/packages/cli/src/lib/api/monitors.ts index 6b7fa36095..954db098ca 100644 --- a/packages/cli/src/lib/api/monitors.ts +++ b/packages/cli/src/lib/api/monitors.ts @@ -61,7 +61,11 @@ export async function listMonitors(orgSlug: string): Promise { */ export async function listMonitorsPaginated( orgSlug: string, - options: { cursor?: string; perPage?: number; query?: string } = {}, + options: { + cursor?: string | undefined; + perPage?: number | undefined; + query?: string | undefined; + } = {}, ): Promise> { const config = getOrgSdkConfig(); diff --git a/packages/cli/src/lib/api/organizations.ts b/packages/cli/src/lib/api/organizations.ts index 7ec7fa55ce..5d349bb3ca 100644 --- a/packages/cli/src/lib/api/organizations.ts +++ b/packages/cli/src/lib/api/organizations.ts @@ -29,6 +29,7 @@ import { unwrapPaginatedResult, unwrapResult, } from "./infrastructure.js"; +import { omitUndefined } from "../omit-undefined.js"; function normalizeOrganizationRegion( raw: string | undefined, @@ -78,7 +79,7 @@ export async function checkTokenAccess(): Promise { */ export async function listOrganizationsPage( baseUrl: string, - options: { cursor?: string; perPage?: number } = {}, + options: { cursor?: string | undefined; perPage?: number | undefined } = {}, credential = getCredentialContext(), ): Promise> { const config = getSdkClientConfig(baseUrl, { @@ -88,7 +89,7 @@ export async function listOrganizationsPage( const result = await sdkListOrganizations({ ...config, - query: { cursor: options.cursor, per_page: options.perPage }, + query: omitUndefined({ cursor: options.cursor, per_page: options.perPage }), }); // 403 enrichment (CLI-89, 24 users) is now handled centrally by diff --git a/packages/cli/src/lib/api/preprod-artifacts.ts b/packages/cli/src/lib/api/preprod-artifacts.ts index db560a9cdc..8c25581c2d 100644 --- a/packages/cli/src/lib/api/preprod-artifacts.ts +++ b/packages/cli/src/lib/api/preprod-artifacts.ts @@ -15,6 +15,7 @@ import { createWriteStream } from "node:fs"; import { Readable } from "node:stream"; import { pipeline } from "node:stream/promises"; +import type { ReadableStream as NodeReadableStream } from "node:stream/web"; import { promisify } from "node:util"; import { zstdCompress as zstdCompressCb } from "node:zlib"; import { @@ -63,6 +64,7 @@ import { unwrapResult, unwrapValidatedResult, } from "./infrastructure.js"; +import { omitUndefined } from "../omit-undefined.js"; const log = logger.withTag("api.preprod-artifacts"); @@ -176,7 +178,7 @@ export async function downloadBuildArtifact( if (isRegionOrigin(url, regionUrl)) { const token = getAuthToken(); if (token) { - headers.Authorization = formatAuthHeader(token); + headers["Authorization"] = formatAuthHeader(token); } } @@ -191,17 +193,20 @@ export async function downloadBuildArtifact( } // Stream to disk so large (hundreds-of-MB) artifacts never buffer in memory. - await pipeline(Readable.fromWeb(response.body), createWriteStream(destPath)); + // lib DOM's ReadableStream, which programs that also load DOM give + // `response.body`, is not node:stream/web's, though Node's fetch returns one. + const body = response.body as NodeReadableStream>; + await pipeline(Readable.fromWeb(body), createWriteStream(destPath)); } /** Optional metadata sent with a build assemble request. */ export type BuildUploadMetadata = { /** Build configuration name (e.g. `Release`). */ - buildConfiguration?: string; + buildConfiguration?: string | undefined; /** Release notes for the build. */ - releaseNotes?: string; + releaseNotes?: string | undefined; /** Install group(s) this build belongs to. */ - installGroups?: string[]; + installGroups?: string[] | undefined; /** * Pre-flattened VCS fields (snake_case, e.g. `head_sha`, `provider`) merged * into the assemble body. Built via `vcsInfoToBody` in the build/vcs module. @@ -407,14 +412,18 @@ function snapshotArchiveEndpoint(org: string, snapshotId: string): string { export async function getLatestBaseSnapshot( org: string, appId: string, - opts: { branch?: string; project?: string } = {}, + opts: { branch?: string | undefined; project?: string | undefined } = {}, ): Promise { const config = getOrgSdkConfig(); try { const result = await getOrganizationPreprodArtifactSnapshotLatestBase({ ...config, path: { organization_id_or_slug: org }, - query: { app_id: appId, branch: opts.branch, project: opts.project }, + query: omitUndefined({ + app_id: appId, + branch: opts.branch, + project: opts.project, + }), }); // The generated type has no null body; the CLI treats one as "no base". const data = unwrapValidatedResult( @@ -622,7 +631,7 @@ export async function openSnapshotArchive( const headers: Record = {}; const token = getAuthToken(); if (token) { - headers.Authorization = formatAuthHeader(token); + headers["Authorization"] = formatAuthHeader(token); } const response = await customFetch(url, { headers }); if (!response.ok) { diff --git a/packages/cli/src/lib/api/proguard.ts b/packages/cli/src/lib/api/proguard.ts index 84f8ce8cfa..1beee0dac9 100644 --- a/packages/cli/src/lib/api/proguard.ts +++ b/packages/cli/src/lib/api/proguard.ts @@ -39,7 +39,7 @@ export type ProguardMapping = { /** The UUID for this mapping (content-derived or user-forced). */ uuid: string; /** Pre-read content buffer (avoids double-read when UUID was computed). */ - content: Buffer; + content: Buffer; }; /** Options for {@link uploadProguardMappings}. */ diff --git a/packages/cli/src/lib/api/projects.ts b/packages/cli/src/lib/api/projects.ts index 61e2dd83a0..df1aac0509 100644 --- a/packages/cli/src/lib/api/projects.ts +++ b/packages/cli/src/lib/api/projects.ts @@ -52,6 +52,7 @@ import { unwrapValidatedResult, } from "./infrastructure.js"; import { listOrganizations } from "./organizations.js"; +import { omitUndefined } from "../omit-undefined.js"; const log = logger.withTag("api.projects"); @@ -82,7 +83,7 @@ export async function listProjects(orgSlug: string): Promise { const result = await listOrganizationProjects({ ...config, path: { organization_id_or_slug: orgSlug }, - query: { cursor, per_page: API_MAX_PER_PAGE }, + query: omitUndefined({ cursor, per_page: API_MAX_PER_PAGE }), }); return unwrapPaginatedResult( result, @@ -121,7 +122,11 @@ export async function listProjects(orgSlug: string): Promise { */ export async function listProjectsPaginated( orgSlug: string, - options: { cursor?: string; perPage?: number; query?: string } = {}, + options: { + cursor?: string | undefined; + perPage?: number | undefined; + query?: string | undefined; + } = {}, ): Promise> { const config = getOrgSdkConfig(); const perPage = Math.min( @@ -132,11 +137,11 @@ export async function listProjectsPaginated( const result = await listOrganizationProjects({ ...config, path: { organization_id_or_slug: orgSlug }, - query: { + query: omitUndefined({ cursor: options.cursor, per_page: perPage, query: options.query, - }, + }), }); return unwrapPaginatedResult( @@ -184,7 +189,7 @@ export async function searchProjects( */ export function listProjectsAllPages( orgSlug: string, - options: { limit: number; cursor?: string }, + options: { limit: number; cursor?: string | undefined }, ): Promise> { return paginate(options, (perPage, cursor) => listProjectsPaginated(orgSlug, { cursor, perPage }), @@ -760,13 +765,13 @@ function toProjectDsn(key: SdkProjectKey): ProjectDsn { export async function listProjectDsns( orgSlug: string, projectSlug: string, - options: { limit?: number; cursor?: string } = {}, + options: { limit?: number | undefined; cursor?: string | undefined } = {}, ): Promise> { const config = getOrgSdkConfig(); return await paginate(options, async (perPage, cursor) => { // The SDK omits the shared per_page parameter supported by this endpoint. - const query = { cursor, per_page: perPage }; + const query = omitUndefined({ cursor, per_page: perPage }); const result = await listProjectKeys({ ...config, path: { @@ -794,7 +799,7 @@ export async function listProjectDsns( */ export async function listOrganizationDsns( orgSlug: string, - options: { limit?: number; cursor?: string } = {}, + options: { limit?: number | undefined; cursor?: string | undefined } = {}, ): Promise> { const config = getOrgSdkConfig(); const projectLookups = new Map>(); @@ -803,7 +808,7 @@ export async function listOrganizationDsns( return await paginate(options, async (perPage, cursor) => { // These shared query parameters are supported by the backend but absent // from the SDK type. -1 includes accessible projects outside the user's teams. - const query = { cursor, per_page: perPage, project: -1 }; + const query = omitUndefined({ cursor, per_page: perPage, project: -1 }); const result = await listOrganizationProjectKeys({ ...config, path: { organization_id_or_slug: orgSlug }, diff --git a/packages/cli/src/lib/api/releases.ts b/packages/cli/src/lib/api/releases.ts index a7401e7178..9f2fdfaf4c 100644 --- a/packages/cli/src/lib/api/releases.ts +++ b/packages/cli/src/lib/api/releases.ts @@ -53,6 +53,7 @@ import { } from "./infrastructure.js"; import { getProject } from "./projects.js"; import { listRepositoriesPaginated } from "./repositories.js"; +import { omitUndefined } from "../omit-undefined.js"; const log = logger.withTag("api.releases"); @@ -69,16 +70,16 @@ const log = logger.withTag("api.releases"); */ /** Options for listing releases with pagination. */ export type ListReleasesOptions = { - cursor?: string; + cursor?: string | undefined; perPage?: number; - query?: string; + query?: string | undefined; sort?: string; /** Include per-project health/adoption data in the response. */ health?: boolean; /** Filter by numeric project IDs (repeated query param). */ project?: number[]; /** Filter by environment names (repeated query param). */ - environment?: string[]; + environment?: string[] | undefined; /** Stats period for health data, e.g. "24h", "7d", "90d". */ statsPeriod?: string; /** Filter by release status: "open" (active) or "archived". */ @@ -205,7 +206,7 @@ export async function getRelease( organization_id_or_slug: orgSlug, version, }, - query: { + query: omitUndefined({ health: options?.health, adoptionStages: options?.adoptionStages, healthStatsPeriod: options?.healthStatsPeriod as @@ -219,7 +220,7 @@ export async function getRelease( | "48h" | "90d" | undefined, - }, + }), }); return unwrapResult( @@ -550,7 +551,7 @@ function resolveAutoCheckout( const inGitCheckout = isInsideGitWorkTree(cwd); const target = `${orgSlug}/${version}`; let note: string | undefined; - if (env.VERCEL) { + if (env["VERCEL"]) { note = "Vercel builds have no .git directory, and --auto only reads VERCEL_GIT_* in production builds. Use --commit to associate commits from preview builds."; } else if (!inGitCheckout) { diff --git a/packages/cli/src/lib/api/replays.ts b/packages/cli/src/lib/api/replays.ts index c600104117..cfd0ae7f5c 100644 --- a/packages/cli/src/lib/api/replays.ts +++ b/packages/cli/src/lib/api/replays.ts @@ -32,12 +32,14 @@ import { apiRequestToRegion, getOrgSdkConfig, MAX_PAGINATION_PAGES, - type PaginatedResponse, paginate, + type PaginatedResponse, + paginatedResponse, parseLinkHeader, unwrapPaginatedResult, unwrapValidatedResult, } from "./infrastructure.js"; +import { omitUndefined } from "../omit-undefined.js"; const log = logger.withTag("api.replays"); @@ -92,19 +94,19 @@ export type ListReplaysOptions = { /** Limit total rows returned across auto-paginated pages. */ limit?: number; /** Structured replay query using Sentry search syntax. */ - query?: string; + query?: string | undefined; /** Optional environment filter(s). */ - environment?: string[]; + environment?: string[] | undefined; /** Response fields to request from the replay endpoint. */ fields?: string[]; /** Project slugs to filter by. */ - projectSlugs?: string[]; + projectSlugs?: string[] | undefined; /** Numeric project IDs. `"-1"` searches all projects. */ - project?: string; + project?: string | undefined; /** Sort expression for the replay index endpoint. */ sort?: ReplaySortValue; /** Pagination cursor from a previous response. */ - cursor?: string; + cursor?: string | undefined; /** Relative time period (e.g. "7d", "24h"). Overrides start/end on the API. */ statsPeriod?: string; /** Absolute start datetime (ISO-8601). Mutually exclusive with statsPeriod. */ @@ -116,14 +118,14 @@ export type ListReplaysOptions = { type FetchReplayPageOptions = { options: ListReplaysOptions; perPage: number; - cursor?: string; + cursor?: string | undefined; }; type FetchReplayRecordingSegmentsPageOptions = { orgSlug: string; projectSlugOrId: string; replayId: string; - cursor?: string; + cursor?: string | undefined; }; /** @@ -157,7 +159,7 @@ export type GetReplayRecordingSegmentsOptions = { * * Omit (or pass null/undefined) to fetch all pages up to MAX_PAGINATION_PAGES. */ - expectedSegments?: number | null; + expectedSegments?: number | null | undefined; }; /** @@ -167,7 +169,7 @@ export type GetReplayRecordingSegmentsOptions = { * schemas normalize it to a string for uniform comparisons and display. */ function normalizeReplayProjectId< - T extends { project_id?: string | number | null }, + T extends { project_id?: string | number | null | undefined }, >(replay: T): T & ReplayStringProjectId { if ( replay.project_id === null || @@ -225,10 +227,7 @@ async function fetchReplayPage( ); const { nextCursor } = parseLinkHeader(headers.get("link") ?? null); - return { - data: data.data.map(normalizeReplayProjectId), - nextCursor, - }; + return paginatedResponse(data.data.map(normalizeReplayProjectId), nextCursor); } /** @@ -386,10 +385,10 @@ async function fetchReplayRecordingSegmentsPage( // No `download=true`: the endpoint always streams the event payloads // (`on_results=download_segments`) and never reads that parameter. The // web UI sends it, but the backend ignores it. - query: { + query: omitUndefined({ cursor, per_page: API_MAX_PER_PAGE, - }, + }), responseValidator: validateReplayRecordingSegmentsResponse, }); diff --git a/packages/cli/src/lib/api/repositories.ts b/packages/cli/src/lib/api/repositories.ts index b6625d62f9..43276cdf62 100644 --- a/packages/cli/src/lib/api/repositories.ts +++ b/packages/cli/src/lib/api/repositories.ts @@ -20,6 +20,7 @@ import { unwrapPaginatedResult, unwrapResult, } from "./infrastructure.js"; +import { omitUndefined } from "../omit-undefined.js"; const log = logger.withTag("api.repositories"); @@ -58,18 +59,22 @@ export async function listRepositories( */ export async function listRepositoriesPaginated( orgSlug: string, - options: { cursor?: string; perPage?: number; query?: string } = {}, + options: { + cursor?: string | undefined; + perPage?: number | undefined; + query?: string | undefined; + } = {}, ): Promise> { const config = getOrgSdkConfig(); const result = await listOrganizationRepos({ ...config, path: { organization_id_or_slug: orgSlug }, - query: { + query: omitUndefined({ cursor: options.cursor, per_page: options.perPage ?? 25, query: options.query, - }, + }), }); const paginated = unwrapPaginatedResult( diff --git a/packages/cli/src/lib/api/sourcemaps.ts b/packages/cli/src/lib/api/sourcemaps.ts index 3cbf7f9f78..c7007d2288 100644 --- a/packages/cli/src/lib/api/sourcemaps.ts +++ b/packages/cli/src/lib/api/sourcemaps.ts @@ -92,9 +92,9 @@ export type UploadOptions = { /** Project slug. */ project: string; /** Release version (optional — debug IDs can work without releases). */ - release?: string; + release?: string | undefined; /** Distribution identifier (optional — disambiguates builds within a release). */ - dist?: string; + dist?: string | undefined; /** Files to upload (must already have debug IDs injected). */ files: ArtifactFile[]; /** @@ -168,9 +168,9 @@ export async function buildArtifactBundle( options: { org: string; project: string; - release?: string; - dist?: string; - compression?: ZipCompression; + release?: string | undefined; + dist?: string | undefined; + compression?: ZipCompression | undefined; }, ): Promise { // Build manifest.json @@ -190,7 +190,7 @@ export async function buildArtifactBundle( headers["debug-id"] = file.debugId; } if (file.sourcemapFilename) { - headers.Sourcemap = file.sourcemapFilename; + headers["Sourcemap"] = file.sourcemapFilename; } filesManifest[bundlePath] = { diff --git a/packages/cli/src/lib/api/teams.ts b/packages/cli/src/lib/api/teams.ts index 88213a5125..7745190512 100644 --- a/packages/cli/src/lib/api/teams.ts +++ b/packages/cli/src/lib/api/teams.ts @@ -22,6 +22,7 @@ import { unwrapResult, } from "./infrastructure.js"; import { reportCliError } from "../error-reporting.js"; +import { omitUndefined } from "../omit-undefined.js"; /** * List teams in an organization. @@ -49,18 +50,22 @@ export async function listTeams(orgSlug: string): Promise { */ export async function listTeamsPaginated( orgSlug: string, - options: { cursor?: string; perPage?: number; query?: string } = {}, + options: { + cursor?: string | undefined; + perPage?: number | undefined; + query?: string | undefined; + } = {}, ): Promise> { const config = getOrgSdkConfig(); const result = await listOrganizationTeams({ ...config, path: { organization_id_or_slug: orgSlug }, - query: { + query: omitUndefined({ cursor: options.cursor, per_page: options.perPage ?? 25, query: options.query, - }, + }), }); return unwrapPaginatedResult(result, "Failed to list teams"); diff --git a/packages/cli/src/lib/api/traces.ts b/packages/cli/src/lib/api/traces.ts index ed2a6aedb7..ac93958d48 100644 --- a/packages/cli/src/lib/api/traces.ts +++ b/packages/cli/src/lib/api/traces.ts @@ -41,13 +41,15 @@ import { isAllDigits } from "../utils.js"; import { getOrgSdkConfig, - type PaginatedResponse, paginate, + type PaginatedResponse, + paginatedResponse, unwrapPaginatedResult, unwrapResult, unwrapValidatedResult, validateResponse, } from "./infrastructure.js"; +import { omitUndefined } from "../omit-undefined.js"; const log = logger.withTag("api.traces"); @@ -115,7 +117,7 @@ export const TRACE_LOOKUP_FALLBACK_STATS_PERIOD = "90d"; /** Options for {@link getDetailedTrace}. */ type GetDetailedTraceOptions = { /** Extra attribute names to include on each span */ - additionalAttributes?: string[]; + additionalAttributes?: string[] | undefined; /** * Unix timestamp (seconds) of a known event in this trace. * The backend then searches ±1.5 days around it and does not widen. @@ -134,12 +136,12 @@ async function requestTrace( const result = await getOrganizationTrace({ ...getSdkClientConfig(regionUrl), path: { organization_id_or_slug: orgSlug, trace_id: traceId }, - query: { + query: omitUndefined({ timestamp: params.timestamp === undefined ? undefined : String(params.timestamp), statsPeriod: params.statsPeriod, additional_attributes: params.additionalAttributes, - }, + }), }); const data = unwrapResult(result, "Failed to get trace"); return data.map(normalizeTraceSpan); @@ -289,36 +291,36 @@ export type ListTraceItemAttributesOptions = { /** Dataset to list attribute keys for */ dataset: TraceItemAttributeDataset; /** Project IDs or slugs to scope to (omit for all accessible projects) */ - project?: Array; + project?: Array | undefined; /** Environment names to scope to */ - environment?: string[]; + environment?: string[] | undefined; /** Only return attributes of these value types (filtered server-side) */ - attributeTypes?: TraceItemAttributeValueType[]; + attributeTypes?: TraceItemAttributeValueType[] | undefined; /** Only return attribute names containing this substring (case-sensitive) */ - substringMatch?: string; + substringMatch?: string | undefined; /** * Sentry search query. The result is limited to keys that co-occur * with all of those keys. `has:` filters express this exactly. */ - query?: string; + query?: string | undefined; /** Relative time window, e.g. "24h" or "14d" (overrides start/end) */ - statsPeriod?: string; + statsPeriod?: string | undefined; /** Absolute window start (ISO-8601) */ - start?: string; + start?: string | undefined; /** Absolute window end (ISO-8601) */ - end?: string; + end?: string | undefined; /** * Page size, sent as `per_page` Applied per attribute type, so total * results can exceed this value */ - perPage?: number; + perPage?: number | undefined; /** * Include each attribute's `context` metadata (description, examples, * deprecation) */ - context?: boolean; + context?: boolean | undefined; /** Pagination cursor from a previous page's `nextCursor` */ - cursor?: string; + cursor?: string | undefined; /** Aborts the request, including its retries */ signal?: AbortSignal; }; @@ -343,27 +345,31 @@ export async function listTraceItemAttributes( const config = getOrgSdkConfig(); // `per_page` is accepted by the endpoint's paginator but missing from the // SDK's generated query type, so widen the type rather than cast the call. - const query: TraceItemAttributesQuery & { per_page?: number } = { - dataset: options.dataset, - project: options.project?.length ? options.project : undefined, - environment: options.environment?.length ? options.environment : undefined, - attributeType: options.attributeTypes?.length - ? options.attributeTypes - : undefined, - substringMatch: options.substringMatch || undefined, - query: options.query || undefined, - statsPeriod: options.statsPeriod, - start: options.start, - end: options.end, - expand: options.context ? ["context"] : undefined, - per_page: options.perPage, - cursor: options.cursor, - }; + const query: TraceItemAttributesQuery & { per_page?: number } = omitUndefined( + { + dataset: options.dataset, + project: options.project?.length ? options.project : undefined, + environment: options.environment?.length + ? options.environment + : undefined, + attributeType: options.attributeTypes?.length + ? options.attributeTypes + : undefined, + substringMatch: options.substringMatch || undefined, + query: options.query || undefined, + statsPeriod: options.statsPeriod, + start: options.start, + end: options.end, + expand: options.context ? ["context" as const] : undefined, + per_page: options.perPage, + cursor: options.cursor, + }, + ); const result = await listOrganizationTraceItemAttributes({ ...config, path: { organization_id_or_slug: orgSlug }, query, - signal: options.signal, + ...(options.signal && { signal: options.signal }), }); return unwrapPaginatedResult( result, @@ -431,7 +437,7 @@ export type FetchMultiSpanDetailsOptions = { /** The parent trace ID (required by the API) */ traceId: string; /** Callback fired after each successful fetch for progress reporting */ - onProgress?: (done: number, total: number) => void; + onProgress?: ((done: number, total: number) => void) | undefined; }; /** @@ -446,7 +452,7 @@ export type FetchMultiSpanDetailsOptions = { * @returns Map of span_id to detail */ export async function fetchMultiSpanDetails( - spans: Array<{ span_id: string; project_slug?: string }>, + spans: Array<{ span_id: string; project_slug?: string | undefined }>, options: FetchMultiSpanDetailsOptions, ): Promise> { const { org, fallbackProject, traceId, onProgress } = options; @@ -538,7 +544,7 @@ function resolveNumericProjectId( type ListTransactionsOptions = { /** Search query using Sentry query syntax */ - query?: string; + query?: string | undefined; /** Maximum number of transactions to return */ limit?: number; /** Sort order: "date" (newest first) or "duration" (slowest first) */ @@ -546,7 +552,7 @@ type ListTransactionsOptions = { /** Time period for transactions (e.g., "7d", "24h") */ statsPeriod?: string; /** Pagination cursor to resume from a previous page */ - cursor?: string; + cursor?: string | undefined; /** Absolute start datetime (ISO-8601). Mutually exclusive with statsPeriod. */ start?: string; /** Absolute end datetime (ISO-8601). Mutually exclusive with statsPeriod. */ @@ -556,7 +562,7 @@ type ListTransactionsOptions = { * of `project:` search syntax, avoiding "not actively selected" errors * (same class of bug as #1317 / #312). */ - projectId?: number; + projectId?: number | undefined; }; /** @@ -587,23 +593,25 @@ async function fetchTransactionsPage( ...getOrgSdkConfig(), path: { organization_id_or_slug: orgSlug }, query: { + ...omitUndefined({ + project: + numericProjectId === undefined + ? undefined + : [String(numericProjectId)], + statsPeriod: + options.start || options.end + ? undefined + : (options.statsPeriod ?? "7d"), + start: options.start, + end: options.end, + cursor: options.cursor, + }), dataset: "spans", field: TRANSACTION_FIELDS, - project: - numericProjectId === undefined ? undefined : [String(numericProjectId)], - // Convert empty string to undefined so the param is omitted entirely; - // sending `query=` causes the Sentry API to behave differently than - // omitting the parameter. - query: fullQuery || undefined, + // Never empty: it always starts with `is_transaction:true`. + query: fullQuery, per_page: perPage, - statsPeriod: - options.start || options.end - ? undefined - : (options.statsPeriod ?? "7d"), - start: options.start, - end: options.end, sort: options.sort === "duration" ? "-span.duration" : "-timestamp", - cursor: options.cursor, }, }); const page = unwrapPaginatedResult( @@ -616,7 +624,7 @@ async function fetchTransactionsPage( `/organizations/${orgSlug}/events/`, page.response?.status ?? 0, ); - return { data: response.data, nextCursor: page.nextCursor }; + return paginatedResponse(response.data, page.nextCursor); } /** @@ -671,7 +679,7 @@ export type SpanSortValue = "date" | "duration"; type ListSpansOptions = { /** Search query using Sentry query syntax */ - query?: string; + query?: string | undefined; /** Maximum number of spans to return */ limit?: number; /** Sort order */ @@ -679,9 +687,9 @@ type ListSpansOptions = { /** Time period for spans (e.g., "7d", "24h") */ statsPeriod?: string; /** Pagination cursor to resume from a previous page */ - cursor?: string; + cursor?: string | undefined; /** Additional field names to request from the API beyond SPAN_FIELDS */ - extraFields?: string[]; + extraFields?: string[] | undefined; /** Absolute start datetime (ISO-8601). Mutually exclusive with statsPeriod. */ start?: string; /** Absolute end datetime (ISO-8601). Mutually exclusive with statsPeriod. */ @@ -693,7 +701,7 @@ type ListSpansOptions = { * `project` query param instead of `project:` search syntax, avoiding * "not actively selected" errors (same class of bug as #1317 / #312). */ - projectId?: number; + projectId?: number | undefined; }; /** @@ -734,19 +742,23 @@ async function fetchSpansPage( ...getOrgSdkConfig(), path: { organization_id_or_slug: orgSlug }, query: { + ...omitUndefined({ + project: projectParam === undefined ? undefined : [projectParam], + // Omit an empty query: Sentry treats `query=` differently from no + // query parameter. + query: fullQuery || undefined, + statsPeriod: + options.start || options.end + ? undefined + : (options.statsPeriod ?? "7d"), + start: options.start, + end: options.end, + cursor: options.cursor, + }), dataset: "spans", field: fields, - project: projectParam === undefined ? undefined : [projectParam], - query: fullQuery || undefined, per_page: perPage, - statsPeriod: - options.start || options.end - ? undefined - : (options.statsPeriod ?? "7d"), - start: options.start, - end: options.end, sort: options.sort === "duration" ? "-span.duration" : "-timestamp", - cursor: options.cursor, }, }); const page = unwrapPaginatedResult(result, "Failed to list spans"); @@ -756,7 +768,7 @@ async function fetchSpansPage( `/organizations/${orgSlug}/events/`, page.response?.status ?? 0, ); - return { data: response.data, nextCursor: page.nextCursor }; + return paginatedResponse(response.data, page.nextCursor); } /** diff --git a/packages/cli/src/lib/app-identity.ts b/packages/cli/src/lib/app-identity.ts index ae85d2025c..a3da925a9e 100644 --- a/packages/cli/src/lib/app-identity.ts +++ b/packages/cli/src/lib/app-identity.ts @@ -33,7 +33,7 @@ export function getAppIdentity(): AppIdentity { */ function launchedThroughNpx(): boolean { return ( - getEnv().npm_command === "exec" || + getEnv()["npm_command"] === "exec" || /[\\/]_npx[\\/]/.test(process.argv[1] ?? "") ); } diff --git a/packages/cli/src/lib/arg-parsing.ts b/packages/cli/src/lib/arg-parsing.ts index 2802728004..c5012cc96d 100644 --- a/packages/cli/src/lib/arg-parsing.ts +++ b/packages/cli/src/lib/arg-parsing.ts @@ -764,7 +764,7 @@ export type ListTargetOptions = { export type ListTargetInput = { readonly target: ListTarget; /** Base URL of a pasted Sentry web URL, for `applySentryUrlContext` */ - readonly baseUrl?: string; + readonly baseUrl?: string | undefined; }; /** diff --git a/packages/cli/src/lib/attribute-search.ts b/packages/cli/src/lib/attribute-search.ts index 3031e214f2..3a9a562f02 100644 --- a/packages/cli/src/lib/attribute-search.ts +++ b/packages/cli/src/lib/attribute-search.ts @@ -20,9 +20,9 @@ export const ATTRIBUTE_TYPES: readonly TraceItemAttributeValueType[] = [ /** A parsed filter argument. */ export type AttributeFilter = { /** The `has:` terms, as Sentry's `query`: keys must co-occur with all of them */ - query?: string; + query?: string | undefined; /** The free text: Sentry matches it as a substring of attribute names */ - name?: string; + name?: string | undefined; }; /** diff --git a/packages/cli/src/lib/bash-hook/traceback.ts b/packages/cli/src/lib/bash-hook/traceback.ts index 5af19016ef..9ff018d4aa 100644 --- a/packages/cli/src/lib/bash-hook/traceback.ts +++ b/packages/cli/src/lib/bash-hook/traceback.ts @@ -13,6 +13,7 @@ import type { Breadcrumb, Event, StackFrame } from "@sentry/core"; import { uuid4 } from "@sentry/core"; import { ValidationError } from "../errors.js"; import { logger } from "../logger.js"; +import { omitUndefined } from "../omit-undefined.js"; const log = logger.withTag("bash-hook.traceback"); @@ -64,11 +65,11 @@ function parseFrameLine(line: string): StackFrame | null { return null; } - return { + return omitUndefined({ function: funcName || undefined, filename: match[2], lineno: Number.parseInt(match[3] ?? "0", 10) || undefined, - }; + }); } /** @@ -148,7 +149,10 @@ async function enrichFramesWithSourceContext( } const idx = frame.lineno - 1; - frame.context_line = lines[idx]; + const contextLine = lines[idx]; + if (contextLine !== undefined) { + frame.context_line = contextLine; + } frame.pre_context = lines.slice(Math.max(0, idx - 5), idx); frame.post_context = lines.slice(idx + 1, Math.min(idx + 6, lines.length)); } @@ -193,9 +197,9 @@ async function parseLogBreadcrumbs(logPath: string): Promise { */ export async function buildBashErrorEvent(opts: { tracebackPath: string; - logPath?: string; - tags?: Record; - release?: string; + logPath?: string | undefined; + tags?: Record | undefined; + release?: string | undefined; }): Promise { let tracebackContent: string; try { @@ -237,11 +241,11 @@ export async function buildBashErrorEvent(opts: { log.debug("Could not determine username", err); } - const environment = process.env.SENTRY_ENVIRONMENT || undefined; + const environment = process.env["SENTRY_ENVIRONMENT"] || undefined; - return { + return omitUndefined({ event_id: uuid4(), - level: "error", + level: "error" as const, platform: "other", timestamp: Date.now() / 1000, release: opts.release || undefined, @@ -262,5 +266,5 @@ export async function buildBashErrorEvent(opts: { }, ], }, - }; + }); } diff --git a/packages/cli/src/lib/binary.ts b/packages/cli/src/lib/binary.ts index 521434e515..f95b03026e 100644 --- a/packages/cli/src/lib/binary.ts +++ b/packages/cli/src/lib/binary.ts @@ -332,7 +332,7 @@ export type ResolveUpgradeSourceOptions = { /** Fetch implementation used for the probe. Defaults to the CLI CA-aware fetch. */ readonly fetch?: typeof fetch; /** Optional cancellation signal shared by every source probe. */ - readonly signal?: AbortSignal; + readonly signal?: AbortSignal | undefined; /** Ordered sources to probe. Defaults to all configured upgrade sources. */ readonly sources?: readonly UpgradeSource[]; }; @@ -344,7 +344,7 @@ async function fetchUpgradeProbe( try { return await (options.fetch ?? customFetch)(options.getProbeUrl(source), { headers: getGitHubHeaders(), - signal: options.signal, + ...(options.signal && { signal: options.signal }), }); } catch (error) { if (options.signal?.aborted) { @@ -472,15 +472,15 @@ export function determineInstallDir( homeDir: string, env: NodeJS.ProcessEnv, ): string { - const pathDirs = (env.PATH ?? "").split(delimiter); + const pathDirs = (env["PATH"] ?? "").split(delimiter); // 1. Explicit override via environment variable - if (env.SENTRY_INSTALL_DIR) { - return env.SENTRY_INSTALL_DIR; + if (env["SENTRY_INSTALL_DIR"]) { + return env["SENTRY_INSTALL_DIR"]; } // 2. XDG_BIN_HOME override — honored only when absolute, per the XDG spec - const xdgBinHome = env.XDG_BIN_HOME; + const xdgBinHome = env["XDG_BIN_HOME"]; if (xdgBinHome && isAbsolute(xdgBinHome)) { return xdgBinHome; } diff --git a/packages/cli/src/lib/build/index.ts b/packages/cli/src/lib/build/index.ts index 3671324bb9..4fca4a996d 100644 --- a/packages/cli/src/lib/build/index.ts +++ b/packages/cli/src/lib/build/index.ts @@ -221,7 +221,7 @@ export function parsePluginFromPipeline( /** Build the `.sentry-cli-metadata.txt` contents. */ function buildMetadataFile(plugin: PipelinePlugin | null): string { const version = - process.env.SENTRY_CLI_INTEGRATION_TEST_VERSION_OVERRIDE ?? CLI_VERSION; + process.env["SENTRY_CLI_INTEGRATION_TEST_VERSION_OVERRIDE"] ?? CLI_VERSION; let out = `sentry-cli-version: ${version}\n`; if (plugin) { out += `${plugin.name}: ${plugin.version}\n`; diff --git a/packages/cli/src/lib/build/vcs.ts b/packages/cli/src/lib/build/vcs.ts index fc88200fb9..7624f8361d 100644 --- a/packages/cli/src/lib/build/vcs.ts +++ b/packages/cli/src/lib/build/vcs.ts @@ -30,21 +30,21 @@ const log = logger.withTag("build.vcs"); /** Structured VCS metadata for a build upload. */ export type VcsInfo = { /** HEAD commit SHA. */ - headSha?: string; + headSha?: string | undefined; /** Base commit SHA (merge-base with the target branch). */ - baseSha?: string; + baseSha?: string | undefined; /** VCS provider name (e.g. `github`, `gitlab`). */ - vcsProvider?: string; + vcsProvider?: string | undefined; /** Head repository name (`owner/repo`). */ - headRepoName?: string; + headRepoName?: string | undefined; /** Base repository name (`owner/repo`), for forks. */ - baseRepoName?: string; + baseRepoName?: string | undefined; /** Head branch/reference. */ - headRef?: string; + headRef?: string | undefined; /** Base branch/reference. */ - baseRef?: string; + baseRef?: string | undefined; /** Pull request number. */ - prNumber?: number; + prNumber?: number | undefined; }; /** {@link VcsInfo} as the snake_case fields of build and snapshot request bodies. */ @@ -105,7 +105,7 @@ function readGithubEventSha( kind: "head" | "base", env: NodeJS.ProcessEnv, ): string | undefined { - const eventPath = env.GITHUB_EVENT_PATH; + const eventPath = env["GITHUB_EVENT_PATH"]; if (!eventPath) { return undefined; } @@ -158,26 +158,26 @@ function providerFromRemoteUrl(url: string): string | undefined { /** GitHub Actions head ref: PR source branch, else the pushed branch/tag name. */ function githubHeadRef(env: NodeJS.ProcessEnv): string | undefined { - if (env.GITHUB_EVENT_NAME === "pull_request") { - return env.GITHUB_HEAD_REF || undefined; + if (env["GITHUB_EVENT_NAME"] === "pull_request") { + return env["GITHUB_HEAD_REF"] || undefined; } - return env.GITHUB_REF_NAME || undefined; + return env["GITHUB_REF_NAME"] || undefined; } /** GitHub Actions base ref: PR target branch (pull_request events only). */ function githubBaseRef(env: NodeJS.ProcessEnv): string | undefined { - if (env.GITHUB_EVENT_NAME !== "pull_request") { + if (env["GITHUB_EVENT_NAME"] !== "pull_request") { return undefined; } - return env.GITHUB_BASE_REF || undefined; + return env["GITHUB_BASE_REF"] || undefined; } /** GitHub Actions PR number, parsed from GITHUB_REF (`refs/pull/N/merge`). */ function githubPrNumber(env: NodeJS.ProcessEnv): number | undefined { - if (env.GITHUB_EVENT_NAME !== "pull_request") { + if (env["GITHUB_EVENT_NAME"] !== "pull_request") { return undefined; } - const raw = env.GITHUB_REF?.match(/^refs\/pull\/(\d+)\//)?.[1]; + const raw = env["GITHUB_REF"]?.match(/^refs\/pull\/(\d+)\//)?.[1]; if (!raw) { return undefined; } diff --git a/packages/cli/src/lib/bytes.ts b/packages/cli/src/lib/bytes.ts new file mode 100644 index 0000000000..7a1c4120fa --- /dev/null +++ b/packages/cli/src/lib/bytes.ts @@ -0,0 +1,25 @@ +/** + * Byte Buffer Utilities + * + * `Uint8Array` defaults to `Uint8Array`, which may view a + * `SharedArrayBuffer`. lib DOM's `BlobPart` and `BodyInit` accept only views + * over a plain `ArrayBuffer`. Dependencies such as `@sentry/core` and + * `@sentry/symbolic` return plain-buffer bytes but declare the default type. + */ + +/** + * Return `bytes` typed as a view over a plain `ArrayBuffer`, copying only + * when it views shared memory. + * + * @param bytes - Bytes from an API that declares `Uint8Array` + * @returns `bytes` itself, or a copy over a new `ArrayBuffer` + */ +export function toArrayBufferBytes(bytes: Uint8Array): Uint8Array { + return isArrayBufferBacked(bytes) ? bytes : new Uint8Array(bytes); +} + +function isArrayBufferBacked( + bytes: Uint8Array, +): bytes is Uint8Array { + return bytes.buffer instanceof ArrayBuffer; +} diff --git a/packages/cli/src/lib/chunk-loader.ts b/packages/cli/src/lib/chunk-loader.ts index 0af301339e..011b599371 100644 --- a/packages/cli/src/lib/chunk-loader.ts +++ b/packages/cli/src/lib/chunk-loader.ts @@ -112,7 +112,7 @@ export function canLoadChunks( ): boolean { const vmConstants = constants as Partial | undefined; return ( - versions.bun === undefined && + versions["bun"] === undefined && Number.parseInt(versions.node, 10) >= MIN_NODE_MAJOR && vmConstants?.USE_MAIN_CONTEXT_DEFAULT_LOADER !== undefined ); @@ -147,7 +147,7 @@ function suppressLoaderWarning(): void { * command. */ export function reportCodeCacheError(message: string, error: unknown): void { - const level = process.env.SENTRY_LOG_LEVEL; + const level = process.env["SENTRY_LOG_LEVEL"]; if (level === "debug" || level === "trace") { process.stderr.write(`[code-cache] ${message}: ${String(error)}\n`); } diff --git a/packages/cli/src/lib/ci.ts b/packages/cli/src/lib/ci.ts index 54b9f4f07c..d49f4481be 100644 --- a/packages/cli/src/lib/ci.ts +++ b/packages/cli/src/lib/ci.ts @@ -66,18 +66,18 @@ const CI_CHECKOUT_PROVIDERS: ReadonlyArray<{ }> = [ { source: "GITHUB_REPOSITORY/GITHUB_SHA", - repository: (env) => env.GITHUB_REPOSITORY, - commit: (env) => env.GITHUB_SHA, + repository: (env) => env["GITHUB_REPOSITORY"], + commit: (env) => env["GITHUB_SHA"], }, { source: "CI_PROJECT_PATH/CI_COMMIT_SHA", - repository: (env) => env.CI_PROJECT_PATH, - commit: (env) => env.CI_COMMIT_SHA, + repository: (env) => env["CI_PROJECT_PATH"], + commit: (env) => env["CI_COMMIT_SHA"], }, { source: "BITBUCKET_REPO_FULL_NAME/BITBUCKET_COMMIT", - repository: (env) => env.BITBUCKET_REPO_FULL_NAME, - commit: (env) => env.BITBUCKET_COMMIT, + repository: (env) => env["BITBUCKET_REPO_FULL_NAME"], + commit: (env) => env["BITBUCKET_COMMIT"], }, { // Production builds only, like @sentry/bundler-plugins: preview builds @@ -85,44 +85,44 @@ const CI_CHECKOUT_PROVIDERS: ReadonlyArray<{ // notifies the authors of unrelated pull requests. source: "VERCEL_GIT_REPO_OWNER/VERCEL_GIT_REPO_SLUG/VERCEL_GIT_COMMIT_SHA", repository: (env) => - env.VERCEL_TARGET_ENV === "production" - ? joinRepo(env.VERCEL_GIT_REPO_OWNER, env.VERCEL_GIT_REPO_SLUG) + env["VERCEL_TARGET_ENV"] === "production" + ? joinRepo(env["VERCEL_GIT_REPO_OWNER"], env["VERCEL_GIT_REPO_SLUG"]) : undefined, - commit: (env) => env.VERCEL_GIT_COMMIT_SHA, + commit: (env) => env["VERCEL_GIT_COMMIT_SHA"], }, { source: "RENDER_GIT_REPO_SLUG/RENDER_GIT_COMMIT", - repository: (env) => env.RENDER_GIT_REPO_SLUG, - commit: (env) => env.RENDER_GIT_COMMIT, + repository: (env) => env["RENDER_GIT_REPO_SLUG"], + commit: (env) => env["RENDER_GIT_COMMIT"], }, { source: "RAILWAY_GIT_REPO_OWNER/RAILWAY_GIT_REPO_NAME/RAILWAY_GIT_COMMIT_SHA", repository: (env) => - joinRepo(env.RAILWAY_GIT_REPO_OWNER, env.RAILWAY_GIT_REPO_NAME), - commit: (env) => env.RAILWAY_GIT_COMMIT_SHA, + joinRepo(env["RAILWAY_GIT_REPO_OWNER"], env["RAILWAY_GIT_REPO_NAME"]), + commit: (env) => env["RAILWAY_GIT_COMMIT_SHA"], }, { source: "CIRCLE_PROJECT_USERNAME/CIRCLE_PROJECT_REPONAME/CIRCLE_SHA1", repository: (env) => - joinRepo(env.CIRCLE_PROJECT_USERNAME, env.CIRCLE_PROJECT_REPONAME), - commit: (env) => env.CIRCLE_SHA1, + joinRepo(env["CIRCLE_PROJECT_USERNAME"], env["CIRCLE_PROJECT_REPONAME"]), + commit: (env) => env["CIRCLE_SHA1"], }, { source: "BUILDKITE_REPO/BUILDKITE_COMMIT", - repository: (env) => repoFromUrl(env.BUILDKITE_REPO), - commit: (env) => env.BUILDKITE_COMMIT, + repository: (env) => repoFromUrl(env["BUILDKITE_REPO"]), + commit: (env) => env["BUILDKITE_COMMIT"], }, { source: "REPOSITORY_URL/COMMIT_REF (Netlify)", repository: (env) => - env.NETLIFY ? repoFromUrl(env.REPOSITORY_URL) : undefined, - commit: (env) => env.COMMIT_REF, + env["NETLIFY"] ? repoFromUrl(env["REPOSITORY_URL"]) : undefined, + commit: (env) => env["COMMIT_REF"], }, { source: "BUILD_REPOSITORY_URI/BUILD_SOURCEVERSION (Azure Pipelines)", - repository: (env) => repoFromUrl(env.BUILD_REPOSITORY_URI), - commit: (env) => env.BUILD_SOURCEVERSION, + repository: (env) => repoFromUrl(env["BUILD_REPOSITORY_URI"]), + commit: (env) => env["BUILD_SOURCEVERSION"], }, ]; diff --git a/packages/cli/src/lib/clipboard.ts b/packages/cli/src/lib/clipboard.ts index b7ef9afda8..36a3031301 100644 --- a/packages/cli/src/lib/clipboard.ts +++ b/packages/cli/src/lib/clipboard.ts @@ -98,15 +98,18 @@ export function setupCopyKeyListener( let active = true; - const onData = async (data: Buffer) => { + const copyText = async () => { + const copied = await copyToClipboard(getText()); + if (copied && active) { + log.success("Copied!"); + } + }; + + const onData = (data: Buffer) => { const key = data.toString(); if (key === "c" || key === "C") { - const text = getText(); - const copied = await copyToClipboard(text); - if (copied && active) { - log.success("Copied!"); - } + void copyText(); } if (key === CTRL_C) { diff --git a/packages/cli/src/lib/command.ts b/packages/cli/src/lib/command.ts index f86672b233..0023ac43ba 100644 --- a/packages/cli/src/lib/command.ts +++ b/packages/cli/src/lib/command.ts @@ -186,7 +186,7 @@ type LocalCommandBuilderArguments< * }) * ``` */ - readonly output?: OutputConfig; + readonly output?: OutputConfig | undefined; /** * Whether the command requires authentication. Defaults to `true`. * @@ -378,11 +378,11 @@ export function applyOrgProjectFlags( const projectTrimmed = commandOwnsProject ? undefined : project?.trim(); if (orgTrimmed) { orgProjectLog.debug(`--org flag → SENTRY_ORG=${orgTrimmed}`); - env.SENTRY_ORG = orgTrimmed; + env["SENTRY_ORG"] = orgTrimmed; } if (projectTrimmed) { orgProjectLog.debug(`--project flag → SENTRY_PROJECT=${projectTrimmed}`); - env.SENTRY_PROJECT = projectTrimmed; + env["SENTRY_PROJECT"] = projectTrimmed; } } @@ -538,9 +538,9 @@ function mergeGlobalFlags( // Inject --json and --fields when output config is set if (outputConfig) { if (!commandOwnsJson) { - mergedFlags.json = JSON_FLAG; + mergedFlags["json"] = JSON_FLAG; } - mergedFlags.fields = buildFieldsFlag(outputConfig); + mergedFlags["fields"] = buildFieldsFlag(outputConfig); } return { @@ -579,7 +579,10 @@ export function buildCommand< // Merge global flags into the command's flag definitions. const existingParams = builderArgs.parameters ?? {}; - const existingFlags = (existingParams.flags ?? {}) as Record; + const existingFlags = (existingParams["flags"] ?? {}) as Record< + string, + unknown + >; const { mergedFlags, commandOwnsOrg, commandOwnsProject, stripKeys } = mergeGlobalFlags(existingFlags, outputConfig); @@ -592,7 +595,7 @@ export function buildCommand< // Inject short aliases for global flags (e.g., -v → --verbose). // Derived from the shared GLOBAL_FLAGS definition so adding a new // global flag with a short alias automatically propagates here. - const existingAliases = (existingParams.aliases ?? {}) as Record< + const existingAliases = (existingParams["aliases"] ?? {}) as Record< string, unknown >; @@ -625,7 +628,7 @@ export function buildCommand< ): void { // ClearScreen token: defer until next render to avoid flash if (value instanceof ClearScreen) { - if (!(isPlainOutput() || flags.json)) { + if (!(isPlainOutput() || flags["json"])) { pendingClear = true; } return; @@ -636,8 +639,8 @@ export function buildCommand< } renderCommandOutput(stdout, value.data, outputConfig, renderer, { - json: Boolean(flags.json), - fields: flags.fields as string[] | undefined, + json: Boolean(flags["json"]), + fields: flags["fields"] as string[] | undefined, clearPrefix: pendingClear ? "\x1b[H\x1b[J" : undefined, }); pendingClear = false; @@ -659,8 +662,8 @@ export function buildCommand< } clean[key] = value; } - if (outputConfig && typeof clean.fields === "string") { - clean.fields = parseFieldsList(clean.fields); + if (outputConfig && typeof clean["fields"] === "string") { + clean["fields"] = parseFieldsList(clean["fields"]); } return clean; } @@ -765,7 +768,7 @@ export function buildCommand< try { args = applyBoundPositionals( positionalArgs, - existingParams.positional, + existingParams["positional"], this, ); } catch (error) { @@ -784,14 +787,14 @@ export function buildCommand< applyLoggingFlags( flags[LOG_LEVEL_KEY] as LogLevelName | undefined, - flags.verbose as boolean, + flags["verbose"] as boolean, ); // Map --org / --project compat flags to env vars before anything // else reads them (auth guard, org/project resolution, etc.) applyOrgProjectFlags( - flags.org as string | undefined, - flags.project as string | undefined, + flags["org"] as string | undefined, + flags["project"] as string | undefined, commandOwnsOrg, commandOwnsProject, ); @@ -803,10 +806,10 @@ export function buildCommand< } // Environment-based JSON mode (used by library entry point) - if (outputConfig && !cleanFlags.json) { + if (outputConfig && !cleanFlags["json"]) { const env = (this as unknown as { env?: NodeJS.ProcessEnv }).env; - if (env?.SENTRY_OUTPUT_FORMAT === "json") { - cleanFlags.json = true; + if (env?.["SENTRY_OUTPUT_FORMAT"] === "json") { + cleanFlags["json"] = true; } } @@ -815,8 +818,8 @@ export function buildCommand< // such as list command `-n` (limit) with `sentry api`'s `-n` (dry-run). setInteractivePromptsAllowed( !( - cleanFlags.json === true || - cleanFlags.yes === true || + cleanFlags["json"] === true || + cleanFlags["yes"] === true || cleanFlags["dry-run"] === true ), ); @@ -916,13 +919,13 @@ export function buildCommand< ? appendCacheHint(applyTipsPreference(returned.hint)) : undefined; await withTracing("render", "cli.command.render", () => { - writeFinalization(stdout, finalHint, cleanFlags.json, renderer); + writeFinalization(stdout, finalHint, cleanFlags["json"], renderer); }); } catch (err) { // Finalize before error handling to close streaming state // (e.g., table footer). No hint since the generator didn't // complete. Only in human mode — JSON must not be corrupted. - if (!cleanFlags.json) { + if (!cleanFlags["json"]) { writeFinalization(stdout, undefined, false, renderer); } @@ -962,29 +965,32 @@ export function buildCommand< // built command. Preserve its primary line for introspection consumers. const primaryUsage = enrichedDocs.customUsage?.[0]; if (primaryUsage) { - (cmd as unknown as Record).__primaryUsage = + (cmd as unknown as Record)["__primaryUsage"] = typeof primaryUsage === "string" ? primaryUsage : primaryUsage.input; } if (builderArgs.docs.examples?.length) { - (cmd as unknown as Record).__examples = + (cmd as unknown as Record)["__examples"] = builderArgs.docs.examples; } if (builderArgs.destructive) { - (cmd as unknown as Record).__destructive = true; + (cmd as unknown as Record)["__destructive"] = true; } // Attach the JSON fields to the built command as a non-standard property. // introspect.ts reads this to populate CommandInfo.jsonFields for help // output and SKILL.md generation. if (outputConfig?.schema) { - (cmd as unknown as Record).__jsonFields = + (cmd as unknown as Record)["__jsonFields"] = outputConfig.schema.fields; } // Expose the unwrapped generator for internal dispatchers (e.g. bare // `sentry auth`) that must run a subcommand without re-entering the // telemetry / auth-guard / rc-trust / output pipeline. - (cmd as unknown as Record).__rawFunc = originalFunc; + // Expose the unwrapped generator for internal dispatchers (e.g. bare + // `sentry auth`) that must run a subcommand without re-entering the + // telemetry / auth-guard / rc-trust / output pipeline. + (cmd as unknown as Record)["__rawFunc"] = originalFunc; return cmd; } diff --git a/packages/cli/src/lib/complete.ts b/packages/cli/src/lib/complete.ts index 4e6d149ec4..0b0e16fc84 100644 --- a/packages/cli/src/lib/complete.ts +++ b/packages/cli/src/lib/complete.ts @@ -68,7 +68,7 @@ function getCompletionOrganizations() { */ type Completion = { value: string; - description?: string; + description?: string | undefined; }; /** @@ -83,7 +83,8 @@ type Completion = { */ export async function runCompletion(args: string[]): Promise { // Keeps the database modules from requiring telemetry and `@sentry/node` - getEnv().SENTRY_CLI_NO_TELEMETRY = "1"; + // Keeps the database modules from requiring telemetry and `@sentry/node` + getEnv()["SENTRY_CLI_NO_TELEMETRY"] = "1"; // A read-only cli.db must not print a warning on every TAB press silenceReadonlyHandling(); await handleComplete(args); @@ -160,9 +161,9 @@ type CompleterContext = { */ flagValues: Readonly>; /** The values a `choice` or `choice-list` argument offers. */ - choices?: readonly string[]; + choices?: readonly string[] | undefined; /** The fields and aggregates a field or aggregate flag completes. */ - datasets?: DatasetCompletion; + datasets?: DatasetCompletion | undefined; }; /** What the word being completed is, and the positionals typed before it. */ diff --git a/packages/cli/src/lib/config-dir.ts b/packages/cli/src/lib/config-dir.ts index d042026a26..a874626431 100644 --- a/packages/cli/src/lib/config-dir.ts +++ b/packages/cli/src/lib/config-dir.ts @@ -71,7 +71,7 @@ export function resolveXdgConfigDir( return override; } - const xdgConfigHome = env.XDG_CONFIG_HOME; + const xdgConfigHome = env["XDG_CONFIG_HOME"]; const configHome = xdgConfigHome && isAbsolute(xdgConfigHome) ? xdgConfigHome diff --git a/packages/cli/src/lib/constants.ts b/packages/cli/src/lib/constants.ts index 3ff7306b3a..5efda9b0c9 100644 --- a/packages/cli/src/lib/constants.ts +++ b/packages/cli/src/lib/constants.ts @@ -63,7 +63,7 @@ export function normalizeUrl(url: string | undefined): string | undefined { */ export function getConfiguredSentryUrl(): string | undefined { const env = getEnv(); - const raw = env.SENTRY_HOST?.trim() || env.SENTRY_URL?.trim(); + const raw = env["SENTRY_HOST"]?.trim() || env["SENTRY_URL"]?.trim(); if (!raw) { return; } @@ -118,8 +118,8 @@ export function isPersistedDefaultUrlInEffect(): boolean { const applied = persistedDefaultUrls.get(env); return ( applied !== undefined && - !env.SENTRY_HOST?.trim() && - env.SENTRY_URL?.trim() === applied + !env["SENTRY_HOST"]?.trim() && + env["SENTRY_URL"]?.trim() === applied ); } @@ -158,8 +158,8 @@ export function getCliEnvironment(version: string = CLI_VERSION): string { */ export function getUserAgent(): string { const runtime = - typeof process.versions.bun !== "undefined" - ? `bun/${process.versions.bun}` + typeof process.versions["bun"] !== "undefined" + ? `bun/${process.versions["bun"]}` : `node/${process.versions.node}`; return `sentry-cli/${CLI_VERSION} (${process.platform}-${process.arch}) ${runtime}`; } diff --git a/packages/cli/src/lib/custom-ca.ts b/packages/cli/src/lib/custom-ca.ts index ae4d38a9a0..45b8a03696 100644 --- a/packages/cli/src/lib/custom-ca.ts +++ b/packages/cli/src/lib/custom-ca.ts @@ -141,7 +141,7 @@ function resolve(): void { const sources: { path: string; source: CaSource; label: string }[] = [ { path: storedPath, source: "default", label: "stored default" }, { - path: env.NODE_EXTRA_CA_CERTS?.trim() ?? "", + path: env["NODE_EXTRA_CA_CERTS"]?.trim() ?? "", source: "env", label: "NODE_EXTRA_CA_CERTS", }, diff --git a/packages/cli/src/lib/custom-headers.ts b/packages/cli/src/lib/custom-headers.ts index a3ca68a84b..caeabdd901 100644 --- a/packages/cli/src/lib/custom-headers.ts +++ b/packages/cli/src/lib/custom-headers.ts @@ -263,7 +263,7 @@ function isSelfHosted(): boolean { * Returns undefined when no headers are configured. */ function resolveRawHeaders(): string | undefined { - const envValue = getEnv().SENTRY_CUSTOM_HEADERS; + const envValue = getEnv()["SENTRY_CUSTOM_HEADERS"]; if (envValue?.trim()) { return envValue.trim(); } diff --git a/packages/cli/src/lib/dashboard-arguments.ts b/packages/cli/src/lib/dashboard-arguments.ts index 2fcd43363a..8050efebf8 100644 --- a/packages/cli/src/lib/dashboard-arguments.ts +++ b/packages/cli/src/lib/dashboard-arguments.ts @@ -27,9 +27,9 @@ export type DashboardArgs = { /** The numeric ID or title, as typed */ readonly dashboardRef: string; /** The org/project target; `undefined` to auto-detect */ - readonly targetArg?: string; + readonly targetArg?: string | undefined; /** Server of a pasted Sentry URL, for `applySentryUrlContext` */ - readonly baseUrl?: string; + readonly baseUrl?: string | undefined; /** Warnings to log, such as for an ID taken from a URL */ readonly warnings: readonly string[]; /** diff --git a/packages/cli/src/lib/db/account-scope.ts b/packages/cli/src/lib/db/account-scope.ts index 237dccc91d..14a53d62e9 100644 --- a/packages/cli/src/lib/db/account-scope.ts +++ b/packages/cli/src/lib/db/account-scope.ts @@ -32,13 +32,13 @@ import { getEnv } from "../env.js"; type AccountScope = { /** Default account for the rest of this invocation, chosen from its target. */ - accountId?: string; + accountId?: string | undefined; /** * The env token (`SENTRY_AUTH_TOKEN`/`SENTRY_TOKEN`) was chosen for the * rest of this invocation instead of a stored account, because it knows * the targeted organization. Exclusive with `accountId`. */ - envToken?: boolean; + envToken?: boolean | undefined; }; /** One scope per invocation env; see the module comment for why. */ diff --git a/packages/cli/src/lib/db/accounts.ts b/packages/cli/src/lib/db/accounts.ts index a786b430b7..3b3c049f62 100644 --- a/packages/cli/src/lib/db/accounts.ts +++ b/packages/cli/src/lib/db/accounts.ts @@ -57,9 +57,9 @@ export function toEnvAccountSummary( host: string, user?: { id?: string; - email?: string | null; - username?: string | null; - name?: string | null; + email?: string | null | undefined; + username?: string | null | undefined; + name?: string | null | undefined; }, ): AccountSummary { return { @@ -312,7 +312,7 @@ export function accountSelectorOf(account: AccountSummary): string { * assumes HTTPS for a bare host. `undefined` when no host is recorded. */ export function accountServerOf(account: { - readonly host?: string; + readonly host?: string | undefined; }): string | undefined { const host = account.host; const origin = normalizeHttpOrigin(host); @@ -412,7 +412,7 @@ function matchesIdentity(account: AccountSummary, needle: string): boolean { * or both SaaS (`*.sentry.io`). `false` for an account without a host. */ export function isAccountOnServer( - account: { readonly host?: string | null }, + account: { readonly host?: string | null | undefined }, url: string, ): boolean { return account.host ? isSameServer(account.host, url) : false; diff --git a/packages/cli/src/lib/db/auth.ts b/packages/cli/src/lib/db/auth.ts index 3b1b71c49e..d4f53fe5a1 100644 --- a/packages/cli/src/lib/db/auth.ts +++ b/packages/cli/src/lib/db/auth.ts @@ -271,9 +271,9 @@ export type AuthSource = "env:SENTRY_AUTH_TOKEN" | "env:SENTRY_TOKEN" | "oauth"; export type AuthConfig = { token?: string; - refreshToken?: string; - expiresAt?: number; - issuedAt?: number; + refreshToken?: string | undefined; + expiresAt?: number | undefined; + issuedAt?: number | undefined; source: AuthSource; }; @@ -297,14 +297,14 @@ export function getRawEnvToken(): string | undefined { function getEnvToken(): { token: string; source: AuthSource } | undefined { // Preserve presence rules: whitespace is unset, but control-only credentials // must remain selected so validation cannot silently fall back to another identity. - const authToken = getEnv().SENTRY_AUTH_TOKEN?.trim(); + const authToken = getEnv()["SENTRY_AUTH_TOKEN"]?.trim(); if (authToken) { return { token: trimAuthToken(authToken) || authToken, source: "env:SENTRY_AUTH_TOKEN", }; } - const sentryToken = getEnv().SENTRY_TOKEN?.trim(); + const sentryToken = getEnv()["SENTRY_TOKEN"]?.trim(); if (sentryToken) { return { token: trimAuthToken(sentryToken) || sentryToken, @@ -339,7 +339,7 @@ export function getActiveEnvVarName(): string { * `true`, `yes`, `on`, ...). Negative or unrecognized values leave it off. */ export function isForceEnvTokenSet(): boolean { - return parseBoolValue(getEnv().SENTRY_FORCE_ENV_TOKEN ?? "") === true; + return parseBoolValue(getEnv()["SENTRY_FORCE_ENV_TOKEN"] ?? "") === true; } /** Whether `SENTRY_FORCE_ENV_TOKEN` makes a set env token the only credential. */ @@ -667,8 +667,8 @@ export function resetAccountSelection(): void { */ export type SetAuthTokenOptions = { host?: string; - newAccount?: boolean; - accountId?: string; + newAccount?: boolean | undefined; + accountId?: string | undefined; }; /** Drop all memoized active-credential state after an account mutation. */ @@ -982,7 +982,7 @@ function followDefaultAccountHost(host: string): void { if (isSameServer(getConfiguredUrlOrUndefined() ?? DEFAULT_SENTRY_URL, host)) { return; } - getEnv().SENTRY_URL = host; + getEnv()["SENTRY_URL"] = host; markPersistedDefaultUrl(host); } @@ -1182,14 +1182,14 @@ export function withStoredAccount( fn: () => Promise, ): Promise { const env: NodeJS.ProcessEnv = { ...getEnv() }; - delete env.SENTRY_HOST; - env.SENTRY_URL = account.host; + delete env["SENTRY_HOST"]; + env["SENTRY_URL"] = account.host; // Only the account's own credentials: an env token (forced or as a // fallback when the stored one is unusable) must never be sent to the // account's server. - delete env.SENTRY_AUTH_TOKEN; - delete env.SENTRY_TOKEN; - delete env.SENTRY_FORCE_ENV_TOKEN; + delete env["SENTRY_AUTH_TOKEN"]; + delete env["SENTRY_TOKEN"]; + delete env["SENTRY_FORCE_ENV_TOKEN"]; return withEnv(env, () => { getAccountScope().accountId = account.id; return fn(); @@ -1211,9 +1211,9 @@ export function withEnvAccount( fn: () => Promise, ): Promise { const env: NodeJS.ProcessEnv = { ...getEnv() }; - delete env.SENTRY_HOST; - env.SENTRY_URL = account.host; - env.SENTRY_FORCE_ENV_TOKEN = "1"; + delete env["SENTRY_HOST"]; + env["SENTRY_URL"] = account.host; + env["SENTRY_FORCE_ENV_TOKEN"] = "1"; return withEnv(env, fn); } @@ -1462,7 +1462,7 @@ export function hasStoredAuthCredentials(): boolean { export type RefreshTokenOptions = { /** Bypass threshold check and always refresh */ - force?: boolean; + force?: boolean | undefined; expectedCredential?: Pick; }; diff --git a/packages/cli/src/lib/db/completion-cache.ts b/packages/cli/src/lib/db/completion-cache.ts index 4f73e7105c..3cd00d3cb2 100644 --- a/packages/cli/src/lib/db/completion-cache.ts +++ b/packages/cli/src/lib/db/completion-cache.ts @@ -69,7 +69,7 @@ export type CompletionEntity = { /** Text the shell inserts (e.g. `CLI-1A2` or a dashboard ID). */ value: string; /** Description shown next to the value (e.g. the issue title). */ - label?: string; + label?: string | undefined; }; /** A remembered entity together with the org it belongs to. */ diff --git a/packages/cli/src/lib/db/index.ts b/packages/cli/src/lib/db/index.ts index be4be36b70..73513096ad 100644 --- a/packages/cli/src/lib/db/index.ts +++ b/packages/cli/src/lib/db/index.ts @@ -275,7 +275,7 @@ function lazyTelemetry(): typeof import("../telemetry.js") | undefined { if ( (typeof SENTRY_CLI_COMPLETION_BUILD !== "undefined" && SENTRY_CLI_COMPLETION_BUILD) || - getEnv().SENTRY_CLI_NO_TELEMETRY === "1" + getEnv()["SENTRY_CLI_NO_TELEMETRY"] === "1" ) { return; } @@ -331,6 +331,9 @@ export function getRawDatabase(): Database { getDatabase(); } if (openError !== undefined) { + // Inline rather than rethrow(): this module is on the shell-completion + // fast path, which has a module budget (test/script/cli-startup.test.ts). + // oxlint-disable-next-line typescript/only-throw-error -- rethrows the recorded open error unchanged throw openError; } // After getDatabase() call, rawDb is guaranteed to be set diff --git a/packages/cli/src/lib/db/pagination.ts b/packages/cli/src/lib/db/pagination.ts index 871d5ec57f..36a22202a3 100644 --- a/packages/cli/src/lib/db/pagination.ts +++ b/packages/cli/src/lib/db/pagination.ts @@ -499,7 +499,12 @@ export function decodeTargetCursors( */ export function buildMultiTargetContextKey( targets: ResolvedTarget[], - filters?: { sort?: string; query?: string; period?: string; limit?: number }, + filters?: { + sort?: string | undefined; + query?: string | undefined; + period?: string | undefined; + limit?: number | undefined; + }, ): string { const host = getApiBaseUrl(); const targetFingerprint = targets diff --git a/packages/cli/src/lib/db/regions.ts b/packages/cli/src/lib/db/regions.ts index 854038f632..b6f902e033 100644 --- a/packages/cli/src/lib/db/regions.ts +++ b/packages/cli/src/lib/db/regions.ts @@ -397,13 +397,13 @@ export function setOrgRegions(entries: OrgRegionEntry[]): void { updated_at: now, }; if (entry.orgId) { - row.org_id = entry.orgId; + row["org_id"] = entry.orgId; } if (entry.orgName) { - row.org_name = entry.orgName; + row["org_name"] = entry.orgName; } if (entry.orgRole) { - row.org_role = entry.orgRole; + row["org_role"] = entry.orgRole; } runUpsert(db, TABLE, row, [ "credential_identity", diff --git a/packages/cli/src/lib/db/schema.ts b/packages/cli/src/lib/db/schema.ts index 8bcdc41e86..a290659be0 100644 --- a/packages/cli/src/lib/db/schema.ts +++ b/packages/cli/src/lib/db/schema.ts @@ -899,7 +899,7 @@ function backfillOrgRegionAccounts(db: Database): void { } function migrateSingleAuthToAccounts(db: Database): void { - db.exec(EXPECTED_TABLES.accounts as string); + db.exec(EXPECTED_TABLES["accounts"] as string); const auth = tableExists(db, "auth") ? (db @@ -1040,8 +1040,8 @@ export function runMigrations(db: Database): void { // `user_info` table this step also created was folded into `accounts` in v18. if (currentVersion < 2) { db.exec(` - ${EXPECTED_TABLES.org_regions}; - ${EXPECTED_TABLES.instance_info}; + ${EXPECTED_TABLES["org_regions"]}; + ${EXPECTED_TABLES["instance_info"]}; `); } @@ -1059,12 +1059,12 @@ export function runMigrations(db: Database): void { addColumnIfMissing(db, "dsn_cache", "root_dir_mtime", "INTEGER"); addColumnIfMissing(db, "dsn_cache", "ttl_expires_at", "INTEGER"); - db.exec(EXPECTED_TABLES.project_root_cache as string); + db.exec(EXPECTED_TABLES["project_root_cache"] as string); } // Migration 4 -> 5: Add pagination_cursors table for --cursor last support if (currentVersion < 5) { - db.exec(EXPECTED_TABLES.pagination_cursors as string); + db.exec(EXPECTED_TABLES["pagination_cursors"] as string); } // Migration 5 -> 6: Repair pagination_cursors if created with wrong PK (CLI-72) @@ -1077,7 +1077,7 @@ export function runMigrations(db: Database): void { !hasPrimaryKey(db, "pagination_cursors", ["command_key", "context"]) ) { db.exec("DROP TABLE pagination_cursors"); - db.exec(EXPECTED_TABLES.pagination_cursors as string); + db.exec(EXPECTED_TABLES["pagination_cursors"] as string); } // Migration 6 -> 7: Add project_id column to project_cache for numeric project filtering @@ -1102,7 +1102,7 @@ export function runMigrations(db: Database): void { // Migration 10 -> 11: Add completion_telemetry_queue table if (currentVersion < 11) { - db.exec(EXPECTED_TABLES.completion_telemetry_queue as string); + db.exec(EXPECTED_TABLES["completion_telemetry_queue"] as string); } // Migration 11 -> 12: Replace pagination_cursors with cursor-stack schema. @@ -1113,7 +1113,7 @@ export function runMigrations(db: Database): void { if (tableExists(db, "pagination_cursors")) { db.exec("DROP TABLE pagination_cursors"); } - db.exec(EXPECTED_TABLES.pagination_cursors as string); + db.exec(EXPECTED_TABLES["pagination_cursors"] as string); } // Migration 12 -> 13: Consolidate defaults into metadata KV table. @@ -1142,14 +1142,14 @@ export function runMigrations(db: Database): void { // lookups (used by `issue resolve --in @commit` to match git origin → // Sentry-registered repo without an extra API round trip). if (currentVersion < 14) { - db.exec(EXPECTED_TABLES.repo_cache as string); + db.exec(EXPECTED_TABLES["repo_cache"] as string); } // Migration 14 -> 15: Add issue_org_cache table for numeric-id → org // mappings used by `issue view ` to skip the legacy unscoped // `/api/0/issues/{id}/` endpoint on repeat runs. if (currentVersion < 15) { - db.exec(EXPECTED_TABLES.issue_org_cache as string); + db.exec(EXPECTED_TABLES["issue_org_cache"] as string); } // Migration 15 -> 16: Add host column to auth table for host-scoped tokens. @@ -1165,7 +1165,7 @@ export function runMigrations(db: Database): void { if (currentVersion < 17) { db.transaction(() => { db.exec("DROP TABLE IF EXISTS org_regions"); - db.exec(EXPECTED_TABLES.org_regions as string); + db.exec(EXPECTED_TABLES["org_regions"] as string); })(); } @@ -1187,13 +1187,13 @@ export function runMigrations(db: Database): void { // Migration 19 -> 20: Add completion_cache for issue and dashboard shell // completion from entities seen during normal CLI usage. if (currentVersion < 20) { - db.exec(EXPECTED_TABLES.completion_cache as string); + db.exec(EXPECTED_TABLES["completion_cache"] as string); } // Migration 20 -> 21: Add telemetry_envelope_queue for telemetry envelopes // that failed to send, retried by the next run. if (currentVersion < 21) { - db.exec(EXPECTED_TABLES.telemetry_envelope_queue as string); + db.exec(EXPECTED_TABLES["telemetry_envelope_queue"] as string); } if (currentVersion < CURRENT_SCHEMA_VERSION) { diff --git a/packages/cli/src/lib/db/user.ts b/packages/cli/src/lib/db/user.ts index 22feaaa730..8ce90c8034 100644 --- a/packages/cli/src/lib/db/user.ts +++ b/packages/cli/src/lib/db/user.ts @@ -16,10 +16,10 @@ import { getDatabase, withDbSpan } from "./index.js"; export type UserInfo = { userId: string; - email?: string; - username?: string; + email?: string | undefined; + username?: string | undefined; /** Display name (different from username) */ - name?: string; + name?: string | undefined; }; /** diff --git a/packages/cli/src/lib/delta-upgrade.ts b/packages/cli/src/lib/delta-upgrade.ts index 4f53fd0000..6ac0f522f3 100644 --- a/packages/cli/src/lib/delta-upgrade.ts +++ b/packages/cli/src/lib/delta-upgrade.ts @@ -243,7 +243,7 @@ export async function fetchRecentReleases( Accept: "application/vnd.github.v3+json", "User-Agent": `sentry-cli/${CLI_VERSION}`, }, - signal, + ...(signal && { signal }), }, ); if (!response.ok) { @@ -268,7 +268,7 @@ export async function downloadStablePatch( try { const response = await customFetch(url, { headers: { "User-Agent": `sentry-cli/${CLI_VERSION}` }, - signal, + ...(signal && { signal }), }); return response.ok ? new Uint8Array(await response.arrayBuffer()) : null; } catch (error) { @@ -569,7 +569,7 @@ function resolveDelta( oldPath: oldBinaryPath, destPath, cache: getPatchCache(), - offline, + ...(offline !== undefined && { offline }), onProgress: makeProgressHandler(setMessage), telemetry: tel, }).then((result) => ({ result, source: tel._source.current })); diff --git a/packages/cli/src/lib/detect-agent.ts b/packages/cli/src/lib/detect-agent.ts index ce9c0534f2..1fa3519a90 100644 --- a/packages/cli/src/lib/detect-agent.ts +++ b/packages/cli/src/lib/detect-agent.ts @@ -270,7 +270,7 @@ export function detectAgent(): AgentInfo | undefined { // 1. Highest priority: explicit override — any agent can self-identify. // normalizeAgent returns undefined for falsy opt-outs ("false", "0"), // which should fall through to the next detection level. - const aiAgent = env.AI_AGENT?.trim(); + const aiAgent = env["AI_AGENT"]?.trim(); if (aiAgent) { const normalized = normalizeAgent(aiAgent); if (normalized) { @@ -280,7 +280,7 @@ export function detectAgent(): AgentInfo | undefined { // The role marker also exists outside agent execution; only this value // identifies an agent. Check before the map to retain Cursor's priority. - if (env.CURSOR_EXTENSION_HOST_ROLE === "agent-exec") { + if (env["CURSOR_EXTENSION_HOST_ROLE"] === "agent-exec") { return normalizeAgent("cursor" satisfies KnownAgent); } @@ -293,13 +293,15 @@ export function detectAgent(): AgentInfo | undefined { } // 3. Claude Code / Cowork — requires branching logic, so not in the map - if (env.CLAUDECODE || env.CLAUDE_CODE) { - const agent: KnownAgent = env.CLAUDE_CODE_IS_COWORK ? "cowork" : "claude"; + if (env["CLAUDECODE"] || env["CLAUDE_CODE"]) { + const agent: KnownAgent = env["CLAUDE_CODE_IS_COWORK"] + ? "cowork" + : "claude"; return normalizeAgent(agent); } // 4. Lowest priority: generic AGENT fallback - const agentValue = env.AGENT?.trim(); + const agentValue = env["AGENT"]?.trim(); if (agentValue) { return normalizeAgent(agentValue); } @@ -380,6 +382,7 @@ export async function getProcessInfoFromOS( log.debug(`Could not query ps for pid ${pid}`, error); } } + return undefined; } /** @@ -397,7 +400,7 @@ function execFileUnreffed( args, { encoding: "utf-8", ...opts }, (err, stdout) => { - if (err) { + if (err instanceof Error) { reject(err); } else { resolve(stdout); diff --git a/packages/cli/src/lib/dif/index.ts b/packages/cli/src/lib/dif/index.ts index 6a51575b58..45ae39e744 100644 --- a/packages/cli/src/lib/dif/index.ts +++ b/packages/cli/src/lib/dif/index.ts @@ -22,6 +22,7 @@ import { type ObjectFile, SourceBundleWriter, } from "@sentry/symbolic"; +import { toArrayBufferBytes } from "../bytes.js"; import { logger } from "../logger.js"; import { getSeaRawAsset } from "../sea-assets.js"; @@ -153,7 +154,7 @@ export type DifObjectFile = { /** The object's metadata. */ object: DifObjectInfo; /** The bytes of a file that holds only this object. */ - data: Uint8Array; + data: Uint8Array; }; /** @@ -169,14 +170,14 @@ export type DifObjectFile = { * @returns One entry per object, in archive order. * @throws If the buffer cannot be parsed as a known object format. */ -export function splitDebugFile(data: Uint8Array): DifObjectFile[] { +export function splitDebugFile(data: Uint8Array): DifObjectFile[] { ensureInitialized(); const archive = new Archive(data); try { const objects = archive.objects(); return objects.map((o) => ({ object: toObjectInfo(o), - data: objects.length === 1 ? data : o.data(), + data: objects.length === 1 ? data : toArrayBufferBytes(o.data()), })); } finally { archive.free(); diff --git a/packages/cli/src/lib/dif/scan.ts b/packages/cli/src/lib/dif/scan.ts index c93decd575..afc91af95e 100644 --- a/packages/cli/src/lib/dif/scan.ts +++ b/packages/cli/src/lib/dif/scan.ts @@ -72,9 +72,9 @@ export const VALID_DIF_TYPES: readonly string[] = Object.keys(TYPE_TO_FORMAT); /** Resolved filter set applied to each parsed object. */ export type DifFilters = { /** Accepted file formats (canonical names), or `undefined` for any. */ - formats?: Set; + formats?: Set | undefined; /** Accepted debug ids (normalized), or `undefined` for any. */ - ids?: Set; + ids?: Set | undefined; /** Whether a symbol table satisfies the feature requirement. */ symtab: boolean; /** Whether debug info satisfies the feature requirement. */ @@ -88,15 +88,15 @@ export type DifFilters = { /** Flag inputs used to build a {@link DifFilters}. */ export type DifFilterOptions = { /** Repeatable `--type` values (e.g. `dsym`, `elf`). */ - types?: string[]; + types?: string[] | undefined; /** Repeatable `--id` values (debug ids). */ - ids?: string[]; + ids?: string[] | undefined; /** `--no-debug`: drop both debug and symbol-table features. */ - noDebug?: boolean; + noDebug?: boolean | undefined; /** `--no-unwind`: drop unwind features. */ - noUnwind?: boolean; + noUnwind?: boolean | undefined; /** `--no-sources`: drop source features. */ - noSources?: boolean; + noSources?: boolean | undefined; }; /** A debug information file that passed filtering, ready to upload. */ @@ -108,7 +108,7 @@ export type PreparedDif = { * file holds more than one object, such as a slice of a fat Mach-O (each * object becomes its own `PreparedDif`). */ - content: Buffer; + content: Buffer; /** * Debug id of the object in `content`. This is the same id used as the * source bundle's debug id under `--include-sources`. @@ -618,7 +618,7 @@ async function prepareFileDif( */ function matchedDifs( displayPath: string, - content: Buffer, + content: Buffer, filters: DifFilters, ): PreparedDif[] { if (content.length === 0) { @@ -675,7 +675,7 @@ function matchedDifs( */ function embeddedPpdbDif( displayPath: string, - content: Buffer, + content: Buffer, filters: DifFilters, maxFileSize: number, ): { difs: PreparedDif[]; oversized: boolean } { @@ -736,7 +736,7 @@ function isDxil(bytes: Uint8Array): boolean { } /** Detect the format of an in-memory buffer from its leading header bytes. */ -function peekBufferFormat(content: Buffer): string { +function peekBufferFormat(content: Buffer): string { return detectFormat(new Uint8Array(content.subarray(0, PEEK_HEADER_BYTES))); } @@ -748,7 +748,7 @@ function peekBufferFormat(content: Buffer): string { */ function dxilDif( displayPath: string, - content: Buffer, + content: Buffer, filters: DifFilters, info?: ShaderInfo, ): PreparedDif[] { @@ -807,7 +807,7 @@ function dxilDif( */ function difFromBuffer( displayPath: string, - content: Buffer, + content: Buffer, filters: DifFilters, maxFileSize: number, shaderInfo?: ShaderInfo, @@ -843,7 +843,7 @@ async function readMatchedDif( maxFileSize: number, shaderInfo?: ShaderInfo, ): Promise<{ difs: PreparedDif[]; oversized: boolean }> { - let content: Buffer; + let content: Buffer; try { content = await readFile(path); } catch (err) { @@ -870,7 +870,7 @@ async function readMatchedDif( */ function difFromCandidateBuffer( displayPath: string, - content: Buffer, + content: Buffer, filters: DifFilters, maxFileSize: number, ): PreparedDif[] { diff --git a/packages/cli/src/lib/dif/zip.ts b/packages/cli/src/lib/dif/zip.ts index f1b59844b0..7f70bd5a2e 100644 --- a/packages/cli/src/lib/dif/zip.ts +++ b/packages/cli/src/lib/dif/zip.ts @@ -66,7 +66,7 @@ export type ZipDifEntry = { */ path: string; /** Decompressed entry bytes. */ - content: Buffer; + content: Buffer; }; /** Result of {@link readZipDifEntries}. */ diff --git a/packages/cli/src/lib/dsn/errors.ts b/packages/cli/src/lib/dsn/errors.ts index 379e64c458..9ad83c3ce8 100644 --- a/packages/cli/src/lib/dsn/errors.ts +++ b/packages/cli/src/lib/dsn/errors.ts @@ -136,7 +136,7 @@ export function formatResolutionError(error: Error, dsnRaw: string): string { type ProjectInfo = { orgDisplay: string; projectDisplay: string; - detectedFrom?: string; + detectedFrom?: string | undefined; }; /** diff --git a/packages/cli/src/lib/dsn/types.ts b/packages/cli/src/lib/dsn/types.ts index ca0dcaf82b..fd128277f7 100644 --- a/packages/cli/src/lib/dsn/types.ts +++ b/packages/cli/src/lib/dsn/types.ts @@ -29,7 +29,7 @@ export type ParsedDsn = { host: string; projectId: string; /** Extracted from oXXX.ingest... pattern in host (SaaS only) */ - orgId?: string; + orgId?: string | undefined; }; /** @@ -46,11 +46,11 @@ export type DetectedDsn = ParsedDsn & { * - For `"env_file"`, `"config"`, `"code"`: file path relative to cwd * - For `"inferred"`: undefined */ - sourcePath?: string; + sourcePath?: string | undefined; /** Package/app directory path for monorepo grouping (e.g., "packages/frontend", "apps/web") */ - packagePath?: string; + packagePath?: string | undefined; /** Cached resolution info if available */ - resolved?: ResolvedProjectInfo; + resolved?: ResolvedProjectInfo | undefined; }; /** Resolved project information from Sentry API */ @@ -79,15 +79,15 @@ export type CachedDsnEntry = { /** Project ID extracted from DSN */ projectId: string; /** Org ID extracted from DSN (SaaS only) */ - orgId?: string; + orgId?: string | undefined; /** Where the DSN was found */ source: DsnSource; /** Source identifier: env var name for `"env"`, relative file path for file-based sources */ - sourcePath?: string; + sourcePath?: string | undefined; /** Resolved project info (avoids API call on cache hit) */ resolved?: ResolvedProjectInfo; /** All resolved targets (for inferred source with multiple matches) */ - allResolved?: ResolvedProjectInfo[]; + allResolved?: ResolvedProjectInfo[] | undefined; /** Timestamp when this entry was cached */ cachedAt: number; }; diff --git a/packages/cli/src/lib/env-token-host.ts b/packages/cli/src/lib/env-token-host.ts index a255f46e71..529c060b55 100644 --- a/packages/cli/src/lib/env-token-host.ts +++ b/packages/cli/src/lib/env-token-host.ts @@ -84,7 +84,7 @@ function normalizeHost( } function captureClaimHost(token: string | undefined): { - host?: string; + host?: string | undefined; error?: ConfigError; } { if (!token?.startsWith("sntrys_")) { @@ -129,8 +129,8 @@ export function captureEnvTokenHost(): void { } const configuredHost = normalizeHost( - env.SENTRY_HOST?.trim() || env.SENTRY_URL?.trim(), - env.SENTRY_HOST?.trim() ? "SENTRY_HOST" : "SENTRY_URL", + env["SENTRY_HOST"]?.trim() || env["SENTRY_URL"]?.trim(), + env["SENTRY_HOST"]?.trim() ? "SENTRY_HOST" : "SENTRY_URL", ) ?? null; snapshotState.byEnv.set(env, snapshotEnvToken(configuredHost)); } diff --git a/packages/cli/src/lib/envelope/checkin-builder.ts b/packages/cli/src/lib/envelope/checkin-builder.ts index dc2d366e71..a3da93169a 100644 --- a/packages/cli/src/lib/envelope/checkin-builder.ts +++ b/packages/cli/src/lib/envelope/checkin-builder.ts @@ -102,7 +102,7 @@ export type BuildCheckInOptions = { /** Duration in seconds — only meaningful for `ok`/`error` (close) check-ins. */ duration?: number; /** Monitor upsert config — only attached to the opening `in_progress` check-in. */ - monitorConfig?: MonitorConfig; + monitorConfig?: MonitorConfig | undefined; }; /** diff --git a/packages/cli/src/lib/envelope/event-builder.ts b/packages/cli/src/lib/envelope/event-builder.ts index 2dc3fd39f8..3f011c52c0 100644 --- a/packages/cli/src/lib/envelope/event-builder.ts +++ b/packages/cli/src/lib/envelope/event-builder.ts @@ -11,6 +11,7 @@ import { readFile, stat } from "node:fs/promises"; import type { Breadcrumb, Event, SeverityLevel, User } from "@sentry/core"; import { uuid4 } from "@sentry/core"; import { ValidationError } from "../errors.js"; +import { omitUndefined } from "../omit-undefined.js"; /** CLI flags accepted by `sentry event send`. */ export type SendEventFlags = { @@ -195,7 +196,7 @@ export async function buildEventFromFlags( ...parseKeyValuePairs(flags.extra), }; - return { + return omitUndefined({ event_id: uuid4(), level: (flags.level ?? "error") as SeverityLevel, platform: flags.platform ?? "other", @@ -222,5 +223,5 @@ export async function buildEventFromFlags( flags["with-categories"] ?? false, ) : undefined, - }; + }); } diff --git a/packages/cli/src/lib/envelope/transport.ts b/packages/cli/src/lib/envelope/transport.ts index 21ee0184d8..fd972743cd 100644 --- a/packages/cli/src/lib/envelope/transport.ts +++ b/packages/cli/src/lib/envelope/transport.ts @@ -13,6 +13,7 @@ import { getEnvelopeEndpointWithUrlEncodedAuth, makeDsn } from "@sentry/core"; import { sentry } from "../app-identity.js"; +import { toArrayBufferBytes } from "../bytes.js"; import { detectDsn } from "../dsn/index.js"; import { ApiError, ConfigError, ValidationError } from "../errors.js"; import { logger } from "../logger.js"; @@ -60,7 +61,7 @@ export function resolveDsn(flags: DsnFlags): string | undefined { if (flags.dsn) { return flags.dsn.trim(); } - const envDsn = process.env.SENTRY_DSN; + const envDsn = process.env["SENTRY_DSN"]; if (envDsn) { return envDsn.trim(); } @@ -158,7 +159,7 @@ export async function sendEnvelopeRequest( new Request(url, { method: "POST", headers: { "Content-Type": "application/x-sentry-envelope" }, - body, + body: typeof body === "string" ? body : toArrayBufferBytes(body), }), ); @@ -166,8 +167,8 @@ export async function sendEnvelopeRequest( let detail = `HTTP ${response.status}`; try { const json = (await response.json()) as Record; - if (typeof json.detail === "string") { - detail = json.detail; + if (typeof json["detail"] === "string") { + detail = json["detail"]; } } catch (err) { log.debug("Non-JSON error body, using HTTP status message", err); diff --git a/packages/cli/src/lib/error-reporting.ts b/packages/cli/src/lib/error-reporting.ts index 4a87025d6e..7646c67ac9 100644 --- a/packages/cli/src/lib/error-reporting.ts +++ b/packages/cli/src/lib/error-reporting.ts @@ -272,19 +272,19 @@ function recordSilencedError(error: unknown, reason: SilenceReason): void { reason, }; if (error instanceof ApiError) { - attributes.api_status = error.status; + attributes["api_status"] = error.status; if (error.denialReason) { - attributes.api_denial_reason = error.denialReason; + attributes["api_denial_reason"] = error.denialReason; } } if (error instanceof AuthError) { - attributes.auth_reason = error.reason; + attributes["auth_reason"] = error.reason; } if (error instanceof SeerError) { - attributes.seer_reason = error.reason; + attributes["seer_reason"] = error.reason; } if (error instanceof ValidationError && error.field) { - attributes.validation_field = error.field; + attributes["validation_field"] = error.field; } // oxlint-disable-next-line sentry-cli/no-silent-catch -- grandfathered silent catch — see #1531; drain by adding log.debug()/log.warn() or re-throwing. diff --git a/packages/cli/src/lib/errors.ts b/packages/cli/src/lib/errors.ts index 62e4926fa8..8430a3c216 100644 --- a/packages/cli/src/lib/errors.ts +++ b/packages/cli/src/lib/errors.ts @@ -252,21 +252,21 @@ export function lookupKnownKey( */ export class ApiError extends CliError { readonly status: number; - readonly detail?: string; - readonly endpoint?: string; + readonly detail: string | undefined; + readonly endpoint: string | undefined; /** * Machine-readable `code` from the error body, when the server sent one * (e.g. `invalid_search_query`). */ - readonly code?: string; + readonly code: string | undefined; /** * Function and argument the server rejected, sent with code * `invalid_function_argument` (e.g. `p75` and `cart.total`), plus its * `hint` when the server suggests a fix. */ - readonly functionArgument?: FunctionArgument; + readonly functionArgument: FunctionArgument | undefined; /** * Set by centralized 403 enrichment in `infrastructure.ts`. @@ -276,7 +276,7 @@ export class ApiError extends CliError { readonly enriched403: boolean; /** Set with the 401/403 enrichment in `infrastructure.ts`. */ - readonly denialReason?: ApiDenialReason; + readonly denialReason: ApiDenialReason | undefined; constructor( message: string, @@ -290,9 +290,9 @@ export class ApiError extends CliError { denialReason, }: { enriched403?: boolean; - code?: string; - functionArgument?: FunctionArgument; - denialReason?: ApiDenialReason; + code?: string | undefined; + functionArgument?: FunctionArgument | undefined; + denialReason?: ApiDenialReason | undefined; } = {}, ) { super(message, EXIT.API); @@ -329,7 +329,7 @@ export class ApiError extends CliError { export class RateLimitError extends ApiError { /** Distinct exit code so scripts and agents can back off without parsing stderr. */ override readonly exitCode: number = EXIT.RATE_LIMITED; - readonly retryAfterMs?: number; + readonly retryAfterMs: number | undefined; constructor(endpoint: string, retryAfterMs?: number, serverDetail?: string) { const seconds = Math.max(1, Math.ceil((retryAfterMs ?? 0) / 1000)); @@ -410,7 +410,7 @@ export class MalformedAuthTokenError extends AuthError { * @param suggestion - Helpful hint for resolving the error */ export class ConfigError extends CliError { - readonly suggestion?: string; + readonly suggestion: string | undefined; constructor(message: string, suggestion?: string) { super(message, EXIT.CONFIG); @@ -475,7 +475,7 @@ function buildContextMessage( resource: string, command: string, alternatives: string[], - options?: { note?: string; isAutoDetect?: boolean }, + options?: { note?: string | undefined; isAutoDetect?: boolean }, ): string { const { note, isAutoDetect } = options ?? {}; // Compound resources ("X and Y") need plural grammar @@ -559,7 +559,7 @@ export class ContextError extends CliError { readonly resource: string; readonly command: string; readonly alternatives: string[]; - readonly note?: string; + readonly note: string | undefined; constructor( resource: string, @@ -764,7 +764,7 @@ export const PORT_HELD_BY_DAEMON_FIELD = "port.held_by_daemon"; * @param field - Name of the invalid field */ export class ValidationError extends CliError { - readonly field?: string; + readonly field: string | undefined; constructor(message: string, field?: string) { super(message, EXIT.VALIDATION); @@ -880,7 +880,7 @@ export type SeerErrorReason = */ export class SeerError extends CliError { readonly reason: SeerErrorReason; - readonly orgSlug?: string; + readonly orgSlug: string | undefined; constructor(reason: SeerErrorReason, orgSlug?: string) { const messages: Record = { @@ -969,7 +969,7 @@ export class SeerError extends CliError { * @param hint - Actionable suggestion (e.g., "Run the command again — the analysis may finish in the background.") */ export class TimeoutError extends CliError { - readonly hint?: string; + readonly hint: string | undefined; constructor(message: string, hint?: string) { super(message, EXIT.TIMEOUT); diff --git a/packages/cli/src/lib/formatters/alerts.ts b/packages/cli/src/lib/formatters/alerts.ts index eda07e8961..ecee154539 100644 --- a/packages/cli/src/lib/formatters/alerts.ts +++ b/packages/cli/src/lib/formatters/alerts.ts @@ -64,12 +64,12 @@ function conditionResult(value: unknown, detector: boolean): string { function conditionText(value: unknown, detector: boolean): string { const condition = asObject(value); - if (!condition || typeof condition.type !== "string") { + if (!condition || typeof condition["type"] !== "string") { return valueText(value); } - const operator = OPERATORS[condition.type] ?? condition.type; - const comparison = valueText(condition.comparison); - const result = conditionResult(condition.conditionResult, detector); + const operator = OPERATORS[condition["type"]] ?? condition["type"]; + const comparison = valueText(condition["comparison"]); + const result = conditionResult(condition["conditionResult"], detector); return `${operator} ${comparison} → ${result}`; } @@ -78,8 +78,8 @@ function conditionRows(value: unknown, detector: boolean): Row[] { if (!group) { return [["Conditions", value === null ? "none" : valueText(value)]]; } - const rows: Row[] = [["Logic", valueText(group.logicType)]]; - const conditions = group.conditions; + const rows: Row[] = [["Logic", valueText(group["logicType"])]]; + const conditions = group["conditions"]; if (Array.isArray(conditions) && conditions.length > 0) { conditions.forEach((condition, index) => { rows.push([`Condition ${index + 1}`, conditionText(condition, detector)]); @@ -98,24 +98,27 @@ function actionSection(value: unknown, index: number): string { if (!action) { return table([["Action", valueText(value)]], `Action ${index + 1}`); } - const config = asObject(action.config); + const config = asObject(action["config"]); const target = - config?.targetDisplay || - config?.targetIdentifier || - (config?.targetType === "issue_owners" ? "Issue owners" : undefined); + config?.["targetDisplay"] || + config?.["targetIdentifier"] || + (config?.["targetType"] === "issue_owners" ? "Issue owners" : undefined); const rows: Row[] = [ - ["Provider", valueText(action.type)], + ["Provider", valueText(action["type"])], ["Target", target ? valueText(target) : "not returned"], - ["Status", valueText(action.status)], + ["Status", valueText(action["status"])], ]; - if (action.integrationId !== undefined && action.integrationId !== null) { - rows.push(["Integration ID", valueText(action.integrationId)]); + if ( + action["integrationId"] !== undefined && + action["integrationId"] !== null + ) { + rows.push(["Integration ID", valueText(action["integrationId"])]); } - if (action.config !== undefined) { - rows.push(["Config", valueText(action.config)]); + if (action["config"] !== undefined) { + rows.push(["Config", valueText(action["config"])]); } - if (action.data !== undefined) { - rows.push(["Data", valueText(action.data)]); + if (action["data"] !== undefined) { + rows.push(["Data", valueText(action["data"])]); } return table(rows, `Action ${index + 1}`); } @@ -123,7 +126,7 @@ function actionSection(value: unknown, index: number): string { function workflowGroupSections(value: unknown, heading: string): string[] { const sections = [table(conditionRows(value, false), heading)]; const group = asObject(value); - const actions = group?.actions; + const actions = group?.["actions"]; if (Array.isArray(actions) && actions.length > 0) { sections.push(...actions.map(actionSection)); } else if (group) { diff --git a/packages/cli/src/lib/formatters/chart-core.ts b/packages/cli/src/lib/formatters/chart-core.ts index 0ace96bff6..fcf178fad6 100644 --- a/packages/cli/src/lib/formatters/chart-core.ts +++ b/packages/cli/src/lib/formatters/chart-core.ts @@ -247,7 +247,7 @@ export type RasterizeOpts = { /** Leave the background transparent instead of filling it. */ backgroundTransparent?: boolean; /** Minimum single-series bar height in pixels; nulls stay empty. Default: 0. */ - minBarHeight?: number; + minBarHeight?: number | undefined; }; /** diff --git a/packages/cli/src/lib/formatters/chart-presentation.ts b/packages/cli/src/lib/formatters/chart-presentation.ts index 6dfd43f5d9..3321708eb2 100644 --- a/packages/cli/src/lib/formatters/chart-presentation.ts +++ b/packages/cli/src/lib/formatters/chart-presentation.ts @@ -44,9 +44,9 @@ export type ChartPresentationOptions = { /** Value-axis maximum already formatted with the caller's units/precision. */ maximumLabel: string; /** First x-axis label; omitted values leave that label empty. */ - firstLabel?: string; + firstLabel?: string | undefined; /** Last x-axis label; omitted values leave that label empty. */ - lastLabel?: string; + lastLabel?: string | undefined; /** Minimum single-series bar height in pixels; nulls stay empty. Default: 0. */ minBarHeight?: number; /** Allow the core's numeric bucket averaging to fit the plot. Default: true. */ diff --git a/packages/cli/src/lib/formatters/conversation.ts b/packages/cli/src/lib/formatters/conversation.ts index 651a3d8dca..7d9bc4d6e1 100644 --- a/packages/cli/src/lib/formatters/conversation.ts +++ b/packages/cli/src/lib/formatters/conversation.ts @@ -145,7 +145,7 @@ export type ToolCall = { spanId: string; timestamp: number; durationMs: number; - status?: string | null; + status?: string | null | undefined; }; export type ConversationTurn = { @@ -158,10 +158,10 @@ export type ConversationTurn = { userContent?: string | null; assistantContent?: string | null; toolCalls: ToolCall[]; - model?: string | null; - agentName?: string | null; + model?: string | null | undefined; + agentName?: string | null | undefined; totalTokens: number; - status?: string | null; + status?: string | null | undefined; }; function numeric(value: string | number | null | undefined): number { @@ -221,11 +221,11 @@ function stringifyContent(value: unknown): string | null { } if (part && typeof part === "object") { const r = part as Record; - if (typeof r.text === "string") { - return r.text; + if (typeof r["text"] === "string") { + return r["text"]; } - if (typeof r.content === "string") { - return r.content; + if (typeof r["content"] === "string") { + return r["content"]; } } return null; @@ -235,14 +235,14 @@ function stringifyContent(value: unknown): string | null { } if (value && typeof value === "object") { const r = value as Record; - if (typeof r.text === "string") { - return r.text; + if (typeof r["text"] === "string") { + return r["text"]; } - if (typeof r.content === "string") { - return r.content; + if (typeof r["content"] === "string") { + return r["content"]; } - if (typeof r.message === "string") { - return r.message; + if (typeof r["message"] === "string") { + return r["message"]; } } return value === null ? null : JSON.stringify(value); @@ -253,8 +253,8 @@ function collectMessages(value: unknown): { role?: string; content: string }[] { value && typeof value === "object" && !Array.isArray(value) && - Array.isArray((value as Record).messages) - ? (value as Record).messages + Array.isArray((value as Record)["messages"]) + ? (value as Record)["messages"] : value; if (!Array.isArray(source)) { @@ -271,7 +271,7 @@ function collectMessages(value: unknown): { role?: string; content: string }[] { return null; } const r = msg as Record; - const raw = r.content ?? r.text ?? r.parts; + const raw = r["content"] ?? r["text"] ?? r["parts"]; if (raw === null || raw === undefined) { return null; } @@ -280,7 +280,7 @@ function collectMessages(value: unknown): { role?: string; content: string }[] { return null; } return { - role: typeof r.role === "string" ? r.role : undefined, + role: typeof r["role"] === "string" ? r["role"] : undefined, content, }; }) @@ -519,7 +519,10 @@ export function buildTranscriptResult( conversationId: string, org: string, spans: AgentConversationSpan[], - details: { stats?: ConversationStats; title?: string | null } = {}, + details: { + stats?: ConversationStats | undefined; + title?: string | null; + } = {}, ): TranscriptResult { const { stats, title = null } = details; const turns = extractTurns(spans); diff --git a/packages/cli/src/lib/formatters/dashboard.ts b/packages/cli/src/lib/formatters/dashboard.ts index ef5c7ea754..e28bce0b32 100644 --- a/packages/cli/src/lib/formatters/dashboard.ts +++ b/packages/cli/src/lib/formatters/dashboard.ts @@ -388,7 +388,11 @@ function formatBigNumberValue(value: number): string { // Sort helper: descending by value, "Other" always last // --------------------------------------------------------------------------- -type BarItem = { label: string; total: number; unit?: string | null }; +type BarItem = { + label: string; + total: number; + unit?: string | null | undefined; +}; /** Sort items by value descending, "Other" pinned to end. */ function sortBarItems(items: BarItem[]): BarItem[] { @@ -1203,7 +1207,7 @@ type AggregatedTimeseries = { values: (number | null)[]; timestamps: number[]; label: string; - unit?: string | null; + unit?: string | null | undefined; /** Last measured value, or null when nothing was measured. */ latest: number | null; /** Whether the bucket `latest` comes from is still being ingested. */ diff --git a/packages/cli/src/lib/formatters/explore-timeseries.ts b/packages/cli/src/lib/formatters/explore-timeseries.ts index 7cca6ca0bc..4b325e8106 100644 --- a/packages/cli/src/lib/formatters/explore-timeseries.ts +++ b/packages/cli/src/lib/formatters/explore-timeseries.ts @@ -24,7 +24,7 @@ export type ExploreTimeSeriesData = EventsTimeSeriesResponse & { /** Organization slug, omitted from JSON output. */ org: string; /** Optional project slug, omitted from JSON output. */ - project?: string; + project?: string | undefined; }; type TimeSeries = EventsTimeSeriesResponse["timeSeries"][number]; @@ -121,8 +121,8 @@ function formatBuckets(series: TimeSeries, buckets: Bucket[]): string { : { ...column, value: (row: Record) => - typeof row.value === "string" - ? text(row.value.replace(/\n/g, " ")) + typeof row["value"] === "string" + ? text(row["value"].replace(/\n/g, " ")) : column.value(row), }, ); diff --git a/packages/cli/src/lib/formatters/feedback.ts b/packages/cli/src/lib/formatters/feedback.ts index 72d1713085..37fa8390a5 100644 --- a/packages/cli/src/lib/formatters/feedback.ts +++ b/packages/cli/src/lib/formatters/feedback.ts @@ -256,12 +256,12 @@ function isFeedbackContext(value: unknown): value is Record { function feedbackContext( event: SentryEvent | null, ): Record | undefined { - const context = event?.contexts?.feedback; + const context = event?.contexts?.["feedback"]; return isFeedbackContext(context) ? context : undefined; } function feedbackUrl(event: SentryEvent | null): string | undefined { - const contextUrl = feedbackContext(event)?.url; + const contextUrl = feedbackContext(event)?.["url"]; if (typeof contextUrl === "string" && contextUrl) { return contextUrl; } @@ -269,7 +269,7 @@ function feedbackUrl(event: SentryEvent | null): string | undefined { } function linkedEventId(data: FeedbackViewResult): string | undefined { - const contextId = feedbackContext(data.event)?.associated_event_id; + const contextId = feedbackContext(data.event)?.["associated_event_id"]; if (typeof contextId === "string" && contextId) { return contextId; } diff --git a/packages/cli/src/lib/formatters/highlight.ts b/packages/cli/src/lib/formatters/highlight.ts index 022f79ac7c..f5a11b0b8f 100644 --- a/packages/cli/src/lib/formatters/highlight.ts +++ b/packages/cli/src/lib/formatters/highlight.ts @@ -59,7 +59,10 @@ export function highlightCode(code: string, language?: string): string { try { const highlighter = loadCliHighlight(); if (highlighter) { - return highlighter.highlight(code, { language, ignoreIllegals: true }); + return highlighter.highlight(code, { + ...(language !== undefined && { language }), + ignoreIllegals: true, + }); } } catch { // Fall through to the uniform color below. diff --git a/packages/cli/src/lib/formatters/human.ts b/packages/cli/src/lib/formatters/human.ts index ce337d7c56..2ee356406a 100644 --- a/packages/cli/src/lib/formatters/human.ts +++ b/packages/cli/src/lib/formatters/human.ts @@ -270,9 +270,9 @@ function abbreviateCount(raw: string): string { */ export type FormatShortIdOptions = { /** Project slug to determine the prefix for suffix highlighting */ - projectSlug?: string; + projectSlug?: string | undefined; /** Project alias (e.g., "e", "w", "o1:d") for multi-project display */ - projectAlias?: string; + projectAlias?: string | undefined; /** Whether in multi-project mode (highlights alias chars in short ID) */ isMultiProject?: boolean; }; @@ -1177,15 +1177,15 @@ function buildBreadcrumbsMarkdown(breadcrumbsEntry: BreadcrumbsEntry): string { let message = breadcrumb.message ?? ""; if (!message && breadcrumb.data) { const data = breadcrumb.data; - if (data.url && data.method) { - const status = data.status_code - ? ` → ${stringifyUnknown(data.status_code)}` + if (data["url"] && data["method"]) { + const status = data["status_code"] + ? ` → ${stringifyUnknown(data["status_code"])}` : ""; - message = `${stringifyUnknown(data.method)} ${stringifyUnknown(data.url)}${status}`; - } else if (data.from && data.to) { - message = `${stringifyUnknown(data.from)} → ${stringifyUnknown(data.to)}`; - } else if (data.arguments && Array.isArray(data.arguments)) { - message = String(data.arguments[0] || "").slice(0, 60); + message = `${stringifyUnknown(data["method"])} ${stringifyUnknown(data["url"])}${status}`; + } else if (data["from"] && data["to"]) { + message = `${stringifyUnknown(data["from"])} → ${stringifyUnknown(data["to"])}`; + } else if (data["arguments"] && Array.isArray(data["arguments"])) { + message = String(data["arguments"][0] || "").slice(0, 60); } } @@ -1473,14 +1473,14 @@ function buildUserMarkdown(event: SentryEvent): string { if (user.geo) { const geo = user.geo; const parts: string[] = []; - if (geo.city) { - parts.push(geo.city); + if (geo["city"]) { + parts.push(geo["city"]); } - if (geo.region && geo.region !== geo.city) { - parts.push(geo.region); + if (geo["region"] && geo["region"] !== geo["city"]) { + parts.push(geo["region"]); } - if (geo.country_code) { - parts.push(`(${geo.country_code})`); + if (geo["country_code"]) { + parts.push(`(${geo["country_code"]})`); } if (parts.length > 0) { kvRows.push(["Location", parts.join(", ")]); @@ -1667,7 +1667,7 @@ export function formatOrgDetails(org: SentryOrganization): string { kvRows.push(["2FA", org.require2FA ? "Required" : "Not required"]); kvRows.push(["Early Adopter", org.isEarlyAdopter ? "Yes" : "No"]); // orgRole is returned by the detail API but not yet typed in the SDK - const orgRole = (org as Record).orgRole as + const orgRole = (org as Record)["orgRole"] as | string | undefined; if (orgRole) { @@ -1749,13 +1749,13 @@ export function formatProjectDetails( */ type UserIdentityInput = { /** User ID (from token response) */ - id?: string; + id?: string | undefined; /** User ID (from stored UserInfo) */ userId?: string; - email?: string; - username?: string; + email?: string | undefined; + username?: string | undefined; /** Display name (different from username) */ - name?: string; + name?: string | undefined; }; /** @@ -1786,9 +1786,9 @@ export function formatUserIdentity(user: UserIdentityInput): string { /** Data shape yielded by `whoami` for `sntrys_` org auth tokens. */ export type OrgTokenIdentity = { type: "org-auth-token"; - organization?: string; + organization?: string | undefined; url: string; - regionUrl?: string; + regionUrl?: string | undefined; }; /** @@ -2269,7 +2269,7 @@ export type ProjectDeleteResult = { /** Sentry web URL for the project */ url: string; /** When true, nothing was actually deleted — output uses tentative wording */ - dryRun?: boolean; + dryRun?: boolean | undefined; }; /** @@ -2572,7 +2572,7 @@ export function formatUpgradeResult(data: UpgradeResult): string { } default: { // Exhaustive check — all action types should be handled above - const _: never = data.action; + data.action satisfies never; lines.push("Done"); } } diff --git a/packages/cli/src/lib/formatters/json.ts b/packages/cli/src/lib/formatters/json.ts index a76fc5c07b..38184b20d2 100644 --- a/packages/cli/src/lib/formatters/json.ts +++ b/packages/cli/src/lib/formatters/json.ts @@ -296,7 +296,7 @@ export function writeJsonList( items: readonly unknown[], options: { hasMore: boolean; - nextCursor?: string | null; + nextCursor?: string | null | undefined; errors?: unknown[]; fields?: string[]; /** Arbitrary extra metadata to include in the wrapper (e.g. `{ hint }`) */ @@ -311,10 +311,10 @@ export function writeJsonList( const output: Record = { data: filtered, hasMore }; if (nextCursor !== null && nextCursor !== undefined && nextCursor !== "") { - output.nextCursor = nextCursor; + output["nextCursor"] = nextCursor; } if (errors && errors.length > 0) { - output.errors = errors; + output["errors"] = errors; } if (extra) { Object.assign(output, extra); diff --git a/packages/cli/src/lib/formatters/local.ts b/packages/cli/src/lib/formatters/local.ts index 7673998c32..ef7e8befef 100644 --- a/packages/cli/src/lib/formatters/local.ts +++ b/packages/cli/src/lib/formatters/local.ts @@ -120,8 +120,9 @@ const TRACE_ID_SHORT_LEN = 8; export function extractTraceId( event: Record, ): string | undefined { - const trace = (event.contexts as Record | undefined) - ?.trace as { trace_id?: unknown } | undefined; + const trace = (event["contexts"] as Record | undefined)?.[ + "trace" + ] as { trace_id?: unknown } | undefined; const traceId = trace?.trace_id; if (typeof traceId === "string" && TRACE_ID_RE.test(traceId)) { return traceId.toLowerCase(); @@ -455,13 +456,12 @@ export function formatTransactionItem( event: Record, header: Record, ): string { - const trace = (event.contexts as Record | undefined) - ?.trace as - | { op?: string; status?: string; description?: string } - | undefined; + const trace = (event["contexts"] as Record | undefined)?.[ + "trace" + ] as { op?: string; status?: string; description?: string } | undefined; const txnName = - typeof event.transaction === "string" - ? event.transaction + typeof event["transaction"] === "string" + ? event["transaction"] : (trace?.description ?? "Transaction"); // Try semantic display from OTel attributes first @@ -737,7 +737,7 @@ export function formatLogItem( header: Record, showAttributes = false, ): string[] { - const items = event.items as LogEntry[] | undefined; + const items = event["items"] as LogEntry[] | undefined; if (!items?.length) { return []; } @@ -979,7 +979,7 @@ export function formatSpanItem( header: Record, showAttributes = false, ): string[] { - const items = event.items as StreamedSpan[] | undefined; + const items = event["items"] as StreamedSpan[] | undefined; if (!items?.length) { return []; } @@ -1019,7 +1019,7 @@ export function formatSpanItem( * Checks all spans in the container for AI-prefixed attributes. */ function spanItemHasAiActivity(payload: Record): boolean { - const items = payload.items as StreamedSpan[] | undefined; + const items = payload["items"] as StreamedSpan[] | undefined; if (!items?.length) { return false; } @@ -1052,6 +1052,7 @@ export function itemTypeToFilterCategory( if (itemType === "transaction" || itemType === "span" || itemType === "log") { return itemType === "span" ? "transaction" : itemType; } + return undefined; } /** @@ -1117,6 +1118,7 @@ function jsonSafeIdentifier(value: unknown): string | undefined { } catch { log.debug("Could not serialize local envelope identity"); } + return undefined; } /** Strip ANSI escapes, C1 controls, and BiDi overrides from a JSON string. */ @@ -1160,8 +1162,8 @@ function formatJsonObservation( return JSON.stringify( sanitizeJsonValue({ schema_version: LOCAL_EVENT_SCHEMA_VERSION, - envelope_id: jsonSafeIdentifier(header.__spotlight_envelope_id), - event_id: jsonSafe(payload.event_id) ?? jsonSafe(header.event_id), + envelope_id: jsonSafeIdentifier(header["__spotlight_envelope_id"]), + event_id: jsonSafe(payload["event_id"]) ?? jsonSafe(header["event_id"]), ...observation, }), ); @@ -1204,8 +1206,8 @@ function formatErrorJson( * envelope stays compact when `--attributes` isn't requested. */ function buildJsonAttributes(payload: Record): { - user?: Record; - sdk?: Record; + user?: Record | undefined; + sdk?: Record | undefined; } { const merged = collectAllAttributes(payload); const user: Record = {}; @@ -1233,13 +1235,14 @@ function formatTransactionJson( header: Record, includeAttributes = false, ): string { - const trace = (payload.contexts as Record | undefined) - ?.trace as Record | undefined; + const trace = (payload["contexts"] as Record | undefined)?.[ + "trace" + ] as Record | undefined; const attrs = mergeTransactionAttributes(payload); const semantic = formatSemanticSpanDisplay( attrs, stringifyUnknown( - payload.transaction ?? trace?.description ?? "Transaction", + payload["transaction"] ?? trace?.["description"] ?? "Transaction", ), ); return formatJsonObservation( @@ -1247,7 +1250,7 @@ function formatTransactionJson( type: "transaction", timestamp: parseEventTimestamp(payload.timestamp), trace_id: extractTraceId(payload), - op: inferSemanticOp(attrs) ?? trace?.op, + op: inferSemanticOp(attrs) ?? trace?.["op"], label: stripBidi(semantic.label), metadata: semantic.metadata.length > 0 @@ -1276,7 +1279,7 @@ function formatLogJson( header: Record, includeAttributes = false, ): string[] { - const items = payload.items as LogEntry[] | undefined; + const items = payload["items"] as LogEntry[] | undefined; if (!items?.length) { return []; } @@ -1319,7 +1322,7 @@ function formatSpanJson( header: Record, includeAttributes = false, ): string[] { - const items = payload.items as StreamedSpan[] | undefined; + const items = payload["items"] as StreamedSpan[] | undefined; if (!items?.length) { return []; } @@ -1586,16 +1589,16 @@ export function formatLocalControlResult( data: Record, ): string { const daemon = - data.daemon && - typeof data.daemon === "object" && - !Array.isArray(data.daemon) - ? (data.daemon as Record) + data["daemon"] && + typeof data["daemon"] === "object" && + !Array.isArray(data["daemon"]) + ? (data["daemon"] as Record) : data; const receiverUrl = - typeof data.streamUrl === "string" - ? data.streamUrl - : typeof daemon.host === "string" && typeof daemon.port === "number" - ? formatLocalServerUrl(daemon.host, daemon.port) + typeof data["streamUrl"] === "string" + ? data["streamUrl"] + : typeof daemon["host"] === "string" && typeof daemon["port"] === "number" + ? formatLocalServerUrl(daemon["host"], daemon["port"]) : undefined; const hint = receiverUrl ? formatLocalViewerHint(receiverUrl) : undefined; return JSON.stringify(data, null, 2) + (hint ? `\n\n${hint}` : ""); diff --git a/packages/cli/src/lib/formatters/log.ts b/packages/cli/src/lib/formatters/log.ts index a41a1abf0d..f542051126 100644 --- a/packages/cli/src/lib/formatters/log.ts +++ b/packages/cli/src/lib/formatters/log.ts @@ -50,10 +50,10 @@ const LOG_TABLE_COLS = ["ID", "Timestamp", "Level", "Message"] as const; */ export type LogLike = { timestamp: string; - severity?: string | null; - message?: string | null; + severity?: string | null | undefined; + message?: string | null | undefined; /** Present on Explore/Events logs; absent on trace-logs (all rows share one trace). */ - trace?: string | null; + trace?: string | null | undefined; /** Unique log entry ID from Explore/Events API (`sentry.item_id`). */ "sentry.item_id"?: string; /** Unique log entry ID from trace-logs endpoint. */ diff --git a/packages/cli/src/lib/formatters/markdown.ts b/packages/cli/src/lib/formatters/markdown.ts index adbb2a3257..e7155c0f65 100644 --- a/packages/cli/src/lib/formatters/markdown.ts +++ b/packages/cli/src/lib/formatters/markdown.ts @@ -233,7 +233,7 @@ function renderHtmlToken(raw: string): string { function flattenInline(token: Token): Token[] { if ( "tokens" in token && - token.tokens && + Array.isArray(token.tokens) && token.type !== "strong" && token.type !== "em" && token.type !== "link" @@ -371,9 +371,9 @@ const WHITESPACE_RE = /\s+/; * into the language and the line-number gutter options. */ function parseCodeInfo(info: string | undefined): { - language?: string; - start?: number; - highlight?: number; + language?: string | undefined; + start?: number | undefined; + highlight?: number | undefined; } { const [language, ...rest] = (info ?? "").trim().split(WHITESPACE_RE); const attrs: Record = {}; @@ -384,8 +384,8 @@ function parseCodeInfo(info: string | undefined): { } return { language: language || undefined, - start: attrs.start, - highlight: attrs.highlight, + start: attrs["start"], + highlight: attrs["highlight"], }; } diff --git a/packages/cli/src/lib/formatters/output.ts b/packages/cli/src/lib/formatters/output.ts index 27178ccfca..8b8751115a 100644 --- a/packages/cli/src/lib/formatters/output.ts +++ b/packages/cli/src/lib/formatters/output.ts @@ -237,7 +237,7 @@ export type OutputConfig< ( | { jsonTransform?: undefined; - schema?: OutputSchemaFields & SchemaMatches; + schema?: (OutputSchemaFields & SchemaMatches) | undefined; } | { /** @@ -254,7 +254,9 @@ export type OutputConfig< * When `jsonTransform` is set, `jsonExclude` is ignored. */ jsonTransform: (data: T, fields?: string[]) => R; - schema?: OutputSchemaFields & TransformSchemaMatches; + schema?: + | (OutputSchemaFields & TransformSchemaMatches) + | undefined; } ); @@ -321,7 +323,7 @@ export type CommandReturn = { * cleanup output (e.g., table footer). Otherwise the wrapper writes * it via `writeFooter()`. */ - hint?: string; + hint?: string | undefined; }; /** @@ -332,9 +334,9 @@ type RenderContext = { /** Whether `--json` was passed */ json: boolean; /** Pre-parsed `--fields` value */ - fields?: string[]; + fields?: string[] | undefined; /** ANSI prefix to prepend to the output (e.g., clear-screen escape) */ - clearPrefix?: string; + clearPrefix?: string | undefined; }; /** @@ -465,7 +467,7 @@ export type SchemaFieldInfo = { /** Human-readable type string (e.g. "string", "number", "object", "string | null") */ type: string; /** Description from valibot's `description()` pipe action */ - description?: string; + description?: string | undefined; /** Whether the field is optional in the schema */ optional: boolean; }; diff --git a/packages/cli/src/lib/formatters/pixel-canvas.ts b/packages/cli/src/lib/formatters/pixel-canvas.ts index 793e21ecfd..0bef61ecdd 100644 --- a/packages/cli/src/lib/formatters/pixel-canvas.ts +++ b/packages/cli/src/lib/formatters/pixel-canvas.ts @@ -43,7 +43,7 @@ export type CreatePixelCanvasOptions = { /** Canvas height in pixels. */ height: number; /** Optional opaque background fill. A missing value leaves pixels transparent. */ - background?: Rgb; + background?: Rgb | undefined; }; /** Options for drawing a filled rectangle. */ diff --git a/packages/cli/src/lib/formatters/plain-detect.ts b/packages/cli/src/lib/formatters/plain-detect.ts index 13167c262a..d418c94309 100644 --- a/packages/cli/src/lib/formatters/plain-detect.ts +++ b/packages/cli/src/lib/formatters/plain-detect.ts @@ -49,14 +49,14 @@ export function isTruthyEnv(val: string): boolean { * 4. `process.stdout.isTTY` — auto-detect interactive terminal */ export function isPlainOutput(): boolean { - const plain = getEnv().SENTRY_PLAIN_OUTPUT; + const plain = getEnv()["SENTRY_PLAIN_OUTPUT"]; if (plain !== undefined) { return isTruthyEnv(plain); } // no-color.org spec: presence of a non-empty value disables color. // Unlike SENTRY_PLAIN_OUTPUT, "0" and "false" still mean "disable color". - const noColor = getEnv().NO_COLOR; + const noColor = getEnv()["NO_COLOR"]; if (noColor !== undefined) { return noColor !== ""; } @@ -64,7 +64,7 @@ export function isPlainOutput(): boolean { // FORCE_COLOR only applies to interactive terminals. When stdout is // piped/redirected, FORCE_COLOR is ignored so that `cmd | less` always // produces clean output without ANSI codes. - const forceColor = getEnv().FORCE_COLOR; + const forceColor = getEnv()["FORCE_COLOR"]; if (process.stdout.isTTY && forceColor !== undefined && forceColor !== "") { return forceColor === "0"; } diff --git a/packages/cli/src/lib/formatters/replay.ts b/packages/cli/src/lib/formatters/replay.ts index 36571c1905..a022136077 100644 --- a/packages/cli/src/lib/formatters/replay.ts +++ b/packages/cli/src/lib/formatters/replay.ts @@ -207,22 +207,22 @@ function summarizeTaggedReplayEvent( function summarizeReplayEvent( event: ReplayRecordingEvent, ): ReplayActivityEvent | null { - const timestampMs = getEventTimestampMillis(event.timestamp); - if (hasReplayTag(event.data)) { + const timestampMs = getEventTimestampMillis(event["timestamp"]); + if (hasReplayTag(event["data"])) { const replayEvent = summarizeTaggedReplayEvent( - event.data.tag, - event.data.payload, + event["data"].tag, + event["data"].payload, ); if (replayEvent) { return { timestampMs, ...replayEvent }; } } - if (hasReplayHref(event.data)) { + if (hasReplayHref(event["data"])) { return { timestampMs, label: "page.view", - details: [`href=${event.data.href}`], + details: [`href=${event["data"].href}`], }; } diff --git a/packages/cli/src/lib/formatters/saved-transformations.ts b/packages/cli/src/lib/formatters/saved-transformations.ts index 86665f16e7..1a0851b24e 100644 --- a/packages/cli/src/lib/formatters/saved-transformations.ts +++ b/packages/cli/src/lib/formatters/saved-transformations.ts @@ -33,7 +33,7 @@ export function formatSavedTransformationLines( export function formatDashboardSavedTransformations( widgets: readonly { title: string; - queries?: readonly DashboardWidgetQuery[]; + queries?: readonly DashboardWidgetQuery[] | undefined; }[], ): string { const sections = widgets.flatMap((widget) => { diff --git a/packages/cli/src/lib/formatters/semantic-display.ts b/packages/cli/src/lib/formatters/semantic-display.ts index 2400a5ef60..0b99bb0f03 100644 --- a/packages/cli/src/lib/formatters/semantic-display.ts +++ b/packages/cli/src/lib/formatters/semantic-display.ts @@ -678,8 +678,8 @@ function formatHttpLabel({ target, fallbackLabel, }: { - method?: string; - target?: string; + method?: string | undefined; + target?: string | undefined; fallbackLabel: string; }): string { if (method && target) { @@ -816,9 +816,9 @@ function dedupeMetadata(values: string[]): string[] { export function mergeTransactionAttributes( event: Record, ): AttributeSource { - const contexts = event.contexts as Record | undefined; - const trace = contexts?.trace as Record | undefined; - const data = trace?.data as Record | undefined; + const contexts = event["contexts"] as Record | undefined; + const trace = contexts?.["trace"] as Record | undefined; + const data = trace?.["data"] as Record | undefined; return data ?? {}; } @@ -834,13 +834,13 @@ export function mergeTransactionAttributes( export function collectSpanAttributes( event: Record, ): AttributeSource[] { - const spans = event.spans; + const spans = event["spans"]; if (!Array.isArray(spans)) { return []; } const result: AttributeSource[] = []; for (const span of spans) { - const data = (span as Record | null)?.data; + const data = (span as Record | null)?.["data"]; if (data && typeof data === "object") { result.push(data as AttributeSource); } diff --git a/packages/cli/src/lib/formatters/sixel-dashboard.ts b/packages/cli/src/lib/formatters/sixel-dashboard.ts index e70d327323..574f148d32 100644 --- a/packages/cli/src/lib/formatters/sixel-dashboard.ts +++ b/packages/cli/src/lib/formatters/sixel-dashboard.ts @@ -66,7 +66,7 @@ export type SixelDashboardWidget = { /** Sentry display type, used to distinguish categorical bars. */ displayType: string | null; /** Grid position when supplied by the dashboard API. */ - layout?: SixelWidgetLayout; + layout?: SixelWidgetLayout | undefined; /** Fully resolved query result. */ data: WidgetDataResult; }; @@ -95,7 +95,7 @@ export type RenderSixelDashboardOptions = { * Encode the finished RGBA canvas to a terminal graphics escape string. * Defaults to sixel; callers pass a kitty encoder on kitty-capable terminals. */ - encodeImage?: (image: DecodedImage) => string | undefined; + encodeImage?: ((image: DecodedImage) => string | undefined) | undefined; }; /** A widget paired with the layout used for the final composite. */ diff --git a/packages/cli/src/lib/formatters/text-table.ts b/packages/cli/src/lib/formatters/text-table.ts index aa50970ad0..0e0a503c1f 100644 --- a/packages/cli/src/lib/formatters/text-table.ts +++ b/packages/cli/src/lib/formatters/text-table.ts @@ -45,7 +45,7 @@ export type TextTableOptions = { /** Horizontal cell padding (each side). @default 1 */ cellPadding?: number; /** Maximum table width in columns. @default process.stdout.columns or 80 */ - maxWidth?: number; + maxWidth?: number | undefined; /** Per-column alignment (indexed by column). Defaults to "left". */ alignments?: Array; /** Whether to include a separator row after the header. @default true */ @@ -55,7 +55,7 @@ export type TextTableOptions = { /** Per-column shrinkable flags. Non-shrinkable columns keep intrinsic width. */ shrinkable?: boolean[]; /** Truncate cells to one line with "\u2026" instead of wrapping. @default false */ - truncate?: boolean; + truncate?: boolean | undefined; /** * Hide the header row entirely (omit from rendered output). * @@ -77,7 +77,7 @@ export type TextTableOptions = { * borders (horizontal lines, vertical bars, corners) are colored with * the given prefix, making the frame visually subdued relative to content. */ - rowSeparator?: boolean | string; + rowSeparator?: boolean | string | undefined; }; /** diff --git a/packages/cli/src/lib/formatters/trace.ts b/packages/cli/src/lib/formatters/trace.ts index 44cef3096b..86cef97159 100644 --- a/packages/cli/src/lib/formatters/trace.ts +++ b/packages/cli/src/lib/formatters/trace.ts @@ -146,9 +146,9 @@ export type TraceSummary = { /** Project slugs involved in the trace */ projects: string[]; /** Root transaction name (e.g., "GET /api/users") */ - rootTransaction?: string; + rootTransaction?: string | undefined; /** Root operation type (e.g., "http.server") */ - rootOp?: string; + rootOp?: string | undefined; /** Trace start time as Unix timestamp (seconds) */ startTimestamp: number; }; @@ -208,7 +208,7 @@ export function parseTraceFields( } type ProjectedTraceSpan = Partial> & { - children?: ProjectedTraceSpan[]; + children?: ProjectedTraceSpan[] | undefined; }; /** Add trace-wide attributes without losing explicit selections or tree shape. */ @@ -273,8 +273,8 @@ function walkSpanTree( minStart: number; maxEnd: number; projects: Set; - rootTransaction?: string; - rootOp?: string; + rootTransaction?: string | undefined; + rootOp?: string | undefined; }, ): void { state.spanCount += 1; @@ -366,7 +366,7 @@ export function formatTraceSummary( summary: TraceSummary, options: { /** Newest stored replay linked to the trace, or null. */ - replayId?: string | null; + replayId?: string | null | undefined; } = {}, ): string { const kvRows: [string, string][] = []; diff --git a/packages/cli/src/lib/games/leaderboard-api.ts b/packages/cli/src/lib/games/leaderboard-api.ts index abe5e0f0f9..95f448902f 100644 --- a/packages/cli/src/lib/games/leaderboard-api.ts +++ b/packages/cli/src/lib/games/leaderboard-api.ts @@ -56,7 +56,7 @@ export type SnakeLeaderboard = { * server-controlled text never reaches the terminal. */ export async function fetchSnakeLeaderboard(): Promise { - const baseUrl = getEnv().SENTRY_GAMES_API_URL || DEFAULT_GAMES_API_URL; + const baseUrl = getEnv()["SENTRY_GAMES_API_URL"] || DEFAULT_GAMES_API_URL; let response: Response; try { response = await customFetch( diff --git a/packages/cli/src/lib/ghcr.ts b/packages/cli/src/lib/ghcr.ts index 8e7158a6a1..701380fbef 100644 --- a/packages/cli/src/lib/ghcr.ts +++ b/packages/cli/src/lib/ghcr.ts @@ -87,7 +87,7 @@ function rethrowExternalAbort( type RetryOptions = { timeout?: number; - signal?: AbortSignal; + signal?: AbortSignal | undefined; }; /** @@ -372,7 +372,7 @@ export async function fetchNightlyManifest( * @throws {UpgradeError} When the version annotation is missing */ export function getNightlyVersion(manifest: OciManifest): string { - const version = manifest.annotations?.version; + const version = manifest.annotations?.["version"]; if (!version) { throw new UpgradeError( "network_error", @@ -489,7 +489,7 @@ export async function downloadNightlyBlob( try { redirectResponse = await customFetch(redirectUrl, { headers: { "User-Agent": getUserAgent() }, - signal, + ...(signal && { signal }), }); } catch (error) { rethrowExternalAbort(error, signal); diff --git a/packages/cli/src/lib/git.ts b/packages/cli/src/lib/git.ts index addb73135e..b9634fa4ad 100644 --- a/packages/cli/src/lib/git.ts +++ b/packages/cli/src/lib/git.ts @@ -175,7 +175,11 @@ const NUL = "\x00"; */ export function getCommitLog( cwd?: string, - options: { from?: string; depth?: number; paths?: string[] } = {}, + options: { + from?: string | undefined; + depth?: number | undefined; + paths?: string[] | undefined; + } = {}, ): GitCommit[] { const { from, depth = 20, paths } = options; diff --git a/packages/cli/src/lib/help.ts b/packages/cli/src/lib/help.ts index d42a1c15e3..68f459e708 100644 --- a/packages/cli/src/lib/help.ts +++ b/packages/cli/src/lib/help.ts @@ -308,7 +308,7 @@ type CustomHelpOptions = { * command list. Used for bare `sentry`; ignored when an AI agent is * detected so agents always get the full list. */ - overview?: boolean; + overview?: boolean | undefined; }; /** @@ -404,9 +404,9 @@ export type HelpEnvVarInfo = { /** Full markdown description from the env-var registry. */ description: string; /** Example value (when provided in the registry). */ - example?: string; + example?: string | undefined; /** Default value (when provided in the registry). */ - defaultValue?: string; + defaultValue?: string | undefined; }; /** @@ -416,7 +416,7 @@ export type HelpFlagInfo = { /** Long flag name including `--` prefix (e.g. `"--json"`). */ long: string; /** Short alias including `-` prefix (e.g. `"-f"`), or undefined if none. */ - short?: string; + short?: string | undefined; /** One-line description. */ description: string; }; @@ -495,7 +495,10 @@ export function introspectAllCommands(): { */ export function introspectCommand( commandPath: string[], -): CommandInfo | RouteInfo | { error: string; suggestions?: string[] } { +): + | CommandInfo + | RouteInfo + | { error: string; suggestions?: string[] | undefined } { const routeMap = getRoutes() as unknown as RouteMap; const resolved = resolveCommandPath(routeMap, commandPath); if (!resolved) { diff --git a/packages/cli/src/lib/hex-id-recovery.ts b/packages/cli/src/lib/hex-id-recovery.ts index 846ac01bb4..5c114198e8 100644 --- a/packages/cli/src/lib/hex-id-recovery.ts +++ b/packages/cli/src/lib/hex-id-recovery.ts @@ -125,7 +125,7 @@ export type RecoveryResult = export type LookupContext = { org: string; /** When present, scopes the scan to a single project. */ - project?: string; + project?: string | undefined; /** Required for span lookup (spans are unique only within a trace). */ traceId?: string; /** Override for the default scan window (e.g. "90d", "7d"). */ @@ -506,7 +506,9 @@ const eventAdapter: FuzzyLookupAdapter = async (ctx) => { sort: "-timestamp", statsPeriod: ctx.period ?? SCAN_PERIODS.event, }); - return data.data.map((row) => stringifyUnknown(row.id ?? "")).filter(Boolean); + return data.data + .map((row) => stringifyUnknown(row["id"] ?? "")) + .filter(Boolean); }; const traceAdapter: FuzzyLookupAdapter = async (ctx) => { diff --git a/packages/cli/src/lib/http1-dispatcher.ts b/packages/cli/src/lib/http1-dispatcher.ts index 9141676af5..403558a049 100644 --- a/packages/cli/src/lib/http1-dispatcher.ts +++ b/packages/cli/src/lib/http1-dispatcher.ts @@ -19,6 +19,8 @@ * off what is already off. */ +import type { Dispatcher } from "undici-types"; + import { logger } from "./logger.js"; const log = logger.withTag("http"); @@ -26,8 +28,14 @@ const log = logger.withTag("http"); /** undici's global dispatcher symbol, set by Node 24 (undici 7) and Node 26 (undici 8). */ const GLOBAL_DISPATCHER_V2 = Symbol.for("undici.globalDispatcher.2"); -/** An undici dispatcher, as `fetch` accepts it. */ -export type Http1Dispatcher = NonNullable; +/** An undici dispatcher, as Node's `fetch` accepts it. */ +export type Http1Dispatcher = Dispatcher; + +/** + * Node's `fetch` options. lib DOM's `RequestInit`, which replaces Node's in + * programs that load both, lacks undici's `dispatcher`. + */ +export type NodeRequestInit = RequestInit & { dispatcher?: Dispatcher }; type DispatcherClass = new (options: { allowH2: false }) => Http1Dispatcher; diff --git a/packages/cli/src/lib/id-arguments.ts b/packages/cli/src/lib/id-arguments.ts index c43f496ec7..0ac27f7736 100644 --- a/packages/cli/src/lib/id-arguments.ts +++ b/packages/cli/src/lib/id-arguments.ts @@ -68,7 +68,7 @@ export type IdKind = { /** The ID of this kind in a parsed Sentry URL, if it has one */ readonly fromUrl: (url: ParsedSentryUrl) => string | undefined; /** A URL with this kind of ID, suggested when a pasted URL has none */ - readonly urlExample?: string; + readonly urlExample?: string | undefined; /** * Items of this kind have names, such as a dashboard's title or issue * search text: what is not, and may not be, an ID ({@link IdKind.mayBeId}) @@ -307,7 +307,7 @@ export type IdArgumentsOptions = { * Whether the command may get no ID, like a list of a project's items or * a trace's. Then a lone argument that does not end in an ID is a target. */ - readonly optional?: boolean; + readonly optional?: boolean | undefined; /** * Whether the command needs a project, not just an org. Then `/` * names project `` (found in any org), like ` ` does. @@ -327,11 +327,11 @@ export type IdArguments = { * `undefined` to auto-detect. `/` gives `/` (the org), or `` * when the command needs a project. */ - readonly target?: string; + readonly target?: string | undefined; /** The IDs: normalized, or as typed when not validated */ readonly ids: readonly string[]; /** Server of a pasted Sentry URL, for `applySentryUrlContext` */ - readonly baseUrl?: string; + readonly baseUrl?: string | undefined; /** Warnings to log, such as for ignored or reversed arguments */ readonly warnings: readonly string[]; /** diff --git a/packages/cli/src/lib/interactive-login.ts b/packages/cli/src/lib/interactive-login.ts index 9f5ddd243c..2c953faee8 100644 --- a/packages/cli/src/lib/interactive-login.ts +++ b/packages/cli/src/lib/interactive-login.ts @@ -24,11 +24,18 @@ export type LoginResult = { /** Authentication method used. */ method: "oauth" | "token"; /** User identity if available. */ - user?: { name?: string; email?: string; username?: string; id?: string }; + user?: + | { + name?: string | undefined; + email?: string | undefined; + username?: string | undefined; + id?: string | undefined; + } + | undefined; /** Path where credentials are stored. */ configPath: string; /** Token lifetime in seconds, if known. */ - expiresIn?: number; + expiresIn?: number | undefined; /** Whether the OAuth access token can be refreshed automatically. */ refreshEnabled?: boolean; }; @@ -41,9 +48,9 @@ export type LoginResult = { */ export function toLoginUser(user: { id: string; - name?: string | null; - email?: string | null; - username?: string | null; + name?: string | null | undefined; + email?: string | null | undefined; + username?: string | null | undefined; }): NonNullable { return Object.fromEntries( Object.entries(user).filter(([k, v]) => k === "id" || Boolean(v)), @@ -58,7 +65,7 @@ export type InteractiveLoginOptions = { * Space-joined OAuth scope string to request. When omitted, the device flow * requests the full default scope set. Build via `resolveOAuthScopeString`. */ - scope?: string; + scope?: string | undefined; /** * Store the login as a new account instead of replacing the active * account's credentials (see {@link completeOAuthFlow}). Default: false. @@ -70,7 +77,7 @@ export type InteractiveLoginOptions = { * Servers that ignore the hint let the browser's user approve, so the * token is checked here too: a mismatching token is discarded, not stored. */ - expectedEmail?: string; + expectedEmail?: string | undefined; /** * Re-authorize this stored account in place instead of the active one * (scope recovery for the account an invocation picked for its target diff --git a/packages/cli/src/lib/introspect.ts b/packages/cli/src/lib/introspect.ts index b16c5b708e..c304d1afee 100644 --- a/packages/cli/src/lib/introspect.ts +++ b/packages/cli/src/lib/introspect.ts @@ -122,7 +122,7 @@ export type FlagDef = { export type CommandInfo = { path: string; brief: string; - fullDescription?: string; + fullDescription?: string | undefined; flags: FlagInfo[]; positional: string; /** Structured positional parameter metadata for documentation generation */ @@ -130,7 +130,7 @@ export type CommandInfo = { aliases: Record; examples: string[]; /** JSON output field metadata extracted from `OutputConfig.schema` */ - jsonFields?: SchemaFieldInfo[]; + jsonFields?: SchemaFieldInfo[] | undefined; /** Present (and `true`) when the command is destructive or irreversible */ destructive?: true; }; @@ -449,7 +449,7 @@ export type CommandCompletions = Record; function argumentCompletion( parse: unknown, enumValues?: readonly string[], -): { kind: CompletionTarget | null; values?: readonly string[] } { +): { kind: CompletionTarget | null; values?: readonly string[] | undefined } { return enumValues ? { kind: CHOICE_TARGET, values: enumValues } : { diff --git a/packages/cli/src/lib/issue-identifier.ts b/packages/cli/src/lib/issue-identifier.ts index edb3132180..0c8da660cc 100644 --- a/packages/cli/src/lib/issue-identifier.ts +++ b/packages/cli/src/lib/issue-identifier.ts @@ -36,7 +36,12 @@ export type ParsedIssueArg = | { type: "project-search"; projectSlug: string; suffix: string } | { type: "suffix-only"; suffix: string } | { type: "selector"; selector: IssueSelector; org?: string } - | { type: "share"; shareId: string; org?: string; baseUrl: string } + | { + type: "share"; + shareId: string; + org?: string | undefined; + baseUrl: string; + } /** Not an identifier: text to search issues for */ | { type: "search"; query: string }; diff --git a/packages/cli/src/lib/issue-links.ts b/packages/cli/src/lib/issue-links.ts index d871f92d77..b0e8053f90 100644 --- a/packages/cli/src/lib/issue-links.ts +++ b/packages/cli/src/lib/issue-links.ts @@ -33,15 +33,15 @@ export type ExternalIssueLinkOptions = { /** Numeric Sentry issue ID. */ issueId: string; /** Project context required by some Sentry App searches. */ - projectId?: string; + projectId?: string | undefined; /** URL of an existing external issue. */ url: string; /** Native integration ID, when multiple installations match. */ - integrationId?: string; + integrationId?: string | undefined; /** Sentry App slug; Linear URLs select the Linear app automatically. */ - appSlug?: string; + appSlug?: string | undefined; /** Additional fields required by a Sentry App's link form. */ - fields?: Record; + fields?: Record | undefined; /** Inspect the operation without submitting a mutation. */ dryRun?: boolean; }; @@ -59,17 +59,17 @@ export type ExternalIssueLinkResult = { /** Whether this invocation changed an association. */ changed: boolean; /** True when no mutation was submitted. */ - dryRun?: boolean; + dryRun?: boolean | undefined; /** Canonical external issue identity when available. */ externalIssue: { /** Sentry's internal external-issue record ID, not the tracker key. */ - id?: string; + id?: string | undefined; /** Tracker key or display name. */ - identifier?: string; + identifier?: string | undefined; /** External issue URL. */ url: string; /** Native provider key or Sentry App slug. */ - provider?: string; + provider?: string | undefined; }; }; diff --git a/packages/cli/src/lib/jvm-bundle.ts b/packages/cli/src/lib/jvm-bundle.ts index 3ae98d165c..aa2c2a3e92 100644 --- a/packages/cli/src/lib/jvm-bundle.ts +++ b/packages/cli/src/lib/jvm-bundle.ts @@ -97,7 +97,7 @@ export type JvmBundleOptions = { /** Debug ID (UUID) to stamp on the bundle. */ debugId: string; /** Additional directory names to exclude during traversal. */ - excludePatterns?: string[]; + excludePatterns?: string[] | undefined; }; /** Result of {@link buildJvmBundle}. */ diff --git a/packages/cli/src/lib/list-command.ts b/packages/cli/src/lib/list-command.ts index 4fa8346214..f190d4043d 100644 --- a/packages/cli/src/lib/list-command.ts +++ b/packages/cli/src/lib/list-command.ts @@ -437,7 +437,7 @@ function getSubcommandsForRoute(routeName: string): Set { byRoute = new Map(); for (const entry of routes.getAllEntries()) { const target = entry.target as unknown as Record; - if (typeof target.getAllEntries === "function") { + if (typeof target["getAllEntries"] === "function") { byRoute.set( entry.name.original, collectChildNames( @@ -547,36 +547,36 @@ export function buildListCommand< // Auto-inject common flags and aliases into parameters const params = builderArgs.parameters ?? {}; - const existingFlags = (params.flags ?? {}) as Record; - const existingAliases = (params.aliases ?? {}) as Record; + const existingFlags = (params["flags"] ?? {}) as Record; + const existingAliases = (params["aliases"] ?? {}) as Record; const mergedFlags = { ...existingFlags }; const mergedAliases = { ...existingAliases }; // Always inject --fresh unless the command already defines it if (!("fresh" in mergedFlags)) { - mergedFlags.fresh = FRESH_FLAG; + mergedFlags["fresh"] = FRESH_FLAG; } // Inject --cursor unless opted out or already defined if (!(options?.noCursorFlag || "cursor" in mergedFlags)) { - mergedFlags.cursor = LIST_CURSOR_FLAG; + mergedFlags["cursor"] = LIST_CURSOR_FLAG; } // Inject -f alias unless opted out or already defined if (!(options?.noFreshAlias || "f" in mergedAliases)) { - mergedAliases.f = "fresh"; + mergedAliases["f"] = "fresh"; } // Inject -c alias unless cursor is opted out or already defined if (!(options?.noCursorFlag || "c" in mergedAliases)) { - mergedAliases.c = "cursor"; + mergedAliases["c"] = "cursor"; } // `boundArguments` positionals parse every argument before this wrapper // runs, so a subcommand name is left out of that parse, before it changes // what the other arguments mean - const positional = skipLeadingArgument(params.positional, (arg) => + const positional = skipLeadingArgument(params["positional"], (arg) => isSubcommandName(arg, routeName), ); const mergedParams = { diff --git a/packages/cli/src/lib/list-filter.ts b/packages/cli/src/lib/list-filter.ts index bd97f1b9d5..4a0b50c5af 100644 --- a/packages/cli/src/lib/list-filter.ts +++ b/packages/cli/src/lib/list-filter.ts @@ -111,7 +111,7 @@ export async function fetchByName(options: { filter: string; namesOf: (item: T) => readonly string[]; fetchAll: () => Promise; - search?: (query: string) => Promise; + search?: ((query: string) => Promise) | undefined; }): Promise { const { filter, namesOf, fetchAll, search } = options; const query = search ? serverSearchText(filter) : undefined; diff --git a/packages/cli/src/lib/login-host-guard.ts b/packages/cli/src/lib/login-host-guard.ts index 2c7e0b478d..adea1d8233 100644 --- a/packages/cli/src/lib/login-host-guard.ts +++ b/packages/cli/src/lib/login-host-guard.ts @@ -31,7 +31,7 @@ import { getUrlLoginCommand } from "./app-identity.js"; export function resolveEffectiveLoginHost(): string { const env = getEnv(); return ( - normalizeUserInputToOrigin(env.SENTRY_HOST || env.SENTRY_URL) ?? + normalizeUserInputToOrigin(env["SENTRY_HOST"] || env["SENTRY_URL"]) ?? DEFAULT_SENTRY_URL ); } @@ -83,7 +83,7 @@ export function isAutoLoginHostTrusted(host: string): boolean { */ export function buildHostRefusalMessage( host: string, - opts?: { tokenFlag?: boolean; rcSource?: string }, + opts?: { tokenFlag?: boolean | undefined; rcSource?: string | undefined }, ): string { const tokenFlag = opts?.tokenFlag ? " --token " : ""; const sourceClause = opts?.rcSource diff --git a/packages/cli/src/lib/mcp.ts b/packages/cli/src/lib/mcp.ts index 928d255063..72cf15b195 100644 --- a/packages/cli/src/lib/mcp.ts +++ b/packages/cli/src/lib/mcp.ts @@ -173,7 +173,7 @@ function isPinnedCredential( */ export async function resolveCliMcpCredential( config: McpTarget, - options: { force?: boolean; pin?: McpCredentialPin } = {}, + options: { force?: boolean | undefined; pin?: McpCredentialPin } = {}, ): Promise { const targetUrl = `${config.sentryProtocol}://${config.sentryHost}`; const requested = options.pin ?? startupPin(); @@ -277,7 +277,7 @@ function readDeprecatedAccessToken( if (flag?.trim()) { return { token: flag, source: "--access-token" }; } - const fromEnv = env.SENTRY_ACCESS_TOKEN; + const fromEnv = env["SENTRY_ACCESS_TOKEN"]; if (fromEnv?.trim()) { return { token: fromEnv, source: "SENTRY_ACCESS_TOKEN" }; } @@ -314,7 +314,7 @@ function withTargetEnv( ...env, SENTRY_URL: `${target.sentryProtocol}://${target.sentryHost}`, }; - delete targeted.SENTRY_HOST; + delete targeted["SENTRY_HOST"]; return targeted; } @@ -363,16 +363,16 @@ function clientTokenEnv( ): NodeJS.ProcessEnv { if ( !deprecatedToken && - (!(env.SENTRY_AUTH_TOKEN?.trim() || env.SENTRY_TOKEN?.trim()) || + (!(env["SENTRY_AUTH_TOKEN"]?.trim() || env["SENTRY_TOKEN"]?.trim()) || getRcInjectedTokenSource()) ) { return env; } const forced: NodeJS.ProcessEnv = { ...env, SENTRY_FORCE_ENV_TOKEN: "1" }; if (deprecatedToken) { - delete forced.SENTRY_ACCESS_TOKEN; - delete forced.SENTRY_TOKEN; - forced.SENTRY_AUTH_TOKEN = deprecatedToken; + delete forced["SENTRY_ACCESS_TOKEN"]; + delete forced["SENTRY_TOKEN"]; + forced["SENTRY_AUTH_TOKEN"] = deprecatedToken; } if (keepStartupHost) { scopeEnvTokenToBootHost(forced); diff --git a/packages/cli/src/lib/mcp/args.ts b/packages/cli/src/lib/mcp/args.ts index 353b5691c7..cc259c2576 100644 --- a/packages/cli/src/lib/mcp/args.ts +++ b/packages/cli/src/lib/mcp/args.ts @@ -178,23 +178,23 @@ export type McpEnvArgs = { /** Flags merged over environment values, before validation. */ export type McpMergedArgs = { - host?: string; + host?: string | undefined; insecureHttp: boolean; - url?: string; - mcpUrl?: string; - openaiBaseUrl?: string; - openaiModel?: string; - anthropicBaseUrl?: string; - anthropicModel?: string; - agentProvider?: string; + url?: string | undefined; + mcpUrl?: string | undefined; + openaiBaseUrl?: string | undefined; + openaiModel?: string | undefined; + anthropicBaseUrl?: string | undefined; + anthropicModel?: string | undefined; + agentProvider?: string | undefined; /** Whether `--agent-provider` (not the environment) chose the provider. */ agentProviderFromFlag: boolean; - skills?: string; + skills?: string | undefined; allSkills: boolean; - disableSkills?: string; + disableSkills?: string | undefined; experimental: boolean; - organizationSlug?: string; - projectSlug?: string; + organizationSlug?: string | undefined; + projectSlug?: string | undefined; }; /** @@ -205,23 +205,23 @@ export type McpMergedArgs = { */ export function parseMcpEnv(env: NodeJS.ProcessEnv): McpEnvArgs { const fromEnv: McpEnvArgs = {}; - if (env.MCP_URL) { - fromEnv.mcpUrl = env.MCP_URL; + if (env["MCP_URL"]) { + fromEnv.mcpUrl = env["MCP_URL"]; } - if (env.OPENAI_MODEL) { - fromEnv.openaiModel = env.OPENAI_MODEL; + if (env["OPENAI_MODEL"]) { + fromEnv.openaiModel = env["OPENAI_MODEL"]; } - if (env.ANTHROPIC_MODEL) { - fromEnv.anthropicModel = env.ANTHROPIC_MODEL; + if (env["ANTHROPIC_MODEL"]) { + fromEnv.anthropicModel = env["ANTHROPIC_MODEL"]; } - if (env.EMBEDDED_AGENT_PROVIDER) { - fromEnv.agentProvider = env.EMBEDDED_AGENT_PROVIDER; + if (env["EMBEDDED_AGENT_PROVIDER"]) { + fromEnv.agentProvider = env["EMBEDDED_AGENT_PROVIDER"]; } - if (env.MCP_SKILLS) { - fromEnv.skills = env.MCP_SKILLS; + if (env["MCP_SKILLS"]) { + fromEnv.skills = env["MCP_SKILLS"]; } - if (env.MCP_DISABLE_SKILLS) { - fromEnv.disableSkills = env.MCP_DISABLE_SKILLS; + if (env["MCP_DISABLE_SKILLS"]) { + fromEnv.disableSkills = env["MCP_DISABLE_SKILLS"]; } return fromEnv; } diff --git a/packages/cli/src/lib/mcp/config.ts b/packages/cli/src/lib/mcp/config.ts index a8e4486611..1aaed99205 100644 --- a/packages/cli/src/lib/mcp/config.ts +++ b/packages/cli/src/lib/mcp/config.ts @@ -32,20 +32,20 @@ export type McpAgentProvider = export type McpServerConfig = { sentryHost: string; sentryProtocol: "http" | "https"; - mcpUrl?: string; - openaiBaseUrl?: string; - openaiModel?: string; - anthropicBaseUrl?: string; - anthropicModel?: string; - agentProvider?: McpAgentProvider; + mcpUrl?: string | undefined; + openaiBaseUrl?: string | undefined; + openaiModel?: string | undefined; + anthropicBaseUrl?: string | undefined; + anthropicModel?: string | undefined; + agentProvider?: McpAgentProvider | undefined; agentProviderFromFlag: boolean; experimental: boolean; /** Skills granted for this session. */ finalSkills: Set; /** Skills removed with `--disable-skills` or `MCP_DISABLE_SKILLS`. */ disabledSkills: Skill[]; - organizationSlug?: string; - projectSlug?: string; + organizationSlug?: string | undefined; + projectSlug?: string | undefined; }; const AGENT_PROVIDERS: ReadonlySet = new Set([ diff --git a/packages/cli/src/lib/mcp/scope-check.ts b/packages/cli/src/lib/mcp/scope-check.ts index 52d3e8a38f..757f0f1aba 100644 --- a/packages/cli/src/lib/mcp/scope-check.ts +++ b/packages/cli/src/lib/mcp/scope-check.ts @@ -80,7 +80,7 @@ export async function assertMcpScopeExists( }); const { organization, project } = await lookupConstraints( api, - { organizationSlug, projectSlug }, + { organizationSlug, projectSlug: projectSlug ?? null }, { projectHost: (regionUrl) => allowedRegionHost(regionUrl, config.sentryHost), diff --git a/packages/cli/src/lib/mcp/server.ts b/packages/cli/src/lib/mcp/server.ts index 636d83e9ad..1ceee0392c 100644 --- a/packages/cli/src/lib/mcp/server.ts +++ b/packages/cli/src/lib/mcp/server.ts @@ -45,6 +45,7 @@ import { import { makeNodeTransportWithDeadline } from "../telemetry/zstd-transport.js"; import type { McpServerConfig } from "./config.js"; import { reportCliError } from "../error-reporting.js"; +import { omitUndefined } from "../omit-undefined.js"; /** Credential wiring supplied by the CLI host. */ export type McpServeOptions = { @@ -74,9 +75,9 @@ function findProviderMismatch( env: NodeJS.ProcessEnv, ): ProviderMismatch | undefined { const keys = { - openai: Boolean(env.OPENAI_API_KEY), - anthropic: Boolean(env.ANTHROPIC_API_KEY), - openrouter: Boolean(env.OPENROUTER_API_KEY), + openai: Boolean(env["OPENAI_API_KEY"]), + anthropic: Boolean(env["ANTHROPIC_API_KEY"]), + openrouter: Boolean(env["OPENROUTER_API_KEY"]), }; if (configured === "openai" || configured === "azure-openai") { if (!keys.openai && (keys.anthropic || keys.openrouter)) { @@ -117,11 +118,11 @@ function expectedProviderKey(provider: string): string { /** Explain why AI-powered search tools are unavailable. */ function warnNoProvider(config: McpServerConfig, env: NodeJS.ProcessEnv): void { const configured = - config.agentProvider ?? env.EMBEDDED_AGENT_PROVIDER?.toLowerCase(); + config.agentProvider ?? env["EMBEDDED_AGENT_PROVIDER"]?.toLowerCase(); const providerKeyCount = [ - env.ANTHROPIC_API_KEY, - env.OPENAI_API_KEY, - env.OPENROUTER_API_KEY, + env["ANTHROPIC_API_KEY"], + env["OPENAI_API_KEY"], + env["OPENROUTER_API_KEY"], ].filter(Boolean).length; const mismatch = findProviderMismatch(configured, env); @@ -184,16 +185,18 @@ function configureAgentProvider( if (config.agentProvider) { setAgentProvider(config.agentProvider); } - setProviderBaseUrls({ - openaiBaseUrl: config.openaiBaseUrl, - anthropicBaseUrl: config.anthropicBaseUrl, - }); + setProviderBaseUrls( + omitUndefined({ + openaiBaseUrl: config.openaiBaseUrl, + anthropicBaseUrl: config.anthropicBaseUrl, + }), + ); // The provider factory reads model overrides from the environment. if (config.openaiModel) { - env.OPENAI_MODEL = config.openaiModel; + env["OPENAI_MODEL"] = config.openaiModel; } if (config.anthropicModel) { - env.ANTHROPIC_MODEL = config.anthropicModel; + env["ANTHROPIC_MODEL"] = config.anthropicModel; } const resolvedProvider = getResolvedProviderType(); @@ -205,7 +208,7 @@ function configureAgentProvider( let providerSource = "auto-detected"; if (config.agentProviderFromFlag) { providerSource = "explicitly configured"; - } else if (env.EMBEDDED_AGENT_PROVIDER) { + } else if (env["EMBEDDED_AGENT_PROVIDER"]) { providerSource = "from EMBEDDED_AGENT_PROVIDER"; } logger.info( @@ -432,14 +435,20 @@ export async function serveMcpStdio( }, sentryHost: config.sentryHost, sentryProtocol: config.sentryProtocol, - mcpUrl: config.mcpUrl, - openaiBaseUrl: config.openaiBaseUrl, + ...(config.mcpUrl !== undefined && { mcpUrl: config.mcpUrl }), + ...(config.openaiBaseUrl !== undefined && { + openaiBaseUrl: config.openaiBaseUrl, + }), experimentalMode: config.experimental, transport: "stdio", // mcp-core uses the returned token for later tool calls, so a // long-running server recovers from an expired CLI session. - onUpstreamUnauthorized: options.refreshAccessToken, - credentialRouter: options.credentialRouter, + ...(options.refreshAccessToken && { + onUpstreamUnauthorized: options.refreshAccessToken, + }), + ...(options.credentialRouter && { + credentialRouter: options.credentialRouter, + }), }; const server = buildServer({ diff --git a/packages/cli/src/lib/mutate-command.ts b/packages/cli/src/lib/mutate-command.ts index fd57ae82c6..d65e26de94 100644 --- a/packages/cli/src/lib/mutate-command.ts +++ b/packages/cli/src/lib/mutate-command.ts @@ -320,20 +320,20 @@ export function buildDeleteCommand< // Auto-inject common flags and aliases into parameters const params = builderArgs.parameters ?? {}; - const existingFlags = (params.flags ?? {}) as Record; - const existingAliases = (params.aliases ?? {}) as Record; + const existingFlags = (params["flags"] ?? {}) as Record; + const existingAliases = (params["aliases"] ?? {}) as Record; const mergedFlags = { ...existingFlags }; const mergedAliases = { ...existingAliases }; // Always inject --yes unless the command already defines it if (!("yes" in mergedFlags)) { - mergedFlags.yes = YES_FLAG; + mergedFlags["yes"] = YES_FLAG; } // Inject --force unless opted out or already defined if (!(options?.noForceFlag || "force" in mergedFlags)) { - mergedFlags.force = FORCE_FLAG; + mergedFlags["force"] = FORCE_FLAG; } // Inject --dry-run unless opted out or already defined @@ -343,17 +343,17 @@ export function buildDeleteCommand< // Inject -y alias unless already defined if (!("y" in mergedAliases)) { - mergedAliases.y = "yes"; + mergedAliases["y"] = "yes"; } // Inject -f alias unless force is opted out or already defined if (!(options?.noForceFlag || "f" in mergedAliases)) { - mergedAliases.f = "force"; + mergedAliases["f"] = "force"; } // Inject -n alias unless dry-run is opted out or already defined if (!(options?.noDryRunFlag || "n" in mergedAliases)) { - mergedAliases.n = "dry-run"; + mergedAliases["n"] = "dry-run"; } const mergedParams = { diff --git a/packages/cli/src/lib/oauth.ts b/packages/cli/src/lib/oauth.ts index b6a7010d89..3a4c668901 100644 --- a/packages/cli/src/lib/oauth.ts +++ b/packages/cli/src/lib/oauth.ts @@ -77,7 +77,7 @@ const DEFAULT_OAUTH_CLIENT_ID = declare const SENTRY_CLIENT_ID_BUILD: string | undefined; function getClientId(): string { return ( - getEnv().SENTRY_CLIENT_ID ?? + getEnv()["SENTRY_CLIENT_ID"] ?? (typeof SENTRY_CLIENT_ID_BUILD !== "undefined" ? SENTRY_CLIENT_ID_BUILD : DEFAULT_OAUTH_CLIENT_ID) @@ -490,12 +490,12 @@ export type StoreTokenOptions = { * re-authentication (`sentry auth login --force`, `sentry auth refresh`, * automatic login) expects. */ - newAccount?: boolean; + newAccount?: boolean | undefined; /** * Re-authorize this stored account in place instead of the active one * (scope recovery for an account picked for the target org). */ - accountId?: string; + accountId?: string | undefined; }; /** diff --git a/packages/cli/src/lib/omit-undefined.ts b/packages/cli/src/lib/omit-undefined.ts new file mode 100644 index 0000000000..6d7a9ee2f0 --- /dev/null +++ b/packages/cli/src/lib/omit-undefined.ts @@ -0,0 +1,39 @@ +/** + * Object Key Utilities + * + * With `exactOptionalPropertyTypes`, an optional property (`key?: T`) does + * not accept an explicit `undefined`. Dependency types, such as the `query` + * objects of `@sentry/api` or Sentry SDK event fields, declare optional keys + * this way, while callers forward values that may be `undefined`. These + * helpers drop those keys for APIs that treat an absent key as "not set". + */ + +/** Keys of `T` whose value can be `undefined`. */ +type UndefinedKeys = { + [K in keyof T]-?: undefined extends T[K] ? K : never; +}[keyof T]; + +/** + * `T` with every key that can hold `undefined` made optional, without + * `undefined` in its value type. + */ +export type OmitUndefined = Omit> & { + [K in UndefinedKeys]?: Exclude; +}; + +/** + * Copy `value` without the keys whose value is `undefined`. + * + * @param value - Object whose `undefined` values mean "not set" + * @returns A shallow copy without those keys + */ +export function omitUndefined(value: T): OmitUndefined { + const out: Record = {}; + for (const [key, entry] of Object.entries(value)) { + if (entry !== undefined) { + out[key] = entry; + } + } + // The loop copied exactly the keys that OmitUndefined keeps. + return out as OmitUndefined; +} diff --git a/packages/cli/src/lib/org-list.ts b/packages/cli/src/lib/org-list.ts index 4be9bc968f..16b2c4ca7e 100644 --- a/packages/cli/src/lib/org-list.ts +++ b/packages/cli/src/lib/org-list.ts @@ -101,15 +101,15 @@ export type ListResult = { /** Whether a previous page exists (for bidirectional hint generation) */ hasPrev?: boolean; /** Cursor for fetching the next page (only in paginated modes) */ - nextCursor?: string | null; + nextCursor?: string | null | undefined; /** Human-readable hint lines (tips, warnings, notes). Suppressed in JSON mode. */ - hint?: string; + hint?: string | undefined; /** Header/title text shown above the table in human mode */ - header?: string; + header?: string | undefined; /** Fetch errors from partial failures (included in JSON output as `errors` key) */ - errors?: unknown[]; + errors?: unknown[] | undefined; /** Extra metadata to include in the JSON envelope */ - jsonExtra?: Record; + jsonExtra?: Record | undefined; }; /** @@ -231,9 +231,9 @@ export function distributeFetchBudget( /** Cursor metadata required by the shared multi-group fetcher. */ export type ListFetchPage = { /** Whether the group has additional items. */ - hasMore?: boolean; + hasMore?: boolean | undefined; /** Server cursor, absent when the group is exhausted. */ - nextCursor?: string; + nextCursor?: string | undefined; }; /** A group's item budget and optional position within that group's results. */ @@ -241,7 +241,7 @@ export type GroupFetchOptions = { /** Maximum items to fetch for this group. */ limit: number; /** Resume cursor; undefined starts at the group's first page. */ - startCursor?: string; + startCursor?: string | undefined; }; /** Domain adapters for fetching pages within one global item budget. */ @@ -452,7 +452,11 @@ export type OrgListConfig< */ listPaginated: ( orgSlug: string, - opts: { cursor?: string; perPage: number; query?: string }, + opts: { + cursor?: string | undefined; + perPage: number; + query?: string | undefined; + }, ) => Promise>; /** @@ -546,13 +550,13 @@ export type HandlerContext< * * Present only when project-search mode continues to a handler. */ - projectSearchResolution?: ProjectSearchTargetResolution; + projectSearchResolution?: ProjectSearchTargetResolution | undefined; /** * Name filter (glob or fuzzy text) from the command line, if any. Handlers * must apply it to the whole result set before `--limit`; the dispatcher * already rejects it with `--cursor`. */ - filter?: string; + filter?: string | undefined; }; /** @@ -1007,16 +1011,18 @@ export async function handleProjectSearch( flags: BaseListFlags; orgAllFallback?: (orgSlug: string) => Promise>; /** Original user input before normalization — for clearer messages. */ - originalSlug?: string; + originalSlug?: string | undefined; /** Organization slug to scope the search to (e.g. from "org/My Project"). */ - org?: string; + org?: string | undefined; /** Classification supplied by the dispatcher after its target pre-check. */ - projectSearchResolution?: ProjectSearchTargetResolution; + projectSearchResolution?: ProjectSearchTargetResolution | undefined; /** * Tried when no project matches: entities named like the slug, or * `undefined` to report the missing project as before. */ - notFoundFallback?: () => Promise | undefined>; + notFoundFallback?: + | (() => Promise | undefined>) + | undefined; }, ): Promise> { const { @@ -1446,7 +1452,7 @@ export type DispatchOptions = { * handlers apply it with the config's `namesOf`; overrides receive it as * `ctx.filter`. Rejected together with `--cursor`. */ - filter?: string; + filter?: string | undefined; }; type OrgSlugMatchResult = { diff --git a/packages/cli/src/lib/polling.ts b/packages/cli/src/lib/polling.ts index 776d28f19a..c8878171b0 100644 --- a/packages/cli/src/lib/polling.ts +++ b/packages/cli/src/lib/polling.ts @@ -38,7 +38,7 @@ export type PollOptions = { /** Suppress progress output (JSON mode) */ json?: boolean; /** Poll interval in ms (default: 1000) */ - pollIntervalMs?: number; + pollIntervalMs?: number | undefined; /** Timeout in ms (default: 360000 / 6 min) */ timeoutMs?: number; /** Custom timeout message */ @@ -164,7 +164,7 @@ export type WithProgressOptions = { message: string; /** Suppress progress output (JSON mode). When true, the operation runs * without a spinner — matching the behaviour of {@link poll}. */ - json?: boolean; + json?: boolean | undefined; /** * Suppress progress when stdout is not a terminal, even if rich output is * explicitly forced. Use for terminal-only feedback that must not enter a diff --git a/packages/cli/src/lib/project-context.ts b/packages/cli/src/lib/project-context.ts index f872228c24..99a827b67a 100644 --- a/packages/cli/src/lib/project-context.ts +++ b/packages/cli/src/lib/project-context.ts @@ -47,12 +47,12 @@ export async function preloadProjectContext(cwd: string): Promise { // Apply persistent URL default (lower priority than env vars and .sentryclirc). const env = getEnv(); - if (!(env.SENTRY_HOST?.trim() || env.SENTRY_URL?.trim())) { + if (!(env["SENTRY_HOST"]?.trim() || env["SENTRY_URL"]?.trim())) { try { const { getDefaultUrl } = await import("./db/defaults.js"); const url = getDefaultUrl(); if (url) { - env.SENTRY_URL = url; + env["SENTRY_URL"] = url; const { markPersistedDefaultUrl } = await import("./constants.js"); markPersistedDefaultUrl(url); } diff --git a/packages/cli/src/lib/prompt.ts b/packages/cli/src/lib/prompt.ts index ab40475b76..c582b010ce 100644 --- a/packages/cli/src/lib/prompt.ts +++ b/packages/cli/src/lib/prompt.ts @@ -52,13 +52,16 @@ export async function prompt( // The `else` lets esbuild drop this import from the completion bundle. const clack = await import("@clack/prompts"); if (opts.type === "confirm") { - return await clack.confirm({ message, initialValue: opts.initial }); + return await clack.confirm({ + message, + ...(opts.initial !== undefined && { initialValue: opts.initial }), + }); } return await clack.text({ message, - placeholder: opts.placeholder, - initialValue: opts.initial, - defaultValue: opts.default, + ...(opts.placeholder !== undefined && { placeholder: opts.placeholder }), + ...(opts.initial !== undefined && { initialValue: opts.initial }), + ...(opts.default !== undefined && { defaultValue: opts.default }), }); } } diff --git a/packages/cli/src/lib/react-native/wrap-call.ts b/packages/cli/src/lib/react-native/wrap-call.ts index 01a27229b6..91a5cc9661 100644 --- a/packages/cli/src/lib/react-native/wrap-call.ts +++ b/packages/cli/src/lib/react-native/wrap-call.ts @@ -22,10 +22,10 @@ const log = logger.withTag("react-native.wrap"); /** Paths discovered while wrapping the RN build tools. */ export type SourceMapReport = { - packager_bundle_path?: string; - packager_sourcemap_path?: string; - hermes_bundle_path?: string; - hermes_sourcemap_path?: string; + packager_bundle_path?: string | undefined; + packager_sourcemap_path?: string | undefined; + hermes_bundle_path?: string | undefined; + hermes_sourcemap_path?: string | undefined; }; /** Whether this process is a Node Single Executable Application. */ @@ -131,12 +131,12 @@ function copyDebugId(report: SourceMapReport): void { if ("debugId" in hermes || "debug_id" in hermes) { return; } - const debugId = pkg.debugId ?? pkg.debug_id; + const debugId = pkg["debugId"] ?? pkg["debug_id"]; if (debugId === undefined) { return; } - hermes.debugId = debugId; - hermes.debug_id = debugId; + hermes["debugId"] = debugId; + hermes["debug_id"] = debugId; writeFileSync(hermesPath, JSON.stringify(hermes)); } @@ -153,8 +153,8 @@ function isComposeCommand(args: string[], env: NodeJS.ProcessEnv): boolean { } return ( first.endsWith("compose-source-maps.js") || - (Boolean(env.COMPOSE_SOURCEMAP_PATH) && - first === env.COMPOSE_SOURCEMAP_PATH) + (Boolean(env["COMPOSE_SOURCEMAP_PATH"]) && + first === env["COMPOSE_SOURCEMAP_PATH"]) ); } @@ -164,7 +164,7 @@ function classifyInvocation( env: NodeJS.ProcessEnv, report: SourceMapReport, ): { executeHermes: boolean; shouldCopyDebugId: boolean } { - if (isBundleCommand(args, env.SENTRY_RN_BUNDLE_COMMAND)) { + if (isBundleCommand(args, env["SENTRY_RN_BUNDLE_COMMAND"])) { handleBundle(args, report); return { executeHermes: false, shouldCopyDebugId: false }; } @@ -180,13 +180,13 @@ function classifyInvocation( } export function wrapCall(env: NodeJS.ProcessEnv = process.env): number { - const reportPath = env.SENTRY_RN_SOURCEMAP_REPORT; + const reportPath = env["SENTRY_RN_SOURCEMAP_REPORT"]; if (!reportPath) { throw new Error("SENTRY_RN_SOURCEMAP_REPORT is not set"); } const report = loadReport(reportPath); const args = getWrapArgs(); - const noDebugId = env.SENTRY_RN_NO_DEBUG_ID === "1"; + const noDebugId = env["SENTRY_RN_NO_DEBUG_ID"] === "1"; const { executeHermes, shouldCopyDebugId } = classifyInvocation( args, @@ -195,8 +195,8 @@ export function wrapCall(env: NodeJS.ProcessEnv = process.env): number { ); const executable = executeHermes - ? env.SENTRY_RN_REAL_HERMES_CLI_PATH - : env.SENTRY_RN_REAL_NODE_BINARY; + ? env["SENTRY_RN_REAL_HERMES_CLI_PATH"] + : env["SENTRY_RN_REAL_NODE_BINARY"]; if (!executable) { throw new Error( "Missing SENTRY_RN_REAL_NODE_BINARY / SENTRY_RN_REAL_HERMES_CLI_PATH", diff --git a/packages/cli/src/lib/react-native/xcode-env.ts b/packages/cli/src/lib/react-native/xcode-env.ts index 5b1c2fbe89..978662bb98 100644 --- a/packages/cli/src/lib/react-native/xcode-env.ts +++ b/packages/cli/src/lib/react-native/xcode-env.ts @@ -11,6 +11,7 @@ import { readdirSync } from "node:fs"; import { readFile } from "node:fs/promises"; import { dirname, join, resolve } from "node:path"; import { logger } from "../logger.js"; +import { omitUndefined } from "../omit-undefined.js"; const log = logger.withTag("react-native.xcode-env"); @@ -40,7 +41,7 @@ type Env = Record; * `find_node`: `NODE_BINARY` if set and non-empty, else `node`. */ export function findNode(env: Env): string { - const fromEnv = env.NODE_BINARY; + const fromEnv = env["NODE_BINARY"]; return fromEnv && fromEnv.length > 0 ? fromEnv : "node"; } @@ -49,11 +50,11 @@ export function findNode(env: Env): string { * `HERMES_CLI_PATH` if set, else `$PODS_ROOT/hermes-engine/destroot/bin/hermesc`. */ export function findHermesc(env: Env): string { - const fromEnv = env.HERMES_CLI_PATH; + const fromEnv = env["HERMES_CLI_PATH"]; if (fromEnv && fromEnv.length > 0) { return fromEnv; } - const podsRoot = env.PODS_ROOT ?? ""; + const podsRoot = env["PODS_ROOT"] ?? ""; return `${podsRoot}/hermes-engine/destroot/bin/hermesc`; } @@ -117,10 +118,10 @@ export function parseInfoPlistStrings(xml: string): Record { /** Build an {@link InfoPlist} purely from Xcode build-setting env vars. */ function fromEnvVars(vars: Env): InfoPlist | null { - const name = vars.PRODUCT_NAME; - const bundleId = vars.PRODUCT_BUNDLE_IDENTIFIER; - const version = vars.MARKETING_VERSION; - const build = vars.CURRENT_PROJECT_VERSION; + const name = vars["PRODUCT_NAME"]; + const bundleId = vars["PRODUCT_BUNDLE_IDENTIFIER"]; + const version = vars["MARKETING_VERSION"]; + const build = vars["CURRENT_PROJECT_VERSION"]; if (!(name && bundleId && version && build)) { return null; } @@ -147,12 +148,12 @@ function runCapture(cmd: string, args: string[]): string | null { /** Extract the four CFBundle* fields from a parsed plist string map. */ function toPartialPlist(raw: Record): Partial { - return { - name: raw.CFBundleName, - bundleId: raw.CFBundleIdentifier, - version: raw.CFBundleShortVersionString, - build: raw.CFBundleVersion, - }; + return omitUndefined({ + name: raw["CFBundleName"], + bundleId: raw["CFBundleIdentifier"], + version: raw["CFBundleShortVersionString"], + build: raw["CFBundleVersion"], + }); } /** @@ -165,11 +166,11 @@ function preprocessPlist( vars: Env, ): Record | null { const args = ["-xc", "-P", "-E"]; - const other = vars.INFOPLIST_OTHER_PREPROCESSOR_FLAGS; + const other = vars["INFOPLIST_OTHER_PREPROCESSOR_FLAGS"]; if (other) { args.push(...other.split(WHITESPACE).filter(Boolean)); } - const defs = vars.INFOPLIST_PREPROCESSOR_DEFINITIONS; + const defs = vars["INFOPLIST_PREPROCESSOR_DEFINITIONS"]; if (defs) { for (const token of defs.split(WHITESPACE).filter(Boolean)) { args.push(`-D${token}`); @@ -194,7 +195,7 @@ async function loadAndProcess( allowPreprocessing: boolean, ): Promise { const shouldPreprocess = - allowPreprocessing && vars.INFOPLIST_PREPROCESS === "YES"; + allowPreprocessing && vars["INFOPLIST_PREPROCESS"] === "YES"; let raw: Record | null = null; if (shouldPreprocess) { raw = preprocessPlist(path, vars); @@ -328,11 +329,11 @@ async function fromProjectInfo( return null; } const vars = getBuildVars(pi.path, target, config); - const infoPlistFile = vars.INFOPLIST_FILE; + const infoPlistFile = vars["INFOPLIST_FILE"]; if (!infoPlistFile) { return null; } - const base = vars.PROJECT_DIR ?? dirname(pi.path); + const base = vars["PROJECT_DIR"] ?? dirname(pi.path); return await loadAndProcess( resolve(base, infoPlistFile), vars, @@ -356,12 +357,12 @@ export async function discoverInfoPlist( cwd: string, allowPreprocessing = false, ): Promise { - if (env.XCODE_VERSION_ACTUAL) { - const filename = env.INFOPLIST_FILE; + if (env["XCODE_VERSION_ACTUAL"]) { + const filename = env["INFOPLIST_FILE"]; if (!filename) { return fromEnvVars(env); } - const path = resolve(cwd, env.PROJECT_DIR ?? ".", filename); + const path = resolve(cwd, env["PROJECT_DIR"] ?? ".", filename); return await loadAndProcess(path, env, allowPreprocessing); } const pi = getXcodeProjectInfo(cwd); @@ -373,8 +374,8 @@ export async function discoverInfoPlist( /** A resolved release + distribution for the sourcemap upload. */ export type ReleaseAndDist = { - release?: string; - dist?: string; + release?: string | undefined; + dist?: string | undefined; }; /** @@ -393,8 +394,8 @@ export async function resolveReleaseAndDist( noAutoRelease: boolean, allowPreprocessing = false, ): Promise { - const distEnv = env.SENTRY_DIST; - const releaseEnv = env.SENTRY_RELEASE; + const distEnv = env["SENTRY_DIST"]; + const releaseEnv = env["SENTRY_RELEASE"]; if (!(distEnv || releaseEnv) && noAutoRelease) { return {}; diff --git a/packages/cli/src/lib/region.ts b/packages/cli/src/lib/region.ts index c27261e4eb..7e0e0c38d6 100644 --- a/packages/cli/src/lib/region.ts +++ b/packages/cli/src/lib/region.ts @@ -27,6 +27,7 @@ import { normalizeHttpOrigin, normalizeRegionBaseUrl, } from "./sentry-urls.js"; +import { rethrow } from "./rethrow.js"; /** * Promise cache for org region resolution, keyed by orgSlug. @@ -157,7 +158,7 @@ async function resolveOrgRegionUncached( // Throw SDK errors so withAuthGuard can discriminate: // AuthError propagates, others fall back to default URL if (response.error !== undefined) { - throw response.error; + rethrow(response.error); } // Self-hosted instances may return a relative regionUrl (e.g. "/") which @@ -248,6 +249,7 @@ function resolveOrgFromCache(orgSlug: string): string | undefined { return match.slug; } } + return undefined; } /** diff --git a/packages/cli/src/lib/release-notes.ts b/packages/cli/src/lib/release-notes.ts index 338df0db11..9ae2024f81 100644 --- a/packages/cli/src/lib/release-notes.ts +++ b/packages/cli/src/lib/release-notes.ts @@ -423,7 +423,7 @@ function mergeSectionsByCategory(releases: GitHubRelease[]): ChangeSection[] { /** Options for source-aware changelog summary construction. */ type ChangelogBuildOptions = { /** Maximum total list items across all sections, or unlimited when omitted. */ - maxItems?: number; + maxItems?: number | undefined; /** Selected release source whose tag prefix filters the release list. */ source?: UpgradeSource; }; @@ -741,11 +741,11 @@ export type FetchChangelogOptions = { /** Target version */ toVersion: string; /** Maximum list items to include */ - maxItems?: number; + maxItems?: number | undefined; /** Pre-fetched releases to avoid redundant API call (stable channel only) */ - prefetchedReleases?: NormalizedGitHubReleases; + prefetchedReleases?: NormalizedGitHubReleases | undefined; /** Release source selected during version discovery; defaults to the primary source */ - source?: UpgradeSource; + source?: UpgradeSource | undefined; }; /** diff --git a/packages/cli/src/lib/replay-rrweb.ts b/packages/cli/src/lib/replay-rrweb.ts index a331e693d3..2908a3ceeb 100644 --- a/packages/cli/src/lib/replay-rrweb.ts +++ b/packages/cli/src/lib/replay-rrweb.ts @@ -32,7 +32,7 @@ export function toRRWebEvents(segments: ReplayRecordingSegments): RRWebEvent[] { /** Whether the events include a full DOM snapshot, which playback requires. */ export function hasFullSnapshot(events: RRWebEvent[]): boolean { - return events.some((event) => event.type === EVENT_TYPE_FULL_SNAPSHOT); + return events.some((event) => event["type"] === EVENT_TYPE_FULL_SNAPSHOT); } /** Recording length in milliseconds, from the first to the last event. */ @@ -55,7 +55,7 @@ function normalizeTimestamp(event: RRWebEvent): RRWebEvent { } function timestampOf(event: RRWebEvent): number { - return typeof event.timestamp === "number" ? event.timestamp : 0; + return typeof event["timestamp"] === "number" ? event["timestamp"] : 0; } const EVENT_TYPE_FULL_SNAPSHOT = 2; diff --git a/packages/cli/src/lib/resolve-target.ts b/packages/cli/src/lib/resolve-target.ts index 4d66ce460f..69b4659682 100644 --- a/packages/cli/src/lib/resolve-target.ts +++ b/packages/cli/src/lib/resolve-target.ts @@ -121,15 +121,15 @@ export type ResolvedTarget = { /** Project slug for API calls */ project: string; /** Numeric project ID for API query params (avoids "not actively selected" errors) */ - projectId?: number; + projectId?: number | undefined; /** Human-readable org name (falls back to slug) */ orgDisplay: string; /** Human-readable project name (falls back to slug) */ projectDisplay: string; /** Source description if auto-detected (e.g., ".env.local", "src/index.ts") */ - detectedFrom?: string; + detectedFrom?: string | undefined; /** Package path in monorepo (e.g., "packages/frontend") */ - packagePath?: string; + packagePath?: string | undefined; /** Full project data when already fetched (avoids redundant getProject re-fetch) */ projectData?: SentryProject; }; @@ -223,9 +223,9 @@ export type ResolvedTargets = { /** All resolved targets */ targets: ResolvedTarget[]; /** Footer message to display if multiple projects detected */ - footer?: string; + footer?: string | undefined; /** Number of self-hosted DSNs that were detected but couldn't be resolved */ - skippedSelfHosted?: number; + skippedSelfHosted?: number | undefined; /** All detected DSNs (for fingerprinting in alias cache) */ detectedDsns?: DetectedDsn[]; }; @@ -237,7 +237,7 @@ export type ResolvedOrg = { /** Organization slug for API calls */ org: string; /** Source description if auto-detected */ - detectedFrom?: string; + detectedFrom?: string | undefined; }; /** @@ -245,15 +245,15 @@ export type ResolvedOrg = { */ export type ResolveOptions = { /** Organization slug */ - org?: string; + org?: string | undefined; /** Project slug */ - project?: string; + project?: string | undefined; /** Current working directory for DSN detection */ cwd: string; /** Usage hint shown when only one of org/project is provided */ usageHint?: string; /** Format a retry command for an explicit org/project candidate after detection fails. */ - formatRecoveryCommand?: (target: string) => string; + formatRecoveryCommand?: ((target: string) => string) | undefined; /** * Whether an interactive org/project picker may be shown when auto-detection * fails. Only consulted by {@link resolveOrgProjectOrGuide}. When omitted, it @@ -268,7 +268,7 @@ export type ResolveOptions = { */ export type ResolveOrgOptions = { /** Organization slug */ - org?: string; + org?: string | undefined; /** Current working directory for DSN detection */ cwd: string; }; @@ -669,18 +669,19 @@ async function inferFromDirectoryName(cwd: string): Promise { // Cache all matches for faster subsequent lookups const [primary] = matches; if (primary) { - const allResolved = matches.map((m) => ({ + const toResolvedInfo = (m: (typeof matches)[number]) => ({ orgSlug: m.orgSlug, orgName: m.organization?.name ?? m.orgSlug, projectSlug: m.slug, projectName: m.name, - })); + }); + const allResolved = matches.map(toResolvedInfo); setCachedDsn(projectRoot, { dsn: "", // No DSN for inferred projectId: primary.id, source: "inferred", - resolved: allResolved[0], // Primary for backwards compatibility + resolved: toResolvedInfo(primary), // Primary for backwards compatibility allResolved, }); } @@ -723,7 +724,7 @@ function resolveFromEnvVars(): { project?: string; detectedFrom: string; } | null { - const rawProject = getEnv().SENTRY_PROJECT?.trim(); + const rawProject = getEnv()["SENTRY_PROJECT"]?.trim(); // SENTRY_PROJECT=org/project combo takes priority. // If the value contains a slash it is always treated as combo notation; @@ -737,11 +738,11 @@ function resolveFromEnvVars(): { return { org, project, detectedFrom: "SENTRY_PROJECT env var" }; } // Malformed combo — fall through without using rawProject as a slug - const envOrg = getEnv().SENTRY_ORG?.trim(); + const envOrg = getEnv()["SENTRY_ORG"]?.trim(); return envOrg ? { org: envOrg, detectedFrom: "SENTRY_ORG env var" } : null; } - const envOrg = getEnv().SENTRY_ORG?.trim(); + const envOrg = getEnv()["SENTRY_ORG"]?.trim(); if (envOrg && rawProject) { return { @@ -1982,7 +1983,7 @@ type ContextProjectCandidates = { /** Explicit org/project values that the caller may choose. */ targets: string[]; /** Explains incomplete discovery without claiming the shown targets are exhaustive. */ - note?: string; + note?: string | undefined; }; /** Fetch one page of project candidates without turning discovery failures into command failures. */ @@ -2364,9 +2365,9 @@ export type OrgListResolution = { /** Organization slugs to list from */ orgs: string[]; /** Optional multi-org footer to display after listing */ - footer?: string; + footer?: string | undefined; /** Number of self-hosted DSNs that could not be resolved */ - skippedSelfHosted?: number; + skippedSelfHosted?: number | undefined; }; /** @@ -2595,8 +2596,8 @@ export function resolveProjectBoundFromArg( */ export type MultiTargetResolutionResult = { targets: ResolvedTarget[]; - footer?: string; - skippedSelfHosted?: number; + footer?: string | undefined; + skippedSelfHosted?: number | undefined; detectedDsns?: DetectedDsn[]; /** Set instead of `targets` when `orgWideFallback` applied. */ soleOrg?: string; @@ -2611,7 +2612,7 @@ export type ResolveProjectBoundTargetsOptions = { /** Format a retry command for an explicit org/project candidate after detection fails. */ formatRecoveryCommand?: (target: string) => string; /** Request-scoped project-search classification from a dispatcher. */ - projectSearchResolution?: ProjectSearchTargetResolution; + projectSearchResolution?: ProjectSearchTargetResolution | undefined; /** * Auto-detect mode only: enrich targets that lack a numeric `projectId` by * fetching from the project API. Useful when env-var / config-default paths diff --git a/packages/cli/src/lib/resolve-team.ts b/packages/cli/src/lib/resolve-team.ts index c67b010b70..d9ff63fe01 100644 --- a/packages/cli/src/lib/resolve-team.ts +++ b/packages/cli/src/lib/resolve-team.ts @@ -58,9 +58,9 @@ async function fetchOrgListHint(fallbackHint: string): Promise { /** Options for resolving a team within an organization */ export type ResolveTeamOptions = { /** Explicit team slug from --team flag */ - team?: string; + team?: string | undefined; /** Source of the auto-detected org, shown in error messages */ - detectedFrom?: string; + detectedFrom?: string | undefined; /** Usage hint shown in errors (e.g., "sentry project create /:") */ usageHint: string; /** diff --git a/packages/cli/src/lib/response-cache.ts b/packages/cli/src/lib/response-cache.ts index 788d585a53..b87a6350f8 100644 --- a/packages/cli/src/lib/response-cache.ts +++ b/packages/cli/src/lib/response-cache.ts @@ -177,7 +177,7 @@ export function isCacheDisabled(): boolean { * freshly-fetched response replaces any stale cache entry. */ function isCacheWriteDisabled(): boolean { - return getEnv().SENTRY_NO_CACHE === "1" || isPersistenceDisabled(); + return getEnv()["SENTRY_NO_CACHE"] === "1" || isPersistenceDisabled(); } // --------------------------------------------------------------------------- diff --git a/packages/cli/src/lib/rethrow.ts b/packages/cli/src/lib/rethrow.ts new file mode 100644 index 0000000000..161f464dda --- /dev/null +++ b/packages/cli/src/lib/rethrow.ts @@ -0,0 +1,13 @@ +/** + * Rethrow a value caught earlier, unchanged. + * + * Code that records a failure in a callback and throws it once the work + * settles keeps the caught value as `unknown`. Checking that a value was + * recorded (`!== undefined`, `!== null`) narrows `unknown` to `{}`, which + * `typescript/only-throw-error` rejects even though the value is the caught + * error. Route those deferred rethrows through this function; throw `Error` + * instances everywhere else. + */ +export function rethrow(error: unknown): never { + throw error; +} diff --git a/packages/cli/src/lib/route-map.ts b/packages/cli/src/lib/route-map.ts index 53e98e908c..1b0fb579fa 100644 --- a/packages/cli/src/lib/route-map.ts +++ b/packages/cli/src/lib/route-map.ts @@ -61,6 +61,6 @@ export function buildRouteMap< aliases: { ...autoAliases, ...args.aliases, - } as RouteMapBuilderArguments["aliases"], + } as NonNullable["aliases"]>, }); } diff --git a/packages/cli/src/lib/scan/concurrent.ts b/packages/cli/src/lib/scan/concurrent.ts index f0cb1f36dc..e563032679 100644 --- a/packages/cli/src/lib/scan/concurrent.ts +++ b/packages/cli/src/lib/scan/concurrent.ts @@ -22,13 +22,13 @@ import { CONCURRENCY_LIMIT } from "./constants.js"; /** Common options for the two concurrent helpers. */ export type ConcurrentOptions = { /** Max in-flight tasks. Default: `CONCURRENCY_LIMIT` (50). */ - concurrency?: number; + concurrency?: number | undefined; /** * Abort mid-stream. When aborted, the next `yield` (stream variant) * or the `await` inside `mapFilesConcurrent` throws an * `AbortError`. In-flight tasks are left to settle on their own. */ - signal?: AbortSignal; + signal?: AbortSignal | undefined; }; /** @@ -205,7 +205,7 @@ export async function* mapFilesConcurrentStream( // the post-try body), so an error thrown outside this block // would be silently lost on the break path. if (producerError) { - // oxlint-disable-next-line no-unsafe-finally -- intentional — this is the only path to surface producer errors on the break path + // oxlint-disable-next-line no-unsafe-finally, typescript/only-throw-error -- intentional — this is the only path to surface producer errors on the break path; rethrows the caught value unchanged throw producerError; } } diff --git a/packages/cli/src/lib/scan/grep.ts b/packages/cli/src/lib/scan/grep.ts index 6c953d9dd4..eebf549525 100644 --- a/packages/cli/src/lib/scan/grep.ts +++ b/packages/cli/src/lib/scan/grep.ts @@ -304,7 +304,7 @@ async function* grepFilesInternal( } function shouldUseWorkers(): boolean { - if (process.env.SENTRY_SCAN_DISABLE_WORKERS === "1") { + if (process.env["SENTRY_SCAN_DISABLE_WORKERS"] === "1") { return false; } return isWorkerSupported(); @@ -528,7 +528,7 @@ async function* grepViaWorkers( await Promise.allSettled(dispatchPromises); } if (producerError !== null) { - // oxlint-disable-next-line no-unsafe-finally -- re-raising walker error (e.g. AbortError) so callers see it + // oxlint-disable-next-line no-unsafe-finally, typescript/only-throw-error -- re-raising the caught walker error (e.g. AbortError) unchanged so callers see it throw producerError; } // If every dispatched batch failed, the "no matches" result is diff --git a/packages/cli/src/lib/scan/regex.ts b/packages/cli/src/lib/scan/regex.ts index 5c527e8fad..16f73abb57 100644 --- a/packages/cli/src/lib/scan/regex.ts +++ b/packages/cli/src/lib/scan/regex.ts @@ -167,7 +167,7 @@ export type CompilePatternOptions = { * When false, forces the `i` flag regardless of inline flags. * Default: true (case-sensitive, matching `rg`'s default). */ - caseSensitive?: boolean; + caseSensitive?: boolean | undefined; /** Force the `m` flag. Default: false. */ multiline?: boolean; }; diff --git a/packages/cli/src/lib/scan/types.ts b/packages/cli/src/lib/scan/types.ts index 75bb79710d..bd5b52db3c 100644 --- a/packages/cli/src/lib/scan/types.ts +++ b/packages/cli/src/lib/scan/types.ts @@ -65,7 +65,7 @@ export type WalkOptions = { * When unset, all files are considered — binary classification still * runs, callers just see `isBinary: true` entries they can filter. */ - extensions?: ReadonlySet; + extensions?: ReadonlySet | undefined; // --- Skip policy --- /** @@ -75,42 +75,42 @@ export type WalkOptions = { * directory named `node_modules` is skipped. Spread * `DSN_ADDITIONAL_SKIP_DIRS` for stricter DSN-scanner policy. */ - alwaysSkipDirs?: readonly string[]; + alwaysSkipDirs?: readonly string[] | undefined; /** * Include dotfiles (files and dirs whose basename starts with `.`). * Defaults to `true`, matching `rg --hidden`. `false` skips them — * independent of `.gitignore`, so e.g. `.env` is hidden even if the * `.gitignore` doesn't mention it. */ - hidden?: boolean; + hidden?: boolean | undefined; /** Respect `.gitignore` files found during the walk. Default: true. */ - respectGitignore?: boolean; + respectGitignore?: boolean | undefined; /** * Load nested `.gitignore` files as the walker descends. When true, * child patterns are applied on top of parent patterns with git-like * cumulative semantics. When false, only the root `.gitignore` is * read. Default: true. */ - nestedGitignore?: boolean; + nestedGitignore?: boolean | undefined; // --- Size / depth --- /** * Skip files larger than this. Defaults to `MAX_FILE_SIZE` (256 KB) — * large files rarely contain relevant config/source content. */ - maxFileSize?: number; + maxFileSize?: number | undefined; /** * Exhaustive must-scan depth. The walker visits every directory at * depth ≤ `minDepth` regardless of wall-clock. Default: 0 — no * minimum guaranteed depth; `timeBudgetMs` alone controls the walk. * DSN callers pass `3`. */ - minDepth?: number; + minDepth?: number | undefined; /** * Hard depth cap. Files at depth > `maxDepth` are never yielded. * Default: Infinity. */ - maxDepth?: number; + maxDepth?: number | undefined; /** * Compute the depth of a child directory. The walker calls this * when descending into `relPath`, passing the parent's current @@ -121,7 +121,7 @@ export type WalkOptions = { * override with a closure that returns 0 on package-dir matches. * The hook is consulted once per descent, so it must be cheap. */ - descentHook?: (relPath: string, currentDepth: number) => number; + descentHook?: ((relPath: string, currentDepth: number) => number) | undefined; // --- Symlinks + cancellation --- /** @@ -129,13 +129,13 @@ export type WalkOptions = { * each symlink via `stat` and maintains a visited `dev:ino` set to * avoid cycles. */ - followSymlinks?: boolean; + followSymlinks?: boolean | undefined; /** * Abort in-flight walks. When the signal fires, the next `yield` * throws a `DOMException` with `name === "AbortError"`. Entries * already yielded remain valid. */ - signal?: AbortSignal; + signal?: AbortSignal | undefined; // --- Parallelism --- /** @@ -165,7 +165,7 @@ export type WalkOptions = { * still drain (files at their depth get yielded), but no new dirs * at `depth > minDepth` are opened. Default: Infinity. */ - timeBudgetMs?: number; + timeBudgetMs?: number | undefined; /** * Monotonic clock. Defaults to `performance.now`. Tests inject a * mock function to deterministically verify time-budget behavior. @@ -178,7 +178,7 @@ export type WalkOptions = { * `mtime` is always 0 — which is fine for grep/search consumers. * DSN-style cache invalidation callers pass `true`. */ - recordMtimes?: boolean; + recordMtimes?: boolean | undefined; /** * Classify each yielded file as binary, populating `WalkEntry.isBinary`. * Default: `true`. @@ -204,7 +204,7 @@ export type WalkOptions = { * Used by the DSN scanner to populate `dirMtimes` for cache * invalidation — the walker stays policy-free. */ - onDirectoryVisit?: (absDir: string, mtimeMs: number) => void; + onDirectoryVisit?: ((absDir: string, mtimeMs: number) => void) | undefined; }; /** @@ -291,23 +291,23 @@ export type GrepOptions = { path?: string; // --- WalkOptions pass-through --- - extensions?: ReadonlySet; - alwaysSkipDirs?: readonly string[]; - respectGitignore?: boolean; - nestedGitignore?: boolean; - hidden?: boolean; - maxDepth?: number; - minDepth?: number; - maxFileSize?: number; + extensions?: ReadonlySet | undefined; + alwaysSkipDirs?: readonly string[] | undefined; + respectGitignore?: boolean | undefined; + nestedGitignore?: boolean | undefined; + hidden?: boolean | undefined; + maxDepth?: number | undefined; + minDepth?: number | undefined; + maxFileSize?: number | undefined; descentHook?: WalkOptions["descentHook"]; - followSymlinks?: boolean; + followSymlinks?: boolean | undefined; /** * When true, each `GrepMatch` includes the source file's floored * `mtimeMs`. Used by cache-invalidation layers (e.g., the DSN * scanner's `sourceMtimes` map). Forwarded to the walker; * incidentally costs an extra stat per file, so it's opt-in. */ - recordMtimes?: boolean; + recordMtimes?: boolean | undefined; /** * Optional hook invoked once per directory visited during the * walk with its floored `mtimeMs`. Used for directory-level cache @@ -361,9 +361,9 @@ export type GrepOptions = { concurrency?: number; // --- Cancellation / budget --- - signal?: AbortSignal; + signal?: AbortSignal | undefined; /** Forwarded to `walkFiles` — time budget on the underlying walk. */ - timeBudgetMs?: number; + timeBudgetMs?: number | undefined; }; /** Aggregate stats returned alongside matches from `collectGrep`. */ diff --git a/packages/cli/src/lib/scan/walker.ts b/packages/cli/src/lib/scan/walker.ts index 640cc840f8..3c00ad146f 100644 --- a/packages/cli/src/lib/scan/walker.ts +++ b/packages/cli/src/lib/scan/walker.ts @@ -53,6 +53,7 @@ import { } from "./constants.js"; import { IgnoreStack } from "./ignore.js"; import type { IgnoreMatcher, WalkEntry, WalkOptions } from "./types.js"; +import { rethrow } from "../rethrow.js"; const log = logger.withTag("scan-walk"); @@ -516,7 +517,7 @@ async function* walkParallel(ctx: WalkContext): AsyncGenerator { continue; } if (producerError !== null) { - throw producerError; + rethrow(producerError); } if (stack.length === 0 && activeWorkers === 0) { break; diff --git a/packages/cli/src/lib/scan/worker-pool.ts b/packages/cli/src/lib/scan/worker-pool.ts index a1c777195e..7ca3a3ce21 100644 --- a/packages/cli/src/lib/scan/worker-pool.ts +++ b/packages/cli/src/lib/scan/worker-pool.ts @@ -173,7 +173,7 @@ export function getWorkerPool(): WorkerPool { }); w.addEventListener("error", (err) => { pw.alive = false; - const errMsg = err.message ?? String(err); + const errMsg = err.message ?? String(err.error); let slot = pw.pending.shift(); while (slot !== undefined) { slot.reject(new Error(`worker error: ${errMsg}`)); @@ -315,8 +315,9 @@ export function decodeWorkerMatches( lineNum, line, }; - if (mtimes !== null) { - match.mtime = mtimes[pathIdx]; + const mtime = mtimes?.[pathIdx]; + if (mtime !== undefined) { + match.mtime = mtime; } matches.push(match); } diff --git a/packages/cli/src/lib/sdk-invoke.ts b/packages/cli/src/lib/sdk-invoke.ts index 7f2db48408..b53e34145c 100644 --- a/packages/cli/src/lib/sdk-invoke.ts +++ b/packages/cli/src/lib/sdk-invoke.ts @@ -44,20 +44,20 @@ function buildIsolatedEnv( env[NO_PERSISTENCE_ENV_VAR] = "1"; } if (options?.token) { - env.SENTRY_AUTH_TOKEN = options.token; - env.SENTRY_FORCE_ENV_TOKEN = "1"; + env["SENTRY_AUTH_TOKEN"] = options.token; + env["SENTRY_FORCE_ENV_TOKEN"] = "1"; } if (options?.url) { - env.SENTRY_HOST = options.url; + env["SENTRY_HOST"] = options.url; } if (options?.org) { - env.SENTRY_ORG = options.org; + env["SENTRY_ORG"] = options.org; } if (options?.project) { - env.SENTRY_PROJECT = options.project; + env["SENTRY_PROJECT"] = options.project; } if (jsonByDefault && !options?.text) { - env.SENTRY_OUTPUT_FORMAT = "json"; + env["SENTRY_OUTPUT_FORMAT"] = "json"; } return env; } diff --git a/packages/cli/src/lib/select-ui/types.ts b/packages/cli/src/lib/select-ui/types.ts index d26669be92..a190a885f7 100644 --- a/packages/cli/src/lib/select-ui/types.ts +++ b/packages/cli/src/lib/select-ui/types.ts @@ -12,7 +12,7 @@ export type SelectOption = { /** User-facing option label. */ label: string; /** Optional secondary copy rendered beside the label; omitted by default. */ - hint?: string; + hint?: string | undefined; }; /** Args for `selectWithFilter` in `select-prompt.ts`. */ @@ -22,7 +22,7 @@ export type SelectOptions = { /** Choices presented to the user in display order. Typing filters them. */ options: SelectOption[]; /** Initially highlighted value. Defaults to the first option. */ - initialValue?: T; + initialValue?: T | undefined; }; /** The prompt the picker renders, with its completion callback. */ diff --git a/packages/cli/src/lib/sentry-client.ts b/packages/cli/src/lib/sentry-client.ts index b3a30743ff..3ed9503260 100644 --- a/packages/cli/src/lib/sentry-client.ts +++ b/packages/cli/src/lib/sentry-client.ts @@ -52,6 +52,7 @@ import { TimeoutError, } from "./errors.js"; import { extractInputUrl } from "./fetch-input.js"; +import type { Http1Dispatcher, NodeRequestInit } from "./http1-dispatcher.js"; import { isIdempotentOperation } from "./idempotent-operations.js"; import { logger } from "./logger.js"; import { isSentrySaasUrl } from "./sentry-urls.js"; @@ -260,7 +261,7 @@ function buildTimeoutHint(idempotent: boolean): string { async function fetchWithCustomTls( input: Request | string | URL, init: RequestInit | undefined, - dispatcher: RequestInit["dispatcher"], + dispatcher: Http1Dispatcher | undefined, ): Promise { // On Bun, this passes `tls: { ca }` to fetch(); on Node, the extra // property is harmless (Node honors NODE_EXTRA_CA_CERTS natively). @@ -268,11 +269,12 @@ async function fetchWithCustomTls( if (customTls) { warnIfSaasWithEnvCa(extractInputUrl(input)); } - return await fetch(input, { + const requestInit: NodeRequestInit = { ...init, ...customTls, ...(dispatcher && { dispatcher }), - }); + }; + return await fetch(input, requestInit); } /** Best-effort `detail` from a Sentry error body. */ @@ -439,8 +441,8 @@ function createCliTransport({ * @returns A fetch-compatible function for use with @sentry/api SDK functions */ type AuthenticatedFetchOptions = { - credential?: CredentialContext; - validatedRedirects?: boolean; + credential?: CredentialContext | undefined; + validatedRedirects?: boolean | undefined; /** Complete successful GET bodies inside the retry/timeout budget. */ bufferResponseBody?: boolean; /** @@ -449,7 +451,7 @@ type AuthenticatedFetchOptions = { * without this; set it for writes the server dedupes that the catalog * cannot match, such as chunk uploads to the server-provided URL. */ - idempotent?: boolean; + idempotent?: boolean | undefined; /** * Per-attempt timeout for every request through this fetch, replacing * {@link resolveTimeoutMs}. For callers whose URL comes from the server, @@ -457,7 +459,7 @@ type AuthenticatedFetchOptions = { */ timeoutMs?: number; /** undici dispatcher for every request, such as one from `createHttp1Dispatcher`. */ - dispatcher?: RequestInit["dispatcher"]; + dispatcher?: Http1Dispatcher | undefined; }; function createAuthenticatedFetch( diff --git a/packages/cli/src/lib/sentry-url-parser.ts b/packages/cli/src/lib/sentry-url-parser.ts index f255005555..cc3f54c055 100644 --- a/packages/cli/src/lib/sentry-url-parser.ts +++ b/packages/cli/src/lib/sentry-url-parser.ts @@ -42,11 +42,11 @@ export type ParsedSentryUrl = { /** Organization slug from the URL path or subdomain (absent for share URLs without org context) */ org?: string; /** Issue identifier — numeric group ID (e.g., "32886") or short ID (e.g., "CLI-G") */ - issueId?: string; + issueId?: string | undefined; /** Event ID from /issues/{id}/events/{eventId}/ paths */ - eventId?: string; + eventId?: string | undefined; /** Project slug from /settings/{org}/projects/{project}/ paths */ - project?: string; + project?: string | undefined; /** Trace ID from /organizations/{org}/traces/{traceId}/ paths */ traceId?: string; /** Replay ID from replay detail URLs */ @@ -426,9 +426,9 @@ export function applySentryUrlContext(baseUrl: string): void { if (isSaaSTrustOrigin(baseUrl)) { // Clear any self-hosted URL so API calls fall back to default SaaS routing. // env registry requires delete to truly unset; assignment coerces to string in Node.js - delete env.SENTRY_HOST; + delete env["SENTRY_HOST"]; // env registry requires delete to truly unset; assignment coerces to string in Node.js - delete env.SENTRY_URL; + delete env["SENTRY_URL"]; // Pin the server to SaaS explicitly when other stored accounts could // claim the URL (see `shouldPinSaaSForPastedUrl`): a usable SaaS account // is used even when the active one is self-hosted (db/auth `getAuthRow`), @@ -438,7 +438,7 @@ export function applySentryUrlContext(baseUrl: string): void { // Checks stored accounts only: reading the active token host would // snapshot an env token's host (as SaaS, now that the URL is cleared). if (shouldPinSaaSForPastedUrl()) { - env.SENTRY_URL = DEFAULT_SENTRY_URL; + env["SENTRY_URL"] = DEFAULT_SENTRY_URL; // The pin is the user's choice even when `defaults.url` is already // SaaS: otherwise it would still read as the persisted default, which // org-based selection lets yield to a self-hosted account. @@ -458,6 +458,6 @@ export function applySentryUrlContext(baseUrl: string): void { throw new HostScopeError("URL argument", baseUrl, tokenHost); } - env.SENTRY_HOST = baseUrl; - env.SENTRY_URL = baseUrl; + env["SENTRY_HOST"] = baseUrl; + env["SENTRY_URL"] = baseUrl; } diff --git a/packages/cli/src/lib/sentryclirc-import.ts b/packages/cli/src/lib/sentryclirc-import.ts index d5e5610fbb..e6c4038ddb 100644 --- a/packages/cli/src/lib/sentryclirc-import.ts +++ b/packages/cli/src/lib/sentryclirc-import.ts @@ -101,7 +101,7 @@ export type ImportPlan = { /** Provenance: which file path contributed each effective field */ effectiveSources: { token?: string; - url?: string; + url?: string | undefined; org?: string; project?: string; }; @@ -129,7 +129,11 @@ export type ImportResult = { /** Whether the token was validated against the API (undefined if skipped) */ tokenValid?: boolean; /** User identity from token validation */ - user?: { name?: string; email?: string; username?: string }; + user?: { + name?: string | undefined; + email?: string | undefined; + username?: string | undefined; + }; /** Warnings emitted during import */ warnings: string[]; }; @@ -197,19 +201,19 @@ function extractFields(iniData: ReturnType): { org?: string; project?: string; } = {}; - const token = iniData.auth?.token?.trim(); + const token = iniData["auth"]?.["token"]?.trim(); if (token) { result.token = token; } - const url = iniData.defaults?.url?.trim(); + const url = iniData["defaults"]?.["url"]?.trim(); if (url) { result.url = url; } - const org = iniData.defaults?.org?.trim(); + const org = iniData["defaults"]?.["org"]?.trim(); if (org) { result.org = org; } - const project = iniData.defaults?.project?.trim(); + const project = iniData["defaults"]?.["project"]?.trim(); if (project) { result.project = project; } diff --git a/packages/cli/src/lib/sentryclirc.ts b/packages/cli/src/lib/sentryclirc.ts index b86fbe485f..cd2ba9bc0f 100644 --- a/packages/cli/src/lib/sentryclirc.ts +++ b/packages/cli/src/lib/sentryclirc.ts @@ -383,22 +383,26 @@ export async function applySentryCliRcEnvShim(cwd: string): Promise { if ( config.token && - !env.SENTRY_AUTH_TOKEN?.trim() && - !env.SENTRY_TOKEN?.trim() + !env["SENTRY_AUTH_TOKEN"]?.trim() && + !env["SENTRY_TOKEN"]?.trim() ) { log.debug( `Setting SENTRY_AUTH_TOKEN from ${CONFIG_FILENAME} (${config.sources.token})`, ); - env.SENTRY_AUTH_TOKEN = config.token; + env["SENTRY_AUTH_TOKEN"] = config.token; rcInjectedTokenSource().path = config.sources.token; } const normalizedRcUrl = config.url ? normalizeUrl(config.url) : undefined; - if (normalizedRcUrl && !env.SENTRY_HOST?.trim() && !env.SENTRY_URL?.trim()) { + if ( + normalizedRcUrl && + !env["SENTRY_HOST"]?.trim() && + !env["SENTRY_URL"]?.trim() + ) { log.debug( `Setting SENTRY_URL from ${CONFIG_FILENAME} (${config.sources.url})`, ); - env.SENTRY_URL = normalizedRcUrl; + env["SENTRY_URL"] = normalizedRcUrl; } } diff --git a/packages/cli/src/lib/setup-code.ts b/packages/cli/src/lib/setup-code.ts index 0cc6238f51..3d8557ff37 100644 --- a/packages/cli/src/lib/setup-code.ts +++ b/packages/cli/src/lib/setup-code.ts @@ -69,7 +69,7 @@ export async function bootstrapAuthentication( clientId?: string; } = {}, ): Promise { - const code = (options.code ?? getEnv().SENTRY_SETUP_CODE)?.trim(); + const code = (options.code ?? getEnv()["SENTRY_SETUP_CODE"])?.trim(); if (!code) { throw new ValidationError( diff --git a/packages/cli/src/lib/shell.ts b/packages/cli/src/lib/shell.ts index d6a582cf9f..11368650bc 100644 --- a/packages/cli/src/lib/shell.ts +++ b/packages/cli/src/lib/shell.ts @@ -322,14 +322,14 @@ export async function addToGitHubPath( directory: string, env: NodeJS.ProcessEnv, ): Promise { - if (env.GITHUB_ACTIONS !== "true" || !env.GITHUB_PATH) { + if (env["GITHUB_ACTIONS"] !== "true" || !env["GITHUB_PATH"]) { return false; } try { let content = ""; try { - content = await readFile(env.GITHUB_PATH, "utf-8"); + content = await readFile(env["GITHUB_PATH"], "utf-8"); } catch (error) { const code = (error as NodeJS.ErrnoException).code; if (code !== "ENOENT") { @@ -343,7 +343,7 @@ export async function addToGitHubPath( const newContent = content.endsWith("\n") ? `${content}${directory}\n` : `${content}\n${directory}\n`; - await writeFile(env.GITHUB_PATH, newContent, "utf-8"); + await writeFile(env["GITHUB_PATH"], newContent, "utf-8"); } return true; } catch (error) { diff --git a/packages/cli/src/lib/sixel.ts b/packages/cli/src/lib/sixel.ts index 34510229d7..b866f8570f 100644 --- a/packages/cli/src/lib/sixel.ts +++ b/packages/cli/src/lib/sixel.ts @@ -231,7 +231,7 @@ export function parseTmuxInfo(output: string): TmuxInfo { * reported as no passthrough and no sixel. */ function detectTmux(): TmuxInfo | undefined { - if (!getEnv().TMUX) { + if (!getEnv()["TMUX"]) { return; } try { @@ -394,10 +394,10 @@ export function optedOut(): boolean { !(process.stdout.isTTY && process.stdin.isTTY) || process.platform === "win32" || // MVP: probe is unix-only isPlainOutput() || - !env.TERM || - env.TERM === "dumb" || - isTruthyEnv(env.SENTRY_NO_GRAPHICS ?? "") || - isTruthyEnv(env.SENTRY_NO_SIXEL ?? "") + !env["TERM"] || + env["TERM"] === "dumb" || + isTruthyEnv(env["SENTRY_NO_GRAPHICS"] ?? "") || + isTruthyEnv(env["SENTRY_NO_SIXEL"] ?? "") ); } diff --git a/packages/cli/src/lib/snapshots/archive.ts b/packages/cli/src/lib/snapshots/archive.ts index 7bab6287c1..d1908fcebb 100644 --- a/packages/cli/src/lib/snapshots/archive.ts +++ b/packages/cli/src/lib/snapshots/archive.ts @@ -56,7 +56,8 @@ export async function extractZipStream( mkdirSync(root, { recursive: true }); let written = 0; - let failure = null as Error | null; + // Writes report errors from callbacks; the first one is rethrown. + const failures: Error[] = []; let completed = false; const writes: Promise[] = []; const openStreams: ReturnType[] = []; @@ -84,7 +85,7 @@ export async function extractZipStream( resolveWrite(); }); stream.on("error", (err) => { - failure ??= err; + failures.push(err); resolveWrite(); }); }), @@ -92,7 +93,7 @@ export async function extractZipStream( file.ondata = (err, data, final) => { if (err) { - failure ??= err; + failures.push(err); stream.destroy(err); return; } @@ -140,6 +141,7 @@ export async function extractZipStream( } } + const [failure] = failures; if (failure) { throw failure; } diff --git a/packages/cli/src/lib/snapshots/images.ts b/packages/cli/src/lib/snapshots/images.ts index b22581ee9b..72480aeb88 100644 --- a/packages/cli/src/lib/snapshots/images.ts +++ b/packages/cli/src/lib/snapshots/images.ts @@ -48,6 +48,7 @@ function readPngDimensions( return { width, height }; } } + return undefined; } /** Return whether a JPEG marker contains a baseline or progressive frame. */ diff --git a/packages/cli/src/lib/sourcemap/debug-id.ts b/packages/cli/src/lib/sourcemap/debug-id.ts index 1ddb278edf..2347caee70 100644 --- a/packages/cli/src/lib/sourcemap/debug-id.ts +++ b/packages/cli/src/lib/sourcemap/debug-id.ts @@ -432,7 +432,7 @@ function insertGeneratedLine(map: SourcemapJson, line: number): void { function mutateSourcemap( map: SourcemapJson, debugId: string, - options: { snippetLine?: number }, + options: { snippetLine?: number | undefined }, ): void { if (map.sources) { map.sources = map.sources.map((s) => (s ? s.replaceAll("\\", "/") : s)); diff --git a/packages/cli/src/lib/sourcemap/inject.ts b/packages/cli/src/lib/sourcemap/inject.ts index d513c4f987..1ff4317e89 100644 --- a/packages/cli/src/lib/sourcemap/inject.ts +++ b/packages/cli/src/lib/sourcemap/inject.ts @@ -53,7 +53,7 @@ export type InjectResult = { * Path to the companion sourcemap on disk. Set only for external maps; * `undefined` for inline maps (which have no standalone file). */ - mapPath?: string; + mapPath?: string | undefined; /** Whether injection changed the files (or would change them in dry-run mode). */ injected: boolean; /** The debug ID (injected or pre-existing). */ @@ -64,21 +64,21 @@ export type InjectResult = { * ship it as a standalone artifact. `undefined` for external maps — read * those from `mapPath` instead. */ - injectedMapContent?: Buffer; + injectedMapContent?: Buffer | undefined; }; /** Options for directory-level injection. */ export type InjectDirectoryOptions = { /** File extensions to process (default: .js, .cjs, .mjs). */ - extensions?: string[]; + extensions?: string[] | undefined; /** If true, report what would be modified without writing. */ - dryRun?: boolean; + dryRun?: boolean | undefined; /** Glob patterns (gitignore-style) to exclude from processing. */ ignorePatterns?: string[]; /** Pre-built ignore matcher (takes precedence over ignorePatterns). */ - ignoreMatcher?: ReturnType; + ignoreMatcher?: ReturnType | undefined; /** Keep only pairs this filter accepts. See {@link UploadTarget.include}. */ - include?: PathFilter; + include?: PathFilter | undefined; }; /** @@ -804,12 +804,12 @@ export type SourcemapResolution = { * Absolute path to the resolved companion sourcemap, or `undefined` * when no external `.map` file could be located on disk. */ - mapPath?: string; + mapPath?: string | undefined; /** * Raw value of the last `//# sourceMappingURL=` directive in the file, * or `undefined` when no directive is present. */ - sourceMappingUrl?: string; + sourceMappingUrl?: string | undefined; /** * True when the `sourceMappingURL` is an inline `data:` URL (embedded * base64 sourcemap) rather than an external file reference. @@ -823,7 +823,7 @@ export type SourcemapResolution = { * The embedded `//# debugId=` value, or `undefined` when the * file has not been injected yet. */ - debugId?: string; + debugId?: string | undefined; }; /** diff --git a/packages/cli/src/lib/sourcemap/zip.ts b/packages/cli/src/lib/sourcemap/zip.ts index 84052e9ed4..41aa66cc51 100644 --- a/packages/cli/src/lib/sourcemap/zip.ts +++ b/packages/cli/src/lib/sourcemap/zip.ts @@ -137,7 +137,7 @@ export class ZipWriter { */ static async create( outputPath: string, - options: { compression?: ZipCompression } = {}, + options: { compression?: ZipCompression | undefined } = {}, ): Promise { const fh = await open(outputPath, "w"); const writer = new ZipWriter(fh, options.compression ?? "deflate"); diff --git a/packages/cli/src/lib/target-positional.ts b/packages/cli/src/lib/target-positional.ts index 2157a11609..09badd1f9b 100644 --- a/packages/cli/src/lib/target-positional.ts +++ b/packages/cli/src/lib/target-positional.ts @@ -135,7 +135,7 @@ export const projectBoundTarget = orgProjectTarget((parsed, context) => /** An org argument, parsed: `org` is `undefined` to auto-detect. */ export type OrgInput = { - readonly org?: string; + readonly org?: string | undefined; /** Server of a pasted Sentry URL, for `applySentryUrlContext` */ readonly baseUrl?: string; }; diff --git a/packages/cli/src/lib/telemetry.ts b/packages/cli/src/lib/telemetry.ts index f548611dcb..2467c3f349 100644 --- a/packages/cli/src/lib/telemetry.ts +++ b/packages/cli/src/lib/telemetry.ts @@ -57,6 +57,7 @@ import { type StoringTransport, } from "./telemetry/offline-transport.js"; import { makeCompressedTransport } from "./telemetry/zstd-transport.js"; +import { omitUndefined } from "./omit-undefined.js"; export type { Span } from "@sentry/core"; @@ -77,7 +78,10 @@ async function initTelemetryContext(): Promise { const instanceId = getInstanceId(); if (user) { - Sentry.setUser({ id: user.userId, email: user.email }); + Sentry.setUser({ + id: user.userId, + ...(user.email !== undefined && { email: user.email }), + }); } if (instanceId) { @@ -375,7 +379,7 @@ export function isEpipeError(event: Sentry.ErrorEvent): boolean { } // Check Node.js system error context (set by the SDK for system errors) - const systemError = event.contexts?.node_system_error as + const systemError = event.contexts?.["node_system_error"] as | { code?: string } | undefined; if (systemError?.code === "EPIPE") { @@ -404,7 +408,7 @@ export function isEbadfError(event: Sentry.ErrorEvent): boolean { } } - const systemError = event.contexts?.node_system_error as + const systemError = event.contexts?.["node_system_error"] as | { code?: string } | undefined; if (systemError?.code === "EBADF") { @@ -481,9 +485,11 @@ function normalizeHttpSpans(event: TransactionEvent): void { } // Descriptions are `${method} ${url}`. const method = span.description?.split(" ", 1)[0]; - span.description = span.description?.replace(/\S+$/, (url) => - normalizeSpanUrl(url, method), - ); + if (span.description !== undefined) { + span.description = span.description.replace(/\S+$/, (url) => + normalizeSpanUrl(url, method), + ); + } for (const key of HTTP_SPAN_URL_KEYS) { const value = span.data[key]; if (typeof value === "string") { @@ -544,7 +550,7 @@ const hasGetSystemErrorMap = (() => { try { // Dynamic require to avoid bundler issues — the check only matters at runtime const util = _require("node:util") as Record; - return typeof util.getSystemErrorMap === "function"; + return typeof util["getSystemErrorMap"] === "function"; } catch { return false; } @@ -646,7 +652,7 @@ export function initSentry( const libraryMode = options?.libraryMode ?? false; const environment = getCliEnvironment(); manualHttpTracing = - libraryMode || typeof process.versions.bun !== "undefined"; + libraryMode || typeof process.versions["bun"] !== "undefined"; /** * Ensure frame paths are absolute so Sentry's symbolicator can match them. @@ -746,7 +752,7 @@ export function initSentry( // Pass custom CA certificates to the transport for corporate TLS proxies. // The zstd-transport reads `caCerts` and passes it as `ca:` to // `http.request()`, and the SDK's fallback `makeNodeTransport` does the same. - transportOptions: { caCerts: getCustomCaCerts() }, + transportOptions: omitUndefined({ caCerts: getCustomCaCerts() }), // Filter out default integrations that add overhead without benefit. // NodeSystemError is excluded on runtimes missing util.getSystemErrorMap (Bun) — CLI-K1. // Library mode uses the extended exclusion set to avoid polluting the host process. @@ -798,14 +804,14 @@ export function initSentry( beforeSendTransaction: (event) => { // Remove server_name which may contain hostname (PII) - event.server_name = undefined; + delete event.server_name; normalizeHttpSpans(event); return event; }, beforeSend: (event) => { // Remove server_name which may contain hostname (PII) - event.server_name = undefined; + delete event.server_name; // EPIPE errors are expected when stdout is piped and the consumer closes // early (e.g., `sentry issue list | head`). Not actionable — drop them. @@ -849,15 +855,16 @@ export function initSentry( } if (client?.getOptions().enabled) { - const isBun = typeof process.versions.bun !== "undefined"; + const isBun = typeof process.versions["bun"] !== "undefined"; const runtime = isBun ? "bun" : "node"; // NodeClient defaults runtime to { name: 'node' }. Override it so // events carry the correct runtime when the npm package runs under Bun. const opts = client.getOptions(); + const version = isBun ? process.versions["bun"] : process.version; opts.runtime = { name: runtime, - version: isBun ? process.versions.bun : process.version, + ...(version !== undefined && { version }), }; // Tag whether running under Bun or Node. @@ -1109,7 +1116,7 @@ export function withTracing( attributes?: Record, ): Promise { return Sentry.startSpan( - { name, op, attributes, onlyIfParent: true }, + { name, op, ...(attributes && { attributes }), onlyIfParent: true }, async (span) => { try { const result = await fn(); @@ -1158,7 +1165,7 @@ export function withTracingSpan( attributes?: Record, ): Promise { return Sentry.startSpan( - { name, op, attributes, onlyIfParent: true }, + { name, op, ...(attributes && { attributes }), onlyIfParent: true }, async (span) => { // Track if callback sets status, so we don't override it let statusWasSet = false as boolean; @@ -1305,7 +1312,7 @@ export function withCacheSpan( attributes?: Record, ): Promise { return Sentry.startSpan( - { name, op, attributes, onlyIfParent: true }, + { name, op, ...(attributes && { attributes }), onlyIfParent: true }, async (span) => { try { const result = await fn(span); diff --git a/packages/cli/src/lib/telemetry/zstd-transport.ts b/packages/cli/src/lib/telemetry/zstd-transport.ts index 7e97e65469..18902a2516 100644 --- a/packages/cli/src/lib/telemetry/zstd-transport.ts +++ b/packages/cli/src/lib/telemetry/zstd-transport.ts @@ -52,6 +52,16 @@ export type NodeTransportOptions = Parameters[0]; type HttpModule = NonNullable; +/** + * Node's `http` or `https` module as the SDK's `HTTPModule`, which is what + * the SDK itself passes at runtime. The declarations differ only under + * `exactOptionalPropertyTypes`: Node types `IncomingMessage.statusCode` as + * `number | undefined`, the SDK as `statusCode?: number`. + */ +function asHttpModule(nativeModule: typeof http | typeof https): HttpModule { + return nativeModule as HttpModule; +} + /** Codec actually applied to a given envelope. */ type AppliedEncoding = "zstd" | "gzip" | "none"; @@ -133,7 +143,7 @@ export function makeNodeTransportWithDeadline( return makeNodeTransport({ ...options, httpModule: withRequestDeadline( - options.httpModule ?? nativeHttpModule, + options.httpModule ?? asHttpModule(nativeHttpModule), requestTimeoutMs, ), }); @@ -162,7 +172,7 @@ export function makeCompressedTransport( const isHttps = urlSegments.protocol === "https:"; const nativeHttpModule = isHttps ? https : http; const httpModule = withRequestDeadline( - options.httpModule ?? nativeHttpModule, + options.httpModule ?? asHttpModule(nativeHttpModule), requestTimeoutMs, ); @@ -226,8 +236,8 @@ export function shouldFallbackToDefault( options: NodeTransportOptions, ): boolean { const isHttps = url.protocol === "https:"; - const httpProxy = process.env.http_proxy ?? process.env.HTTP_PROXY; - const httpsProxy = process.env.https_proxy ?? process.env.HTTPS_PROXY; + const httpProxy = process.env["http_proxy"] ?? process.env["HTTP_PROXY"]; + const httpsProxy = process.env["https_proxy"] ?? process.env["HTTPS_PROXY"]; const envProxy = isHttps ? httpsProxy : httpProxy; // SDK precedent: HTTPS falls back to http_proxy as a last resort. const proxy = options.proxy || envProxy || httpProxy; @@ -283,7 +293,7 @@ async function performRequest( const retryAfterHeader = res.headers["retry-after"] ?? null; const rateLimitsHeader = res.headers["x-sentry-rate-limits"] ?? null; resolve({ - statusCode: res.statusCode, + ...(res.statusCode !== undefined && { statusCode: res.statusCode }), headers: { "retry-after": Array.isArray(retryAfterHeader) ? (retryAfterHeader[0] ?? null) @@ -374,7 +384,7 @@ export function hasZstdSupport(): boolean { * @internal Exported for tests. */ export function isNoProxyExempt(urlSegments: URL): boolean { - const noProxy = process.env.no_proxy ?? process.env.NO_PROXY; + const noProxy = process.env["no_proxy"] ?? process.env["NO_PROXY"]; if (!noProxy) { return false; } diff --git a/packages/cli/src/lib/time-range.ts b/packages/cli/src/lib/time-range.ts index d852de74ae..9d701e1c77 100644 --- a/packages/cli/src/lib/time-range.ts +++ b/packages/cli/src/lib/time-range.ts @@ -27,9 +27,9 @@ export type RelativeTimeRange = { export type AbsoluteTimeRange = { readonly type: "absolute"; /** ISO-8601 datetime string, or undefined for open-ended start */ - readonly start?: string; + readonly start?: string | undefined; /** ISO-8601 datetime string, or undefined for open-ended end */ - readonly end?: string; + readonly end?: string | undefined; }; /** Discriminated union for all period flag values */ diff --git a/packages/cli/src/lib/timezone.ts b/packages/cli/src/lib/timezone.ts index e13fef338c..9f055f45f4 100644 --- a/packages/cli/src/lib/timezone.ts +++ b/packages/cli/src/lib/timezone.ts @@ -229,7 +229,7 @@ function osReportsNonUtc(): boolean { export function initTimezone(): string | null { // An explicit TZ — from the user's shell or a prior invocation — is // authoritative. Never override it. - if (process.env.TZ) { + if (process.env["TZ"]) { return null; } @@ -250,6 +250,6 @@ export function initTimezone(): string | null { return null; } - process.env.TZ = zone; + process.env["TZ"] = zone; return zone; } diff --git a/packages/cli/src/lib/token-claims.ts b/packages/cli/src/lib/token-claims.ts index 9915a90715..9af724e39f 100644 --- a/packages/cli/src/lib/token-claims.ts +++ b/packages/cli/src/lib/token-claims.ts @@ -28,9 +28,9 @@ function optionalString(value: unknown): string | undefined { /** Subset of `sntrys_` payload fields we care about. */ export type SntrysClaim = { url: string; - regionUrl?: string; + regionUrl?: string | undefined; /** Organization slug embedded in the token at issuance time. */ - org?: string; + org?: string | undefined; }; /** @@ -76,17 +76,17 @@ export function parseSntrysClaim( const obj = parsed as Record; // Match server's `parse_token`: rejects payloads without truthy `iat`. - if (!obj.iat) { + if (!obj["iat"]) { return; } - const url = obj.url; + const url = obj["url"]; if (typeof url !== "string" || !url) { return; } - const regionUrl = optionalString(obj.region_url); - const org = optionalString(obj.org); + const regionUrl = optionalString(obj["region_url"]); + const org = optionalString(obj["org"]); return { url, regionUrl, org }; } diff --git a/packages/cli/src/lib/trace-target.ts b/packages/cli/src/lib/trace-target.ts index 652f7964f4..024b3d79ce 100644 --- a/packages/cli/src/lib/trace-target.ts +++ b/packages/cli/src/lib/trace-target.ts @@ -95,7 +95,7 @@ export type ParsedTraceTarget = */ export type TraceTargetInput = { readonly parsed: ParsedTraceTarget; - readonly baseUrl?: string; + readonly baseUrl?: string | undefined; readonly warnings: readonly string[]; }; @@ -231,7 +231,7 @@ function orgProjectToTraceTarget( */ export type TraceArgumentsInput = TraceTargetInput & { /** The target argument as typed, for the recovery lookup */ - readonly targetArg?: string; + readonly targetArg?: string | undefined; }; /** @@ -316,7 +316,7 @@ async function recoverTraceId( */ async function recoveryContextFromTargetArg( targetArg: string | undefined, -): Promise<{ org: string; project?: string }> { +): Promise<{ org: string; project?: string | undefined }> { if (!targetArg) { return { org: "", project: undefined }; } diff --git a/packages/cli/src/lib/upgrade.ts b/packages/cli/src/lib/upgrade.ts index d57f5389f4..970cc848d6 100644 --- a/packages/cli/src/lib/upgrade.ts +++ b/packages/cli/src/lib/upgrade.ts @@ -67,6 +67,7 @@ import { import { logger } from "./logger.js"; import { clearPatchCache } from "./patch-cache.js"; import { makeByteProgress, type SetMessage } from "./progress.js"; +import { rethrow } from "./rethrow.js"; /** Scoped logger for upgrade operations */ const log = logger.withTag("upgrade"); @@ -133,8 +134,8 @@ function extractReleaseVersions( (release): release is Record => typeof release === "object" && release !== null, ) - .filter((release) => !(release.draft || release.prerelease)) - .map((release) => release.tag_name) + .filter((release) => !(release["draft"] || release["prerelease"])) + .map((release) => release["tag_name"]) .filter( (tag): tag is string => typeof tag === "string" && tag.startsWith(source.tagPrefix), @@ -200,7 +201,7 @@ export function buildKnownCurlPaths( ): string[] { const paths = KNOWN_CURL_DIRS.map((dir) => join(homeDir, dir) + sep); // Honor an absolute XDG_BIN_HOME, matching determineInstallDir's precedence. - const xdgBinHome = env.XDG_BIN_HOME; + const xdgBinHome = env["XDG_BIN_HOME"]; if (xdgBinHome && isAbsolute(xdgBinHome)) { // join(dir, ".") strips any trailing separator so we don't emit a double // separator (e.g. `/custom/bin//`) that would break the startsWith checks. @@ -513,7 +514,7 @@ export async function fetchLatestFromGitHubWithSource( visitedPages.add(nextPage); response = await fetchWithUpgradeError( nextPage, - { headers: getGitHubHeaders(), signal }, + { headers: getGitHubHeaders(), ...(signal && { signal }) }, "GitHub", ); if (!response.ok) { @@ -885,7 +886,7 @@ export type DownloadResult = { /** Path to the lock file held during download (caller must release after child exits) */ lockPath: string; /** Size of delta patch in bytes, when delta upgrade was used instead of full download */ - patchBytes?: number; + patchBytes?: number | undefined; }; /** @@ -916,7 +917,7 @@ function writeChunkSync(fd: number, chunk: Uint8Array): void { * this function never closes it. */ async function drainBodyToFd( - body: ReadableStream, + body: ReadableStream>, fd: number, onBytes: (n: number) => void, ): Promise<{ streamError: unknown; writeError: Error | undefined }> { @@ -962,7 +963,7 @@ async function drainBodyToFd( * @param destPath - File path to write the decompressed output */ async function streamDecompressToFile( - body: ReadableStream, + body: ReadableStream>, destPath: string, setMessage?: SetMessage, ): Promise { @@ -996,7 +997,7 @@ async function streamDecompressToFile( } if (streamError !== undefined) { - throw streamError; + rethrow(streamError); } } diff --git a/packages/cli/src/lib/utils.ts b/packages/cli/src/lib/utils.ts index 38ec5c4a70..2cf0a4044c 100644 --- a/packages/cli/src/lib/utils.ts +++ b/packages/cli/src/lib/utils.ts @@ -115,9 +115,9 @@ export function getRealUsername(): string { // Fall through to the "$(whoami)" literal below. } return ( - process.env.SUDO_USER || - process.env.USER || - process.env.USERNAME || + process.env["SUDO_USER"] || + process.env["USER"] || + process.env["USERNAME"] || osUsername || "$(whoami)" ); diff --git a/packages/cli/src/lib/version-check.ts b/packages/cli/src/lib/version-check.ts index afeb922098..d8c8187013 100644 --- a/packages/cli/src/lib/version-check.ts +++ b/packages/cli/src/lib/version-check.ts @@ -458,7 +458,9 @@ export function resetUpdateNotificationState(): void { * Checked at runtime to support test isolation. */ function isUpdateCheckDisabled(): boolean { - return getEnv().SENTRY_CLI_NO_UPDATE_CHECK === "1" || isPersistenceDisabled(); + return ( + getEnv()["SENTRY_CLI_NO_UPDATE_CHECK"] === "1" || isPersistenceDisabled() + ); } /** diff --git a/packages/cli/src/lib/which.ts b/packages/cli/src/lib/which.ts index df1b289348..f9b1c8cf8a 100644 --- a/packages/cli/src/lib/which.ts +++ b/packages/cli/src/lib/which.ts @@ -26,7 +26,7 @@ const NEWLINE_RE = /\r?\n/; */ export function whichSync( command: string, - opts?: { PATH?: string }, + opts?: { PATH?: string | undefined }, ): string | null { // oxlint-disable-next-line sentry-cli/no-silent-catch -- grandfathered silent catch — see #1531; drain by adding log.debug()/log.warn() or re-throwing. try { diff --git a/packages/cli/src/lib/windows-path.ts b/packages/cli/src/lib/windows-path.ts index fc1501793d..79b3cbf298 100644 --- a/packages/cli/src/lib/windows-path.ts +++ b/packages/cli/src/lib/windows-path.ts @@ -75,7 +75,7 @@ export type PowerShellRunner = ( * shadowed by another `powershell.exe`) does not break setup. */ function getWindowsPowerShell(env: NodeJS.ProcessEnv): string { - const systemRoot = env.SystemRoot ?? env.SYSTEMROOT ?? env.windir; + const systemRoot = env["SystemRoot"] ?? env["SYSTEMROOT"] ?? env["windir"]; if (systemRoot) { const candidate = join( systemRoot, diff --git a/packages/cli/src/mcp-server.ts b/packages/cli/src/mcp-server.ts index 77c7931a49..4324441ab5 100644 --- a/packages/cli/src/mcp-server.ts +++ b/packages/cli/src/mcp-server.ts @@ -24,7 +24,9 @@ setAppIdentity({ name: "sentry-mcp", packageName: "@sentry/mcp-server" }); // The update check announces CLI releases and `sentry cli upgrade`, which do // not apply to this package; npm installs its updates. -getEnv().SENTRY_CLI_NO_UPDATE_CHECK = "1"; +// The update check announces CLI releases and `sentry cli upgrade`, which do +// not apply to this package; npm installs its updates. +getEnv()["SENTRY_CLI_NO_UPDATE_CHECK"] = "1"; // MCP clients and install checks run a bare `--version`; answer it without // loading the application and the CLI telemetry it brings. A lone `-v` keeps diff --git a/packages/cli/src/root-help-routes.ts b/packages/cli/src/root-help-routes.ts index e06060fb5d..849b170e78 100644 --- a/packages/cli/src/root-help-routes.ts +++ b/packages/cli/src/root-help-routes.ts @@ -79,7 +79,8 @@ function buildStandIn(name: string): SentryRoutes[string] { formatUsageLine: (args) => [...args.prefix, route.usage].join(" "), }; // Read by the branded help, like the `__primaryUsage` `buildCommand` keeps - (standIn as unknown as Record).__primaryUsage = + // Read by the branded help, like the `__primaryUsage` `buildCommand` keeps + (standIn as unknown as Record)["__primaryUsage"] = route.placeholder; return standIn; } diff --git a/packages/cli/src/types/dashboard.ts b/packages/cli/src/types/dashboard.ts index 51ffdd9d19..021b0e02be 100644 --- a/packages/cli/src/types/dashboard.ts +++ b/packages/cli/src/types/dashboard.ts @@ -662,6 +662,7 @@ function findLastLayout( return layout; } } + return undefined; } /** @@ -883,9 +884,9 @@ export function stripWidgetServerFields( export function prepareDashboardForUpdate(dashboard: DashboardDetail): { title: string; widgets: DashboardWidget[]; - projects?: number[]; - environment?: string[]; - period?: string | null; + projects?: number[] | undefined; + environment?: string[] | undefined; + period?: string | null | undefined; } { return { title: dashboard.title, diff --git a/packages/cli/src/types/feedback.ts b/packages/cli/src/types/feedback.ts index 98eb7b7a65..05d5d826cd 100644 --- a/packages/cli/src/types/feedback.ts +++ b/packages/cli/src/types/feedback.ts @@ -64,11 +64,11 @@ export type FeedbackListResult = { /** Whether a previous page is available. */ hasPrev: boolean; /** Server cursor for the following page. */ - nextCursor?: string | null; + nextCursor?: string | null | undefined; /** Resolved organization slug. */ org: string; /** Resolved project slug, absent for organization-wide queries. */ - project?: string; + project?: string | undefined; }; /** Data yielded by `feedback view` before JSON flattening. */ diff --git a/packages/cli/src/types/sentry.ts b/packages/cli/src/types/sentry.ts index 049164fd93..61de8c08e9 100644 --- a/packages/cli/src/types/sentry.ts +++ b/packages/cli/src/types/sentry.ts @@ -484,7 +484,7 @@ export type TraceSpan = { project_slug?: string; event_id?: string; /** Nested child spans */ - children?: TraceSpan[]; + children?: TraceSpan[] | undefined; /** Span name (often same as op) */ name?: string; /** Always "span" for EAP spans */ diff --git a/packages/cli/test/commands/agent-conversation/list.test.ts b/packages/cli/test/commands/agent-conversation/list.test.ts index b042846fb4..c76fb4c6b1 100644 --- a/packages/cli/test/commands/agent-conversation/list.test.ts +++ b/packages/cli/test/commands/agent-conversation/list.test.ts @@ -19,12 +19,8 @@ import { listCommand } from "../../../src/commands/agent-conversation/list.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -33,12 +29,8 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/db/auth.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -47,12 +39,8 @@ import * as dbAuth from "../../../src/lib/db/auth.js"; vi.mock("../../../src/lib/polling.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -61,12 +49,8 @@ import * as polling from "../../../src/lib/polling.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -75,18 +59,16 @@ import * as resolveTarget from "../../../src/lib/resolve-target.js"; vi.mock("../../../src/lib/db/pagination.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as paginationDb from "../../../src/lib/db/pagination.js"; import { parsePeriod } from "../../../src/lib/time-range.js"; import type { ConversationListItem } from "../../../src/types/conversation.js"; +import { loadCommand, passthroughWithProgress } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; // ============================================================================ // Helpers @@ -96,8 +78,8 @@ const ORG = "test-org"; const PROJECT = { id: "42", slug: "backend", name: "Backend" }; function createMockContext() { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -110,19 +92,6 @@ function createMockContext() { }; } -/** No-op setMessage callback for withProgress mock */ -function noop() { - // no-op for test -} - -/** Passthrough mock for `withProgress` — bypasses spinner, calls fn directly */ -function mockWithProgress( - _opts: unknown, - fn: (setMessage: () => void) => unknown, -) { - return fn(noop); -} - function makeConversation( overrides: Partial = {}, ): ConversationListItem { @@ -213,7 +182,7 @@ describe("listCommand.func", () => { .mockResolvedValue({ org: ORG }); withProgressSpy = vi .spyOn(polling, "withProgress") - .mockImplementation(mockWithProgress); + .mockImplementation(passthroughWithProgress); resolveCursorSpy = vi.spyOn(paginationDb, "resolveCursor").mockReturnValue({ cursor: undefined, direction: "next" as const, @@ -243,7 +212,7 @@ describe("listCommand.func", () => { }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, JSON_FLAGS, `${ORG}/`); expect(resolveTargetSpy).toHaveBeenCalledWith( @@ -265,7 +234,7 @@ describe("listCommand.func", () => { }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, JSON_FLAGS, undefined); expect(resolveTargetSpy).toHaveBeenCalledWith( @@ -285,7 +254,7 @@ describe("listCommand.func", () => { listConversationsSpy.mockResolvedValue({ data: [] }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, JSON_FLAGS, `${ORG}/${PROJECT.slug}`); expect(getProjectSpy).toHaveBeenCalledWith(ORG, PROJECT.slug); @@ -304,7 +273,7 @@ describe("listCommand.func", () => { listConversationsSpy.mockResolvedValue({ data: [] }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, JSON_FLAGS, PROJECT.slug); expect(getProjectSpy).not.toHaveBeenCalled(); @@ -321,7 +290,7 @@ describe("listCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, JSON_FLAGS, ORG); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -340,7 +309,7 @@ describe("listCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, HUMAN_FLAGS, ORG); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -356,7 +325,7 @@ describe("listCommand.func", () => { }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { ...JSON_FLAGS, query: "has:errors" }, ORG); expect(listConversationsSpy).toHaveBeenCalledWith( @@ -372,7 +341,7 @@ describe("listCommand.func", () => { }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { ...JSON_FLAGS, sort: "-conversation.totalCost" }, @@ -392,7 +361,7 @@ describe("listCommand.func", () => { }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { ...JSON_FLAGS, period: parsePeriod("24h") }, @@ -412,7 +381,7 @@ describe("listCommand.func", () => { }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { ...JSON_FLAGS, limit: 50 }, ORG); expect(listConversationsSpy).toHaveBeenCalledWith( @@ -433,7 +402,7 @@ describe("listCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { @@ -465,7 +434,7 @@ describe("listCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, HUMAN_FLAGS, ORG); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -479,7 +448,7 @@ describe("listCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, HUMAN_FLAGS, ORG); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -493,7 +462,7 @@ describe("listCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, JSON_FLAGS, ORG); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -509,7 +478,7 @@ describe("listCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, JSON_FLAGS, ORG); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -524,7 +493,7 @@ describe("listCommand.func", () => { }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, JSON_FLAGS, ORG); expect(advancePaginationStateSpy).toHaveBeenCalledWith( diff --git a/packages/cli/test/commands/agent-conversation/view.test.ts b/packages/cli/test/commands/agent-conversation/view.test.ts index 7223e2852f..8f879c85cf 100644 --- a/packages/cli/test/commands/agent-conversation/view.test.ts +++ b/packages/cli/test/commands/agent-conversation/view.test.ts @@ -20,12 +20,8 @@ import { viewCommand } from "../../../src/commands/agent-conversation/view.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -34,12 +30,8 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/db/auth.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -48,12 +40,8 @@ import * as dbAuth from "../../../src/lib/db/auth.js"; vi.mock("../../../src/lib/polling.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -62,18 +50,16 @@ import * as polling from "../../../src/lib/polling.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); import { ContextError, ValidationError } from "../../../src/lib/errors.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; import type { AgentConversationSpan } from "../../../src/types/conversation.js"; +import { loadCommand, passthroughWithProgress } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; // ============================================================================ // Helpers @@ -83,8 +69,8 @@ const ORG = "test-org"; const CONVERSATION_ID = "conv-abc-123"; function createMockContext() { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -96,19 +82,6 @@ function createMockContext() { }; } -/** No-op setMessage callback for withProgress mock */ -function noop() { - // no-op for test -} - -/** Passthrough mock for `withProgress` — bypasses spinner, calls fn directly */ -function mockWithProgress( - _opts: unknown, - fn: (setMessage: () => void) => unknown, -) { - return fn(noop); -} - function makeSpan( overrides: Partial = {}, ): AgentConversationSpan { @@ -183,7 +156,7 @@ describe("viewCommand.func", () => { resolveOrgSpy.mockResolvedValue({ org: ORG }); withProgressSpy = vi .spyOn(polling, "withProgress") - .mockImplementation(mockWithProgress); + .mockImplementation(passthroughWithProgress); }); afterEach(() => { @@ -201,7 +174,7 @@ describe("viewCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, JSON_FLAGS, `${ORG}/${CONVERSATION_ID}`); // resolveOrg is called with the explicit org from the arg @@ -225,7 +198,7 @@ describe("viewCommand.func", () => { }); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); // Only conversation ID provided — org should be auto-resolved await func.call(context, JSON_FLAGS, CONVERSATION_ID); @@ -246,7 +219,7 @@ describe("viewCommand.func", () => { }); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, JSON_FLAGS, ORG, CONVERSATION_ID); expect(resolveOrgSpy).toHaveBeenCalledWith( @@ -257,7 +230,7 @@ describe("viewCommand.func", () => { test("rejects more arguments than an org and a conversation ID", async () => { const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); const error = await func .call(context, HUMAN_FLAGS, ORG, CONVERSATION_ID, "extra") .catch((caught: unknown) => caught); @@ -286,7 +259,7 @@ describe("viewCommand.func", () => { "rejects malformed target %s before resolution or API access", async (target) => { const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); const error = await func .call(context, HUMAN_FLAGS, target) .catch((caught: unknown) => caught); @@ -301,7 +274,7 @@ describe("viewCommand.func", () => { test("no args fail to parse, mentioning the Conversation ID", async () => { const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); const error = await func .call(context, HUMAN_FLAGS) @@ -316,7 +289,7 @@ describe("viewCommand.func", () => { resolveOrgSpy.mockResolvedValue(null); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect( func.call(context, HUMAN_FLAGS, CONVERSATION_ID), @@ -327,7 +300,7 @@ describe("viewCommand.func", () => { resolveOrgSpy.mockResolvedValue(null); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); try { await func.call(context, HUMAN_FLAGS, CONVERSATION_ID); @@ -354,7 +327,7 @@ describe("viewCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, JSON_FLAGS, `${ORG}/${CONVERSATION_ID}`); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -383,7 +356,7 @@ describe("viewCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, HUMAN_FLAGS, `${ORG}/${CONVERSATION_ID}`); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -399,7 +372,7 @@ describe("viewCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, JSON_FLAGS, `${ORG}/${CONVERSATION_ID}`); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -415,7 +388,7 @@ describe("viewCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, JSON_FLAGS, `${ORG}/${CONVERSATION_ID}`); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -433,7 +406,7 @@ describe("viewCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, HUMAN_FLAGS, `${ORG}/${CONVERSATION_ID}`); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -448,7 +421,7 @@ describe("viewCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, HUMAN_FLAGS, `${ORG}/${CONVERSATION_ID}`); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); diff --git a/packages/cli/test/commands/alert/issues/create.test.ts b/packages/cli/test/commands/alert/issues/create.test.ts index bf72db89e5..7c9a4e8f40 100644 --- a/packages/cli/test/commands/alert/issues/create.test.ts +++ b/packages/cli/test/commands/alert/issues/create.test.ts @@ -7,6 +7,7 @@ import type { ResolvedTarget } from "../../../../src/lib/resolve-target.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../../src/lib/resolve-target.js"; import { useTestConfigDir } from "../../../helpers.js"; +import type { Writer } from "../../../../src/types/index.js"; const getConfigDir = useTestConfigDir("test-alert-issues-create-", { isolateProjectRoot: true, @@ -33,10 +34,10 @@ type CreateFlags = { }; function createContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: getConfigDir(), commandPrefix: ["sentry", "alert", "issues", "create"], stdoutWrite, @@ -206,7 +207,7 @@ describe("alert issues create", () => { context, { name: "Busy", - condition, + ...(condition === undefined ? {} : { condition }), action: ['{"id":"action-a"}'], filter: [ '{"type":"event_frequency_count","comparison":{"value":50,"interval":"1d"},"conditionResult":true}', diff --git a/packages/cli/test/commands/alert/issues/delete.test.ts b/packages/cli/test/commands/alert/issues/delete.test.ts index 6d5f4ded2a..c8aedf1320 100644 --- a/packages/cli/test/commands/alert/issues/delete.test.ts +++ b/packages/cli/test/commands/alert/issues/delete.test.ts @@ -6,7 +6,8 @@ import * as apiClient from "../../../../src/lib/api-client.js"; import type { ResolvedTarget } from "../../../../src/lib/resolve-target.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../../src/lib/resolve-target.js"; -import { useTestConfigDir } from "../../../helpers.js"; +import { useTestConfigDir, loadCommand } from "../../../helpers.js"; +import type { Writer } from "../../../../src/types/index.js"; const getConfigDir = useTestConfigDir("test-alert-issues-delete-", { isolateProjectRoot: true, @@ -41,11 +42,11 @@ const defaultFlags = { }; function createContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: getConfigDir(), }, stdoutWrite, @@ -75,7 +76,7 @@ describe("alert issues delete", () => { test("dry-run resolves the rule without deleting it", async () => { const { context, stdoutWrite } = createContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call( context, @@ -104,7 +105,7 @@ describe("alert issues delete", () => { test("dry-run JSON returns the preview contract", async () => { const { context, stdoutWrite } = createContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call( context, @@ -126,7 +127,7 @@ describe("alert issues delete", () => { test("--fields filters the JSON output", async () => { const { context, stdoutWrite } = createContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call( context, @@ -141,7 +142,7 @@ describe("alert issues delete", () => { test("--yes deletes the resolved rule", async () => { const { context, stdoutWrite } = createContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call( context, @@ -163,7 +164,7 @@ describe("alert issues delete", () => { "rejects bare rule id with %s before resolving target", async (_, flags) => { const { context } = createContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await expect(func.call(context, flags, "42")).rejects.toThrow( "Auto-detection is disabled for destructive operations", @@ -182,7 +183,7 @@ describe("alert issues delete", () => { "rejects org-all issue alert rule target with %s before resolving target", async (_, flags) => { const { context } = createContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await expect(func.call(context, flags, "test-org//42")).rejects.toThrow( "requires an explicit //", diff --git a/packages/cli/test/commands/alert/issues/edit.test.ts b/packages/cli/test/commands/alert/issues/edit.test.ts index 1ed8f8d8a9..87f7493a11 100644 --- a/packages/cli/test/commands/alert/issues/edit.test.ts +++ b/packages/cli/test/commands/alert/issues/edit.test.ts @@ -8,6 +8,7 @@ import type { ResolvedTarget } from "../../../../src/lib/resolve-target.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../../src/lib/resolve-target.js"; import { useTestConfigDir } from "../../../helpers.js"; +import type { Writer } from "../../../../src/types/index.js"; const getConfigDir = useTestConfigDir("test-alert-issues-edit-", { isolateProjectRoot: true, @@ -44,8 +45,8 @@ type EditFlags = { function createContext() { return { - stdout: { write: vi.fn(() => true) }, - stderr: { write: vi.fn(() => true) }, + stdout: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: getConfigDir(), }; } diff --git a/packages/cli/test/commands/alert/issues/list.test.ts b/packages/cli/test/commands/alert/issues/list.test.ts index 1f9166007c..6c25c1987e 100644 --- a/packages/cli/test/commands/alert/issues/list.test.ts +++ b/packages/cli/test/commands/alert/issues/list.test.ts @@ -11,7 +11,7 @@ import { import { setOrgRegion } from "../../../../src/lib/db/regions.js"; import type { ApiError } from "../../../../src/lib/errors.js"; import { logger } from "../../../../src/lib/logger.js"; -import { mockFetch, useTestConfigDir } from "../../../helpers.js"; +import { mockFetch, useTestConfigDir, at } from "../../../helpers.js"; const getConfigDir = useTestConfigDir("test-alert-issues-list-", { isolateProjectRoot: true, @@ -444,7 +444,7 @@ describe("alert issues list pagination", () => { /\/api\/0\/organizations\/([^/]+)\/workflows\//, ); if (ruleMatch) { - return Response.json([rule(ruleMatch[1])]); + return Response.json([rule(at(ruleMatch, 1))]); } if (url.pathname === "/api/0/organizations/") { return Response.json([ @@ -641,7 +641,7 @@ describe("alert issues list pagination", () => { /\/api\/0\/organizations\/([^/]+)\/workflows\//, ); if (ruleMatch) { - const org = ruleMatch[1]; + const org = at(ruleMatch, 1); const perPage = Number(url.searchParams.get("per_page")); perPageByOrg.set(org, perPage); return new Response( diff --git a/packages/cli/test/commands/alert/issues/view.test.ts b/packages/cli/test/commands/alert/issues/view.test.ts index 0d53ff6220..65554eafd8 100644 --- a/packages/cli/test/commands/alert/issues/view.test.ts +++ b/packages/cli/test/commands/alert/issues/view.test.ts @@ -14,6 +14,7 @@ import type { ResolvedTarget } from "../../../../src/lib/resolve-target.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../../src/lib/resolve-target.js"; import { useTestConfigDir } from "../../../helpers.js"; +import type { Writer } from "../../../../src/types/index.js"; const getConfigDir = useTestConfigDir("test-alert-issues-view-", { isolateProjectRoot: true, @@ -43,11 +44,11 @@ const baseRule: IssueAlertRule = { type ViewFlags = { readonly web: boolean; readonly json: boolean }; function createContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: getConfigDir(), }, stdoutWrite, diff --git a/packages/cli/test/commands/alert/metrics/create.test.ts b/packages/cli/test/commands/alert/metrics/create.test.ts index 0de2357e2c..4eb2247482 100644 --- a/packages/cli/test/commands/alert/metrics/create.test.ts +++ b/packages/cli/test/commands/alert/metrics/create.test.ts @@ -6,6 +6,7 @@ import { DEFAULT_SENTRY_URL } from "../../../../src/lib/constants.js"; import { setOrgRegion } from "../../../../src/lib/db/regions.js"; import { ValidationError } from "../../../../src/lib/errors.js"; import { useTestConfigDir } from "../../../helpers.js"; +import type { Writer } from "../../../../src/types/index.js"; const getConfigDir = useTestConfigDir("test-alert-metrics-create-", { isolateProjectRoot: true, @@ -26,10 +27,10 @@ type CreateFlags = { }; function createContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: getConfigDir(), commandPrefix: ["sentry", "alert", "metrics", "create"], stdoutWrite, diff --git a/packages/cli/test/commands/alert/metrics/delete.test.ts b/packages/cli/test/commands/alert/metrics/delete.test.ts index 2543781bf5..8db5107dc0 100644 --- a/packages/cli/test/commands/alert/metrics/delete.test.ts +++ b/packages/cli/test/commands/alert/metrics/delete.test.ts @@ -5,7 +5,8 @@ import type { MetricAlertRule } from "../../../../src/lib/api-client.js"; import * as apiClient from "../../../../src/lib/api-client.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../../src/lib/resolve-target.js"; -import { useTestConfigDir } from "../../../helpers.js"; +import { useTestConfigDir, loadCommand } from "../../../helpers.js"; +import type { Writer } from "../../../../src/types/index.js"; const getConfigDir = useTestConfigDir("test-alert-metrics-delete-", { isolateProjectRoot: true, @@ -33,11 +34,11 @@ const defaultFlags = { }; function createContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: getConfigDir(), }, stdoutWrite, @@ -67,7 +68,7 @@ describe("alert metrics delete", () => { test("dry-run resolves the rule without deleting it", async () => { const { context, stdoutWrite } = createContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call( context, @@ -89,7 +90,7 @@ describe("alert metrics delete", () => { test("--yes deletes the resolved rule", async () => { const { context, stdoutWrite } = createContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call(context, { ...defaultFlags, yes: true }, "test-org/9"); @@ -102,7 +103,7 @@ describe("alert metrics delete", () => { test("--yes JSON returns the deleted contract", async () => { const { context, stdoutWrite } = createContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call( context, @@ -128,7 +129,7 @@ describe("alert metrics delete", () => { "rejects bare rule id with %s before resolving target", async (_, flags) => { const { context } = createContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await expect(func.call(context, flags, "9")).rejects.toThrow( "Auto-detection is disabled for destructive operations", diff --git a/packages/cli/test/commands/alert/metrics/edit.test.ts b/packages/cli/test/commands/alert/metrics/edit.test.ts index 5a2a407cb9..1eff7e741a 100644 --- a/packages/cli/test/commands/alert/metrics/edit.test.ts +++ b/packages/cli/test/commands/alert/metrics/edit.test.ts @@ -7,6 +7,7 @@ import { ValidationError } from "../../../../src/lib/errors.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../../src/lib/resolve-target.js"; import { useTestConfigDir } from "../../../helpers.js"; +import type { Writer } from "../../../../src/types/index.js"; const getConfigDir = useTestConfigDir("test-alert-metrics-edit-", { isolateProjectRoot: true, @@ -39,8 +40,8 @@ type EditFlags = { function createContext() { return { - stdout: { write: vi.fn(() => true) }, - stderr: { write: vi.fn(() => true) }, + stdout: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: getConfigDir(), }; } diff --git a/packages/cli/test/commands/alert/metrics/list.test.ts b/packages/cli/test/commands/alert/metrics/list.test.ts index 7aee9f6805..88330ca162 100644 --- a/packages/cli/test/commands/alert/metrics/list.test.ts +++ b/packages/cli/test/commands/alert/metrics/list.test.ts @@ -7,7 +7,7 @@ import { setAuthToken } from "../../../../src/lib/db/auth.js"; import { setOrgRegion } from "../../../../src/lib/db/regions.js"; import type { ApiError } from "../../../../src/lib/errors.js"; import { logger } from "../../../../src/lib/logger.js"; -import { mockFetch, useTestConfigDir } from "../../../helpers.js"; +import { mockFetch, useTestConfigDir, at } from "../../../helpers.js"; const getConfigDir = useTestConfigDir("test-alert-metrics-list-", { isolateProjectRoot: true, @@ -424,7 +424,7 @@ describe("alert metrics list pagination", () => { /\/api\/0\/organizations\/([^/]+)\/detectors\//, ); if (alertMatch) { - return Response.json([rule(alertMatch[1])]); + return Response.json([rule(at(alertMatch, 1))]); } if (url.pathname === "/api/0/organizations/") { return Response.json([ @@ -594,7 +594,7 @@ describe("alert metrics list pagination", () => { /\/api\/0\/organizations\/([^/]+)\/detectors\//, ); if (alertMatch) { - const org = alertMatch[1]; + const org = at(alertMatch, 1); const perPage = Number(url.searchParams.get("per_page")); perPageByOrg.set(org, perPage); return new Response( diff --git a/packages/cli/test/commands/alert/metrics/view.test.ts b/packages/cli/test/commands/alert/metrics/view.test.ts index bca47620a0..74c0012cc2 100644 --- a/packages/cli/test/commands/alert/metrics/view.test.ts +++ b/packages/cli/test/commands/alert/metrics/view.test.ts @@ -11,6 +11,7 @@ import { ApiError, ValidationError } from "../../../../src/lib/errors.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../../src/lib/resolve-target.js"; import { useTestConfigDir } from "../../../helpers.js"; +import type { Writer } from "../../../../src/types/index.js"; const getConfigDir = useTestConfigDir("test-alert-metrics-view-", { isolateProjectRoot: true, @@ -33,11 +34,11 @@ const baseRule: MetricAlertRule = { type ViewFlags = { readonly web: boolean; readonly json: boolean }; function createContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: getConfigDir(), }, stdoutWrite, diff --git a/packages/cli/test/commands/api.property.test.ts b/packages/cli/test/commands/api.property.test.ts index 2fe617270a..f18e67fb3b 100644 --- a/packages/cli/test/commands/api.property.test.ts +++ b/packages/cli/test/commands/api.property.test.ts @@ -383,8 +383,8 @@ describe("setNestedValue security properties", () => { } // Verify no pollution - expect((testObj as Record).polluted).toBeUndefined(); - expect(({} as Record).polluted).toBeUndefined(); + expect((testObj as Record)["polluted"]).toBeUndefined(); + expect(({} as Record)["polluted"]).toBeUndefined(); }); }); diff --git a/packages/cli/test/commands/api.test.ts b/packages/cli/test/commands/api.test.ts index 56fdab4d1d..0c13f2fdc3 100644 --- a/packages/cli/test/commands/api.test.ts +++ b/packages/cli/test/commands/api.test.ts @@ -38,6 +38,8 @@ import { setNestedValue, } from "../../src/commands/api.js"; import { OutputError, ValidationError } from "../../src/lib/errors.js"; +import { loadCommand } from "../helpers.js"; +import type { Writer } from "../../src/types/index.js"; /** * Create a mock stdin stream from a string @@ -134,11 +136,11 @@ describe("apiCommand tags org from the path", () => { }); test("dry-run of a projects path sets sentry.org and sentry.project", async () => { - const func = await apiCommand.loader(); + const func = await loadCommand(apiCommand); const context = { stdin: createMockStdin(""), - stdout: { write: vi.fn(() => true), isTTY: false }, - stderr: { write: vi.fn(() => true) }, + stdout: { write: vi.fn(() => true), isTTY: false }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }; await func.call( @@ -1826,7 +1828,7 @@ describe("API request preview", () => { "preserves repeated axes and ordered indexed transformations from --%s", async (flag) => { let output = ""; - const func = await apiCommand.loader(); + const func = await loadCommand(apiCommand); await func.call( { cwd: "/tmp", @@ -1872,7 +1874,7 @@ describe("API request preview", () => { test("absolute URL dry-run preserves the regional origin", async () => { let output = ""; - const func = await apiCommand.loader(); + const func = await loadCommand(apiCommand); await func.call( { cwd: "/tmp", diff --git a/packages/cli/test/commands/attribute/list.test.ts b/packages/cli/test/commands/attribute/list.test.ts index bcc799b1b2..a0750b92ac 100644 --- a/packages/cli/test/commands/attribute/list.test.ts +++ b/packages/cli/test/commands/attribute/list.test.ts @@ -25,12 +25,8 @@ import { vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v as (...args: unknown[]) => unknown) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for vi.mocked access @@ -39,19 +35,15 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v as (...args: unknown[]) => unknown) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for vi.mocked access import * as resolveTarget from "../../../src/lib/resolve-target.js"; import { ApiError, ValidationError } from "../../../src/lib/errors.js"; import { parsePeriod } from "../../../src/lib/time-range.js"; -import { useTestConfigDir } from "../../helpers.js"; +import { useTestConfigDir, at, must } from "../../helpers.js"; useTestConfigDir("attribute-list-"); @@ -266,7 +258,7 @@ describe("fetchAttributeTypePage", () => { listSpy.mockImplementation(async (_org, options) => { const page = pages[options.cursor ?? "first"]; expect(page).toBeDefined(); - return page; + return must(page); }); const page = await fetchAttributeTypePage( @@ -513,7 +505,7 @@ describe("listCommand.func", () => { expect(options.perPage).toBe(2); const page = pages[options.cursor ?? "first"]; expect(page).toBeDefined(); - return page; + return must(page); }); const collected: string[] = []; for (let index = 0; index < 5; index++) { @@ -589,7 +581,7 @@ describe("listCommand.func", () => { expect(collected).toEqual(data.map((row) => row.key)); expect(cursorLengths.length).toBeGreaterThan(10); // Cursor stops growing once paging reaches a steady state - expect(Math.max(...cursorLengths) - cursorLengths[0]).toBeLessThan(64); + expect(Math.max(...cursorLengths) - at(cursorLengths, 0)).toBeLessThan(64); }); test("continues mixed types past 100 rows without losing partially selected pages", async () => { diff --git a/packages/cli/test/commands/auth/default.test.ts b/packages/cli/test/commands/auth/default.test.ts index d63fdef526..c158932749 100644 --- a/packages/cli/test/commands/auth/default.test.ts +++ b/packages/cli/test/commands/auth/default.test.ts @@ -10,6 +10,7 @@ import { import { loginCommand } from "../../../src/commands/auth/login.js"; import { statusCommand } from "../../../src/commands/auth/status.js"; import { CommandOutput } from "../../../src/lib/formatters/output.js"; +import { loadCommand } from "../../helpers.js"; describe("resolveAuthDefaultTarget", () => { test("logged out → login", () => { @@ -76,7 +77,7 @@ describe("authDefaultCommand", () => { }; try { - const func = await authDefaultCommand.loader(); + const func = await loadCommand(authDefaultCommand); await func.call(context, { timeout: 900, force: false, @@ -127,7 +128,7 @@ describe("authDefaultCommand", () => { }; try { - const func = await authDefaultCommand.loader(); + const func = await loadCommand(authDefaultCommand); await func.call(context, { timeout: 900, force: false, diff --git a/packages/cli/test/commands/auth/login-force.test.ts b/packages/cli/test/commands/auth/login-force.test.ts index 9fafa521fc..6f03aa7928 100644 --- a/packages/cli/test/commands/auth/login-force.test.ts +++ b/packages/cli/test/commands/auth/login-force.test.ts @@ -9,12 +9,8 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -32,6 +28,7 @@ import { getDatabase } from "../../../src/lib/db/index.js"; import { getUserInfo, setUserInfo } from "../../../src/lib/db/user.js"; import { ApiError, AuthError } from "../../../src/lib/errors.js"; import { useEnvSandbox, useTestConfigDir } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; type LoginFunc = ( this: unknown, @@ -53,8 +50,8 @@ const ACME = "https://sentry.acme.com"; function createContext() { return { - stdout: { write: vi.fn(() => true) }, - stderr: { write: vi.fn(() => true) }, + stdout: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }; } @@ -69,7 +66,11 @@ function addAccount( host: SAAS, newAccount: true, }); - setUserInfo({ userId, email, username }); + setUserInfo({ + userId, + email, + ...(username === undefined ? {} : { username }), + }); return id; } diff --git a/packages/cli/test/commands/auth/login.test.ts b/packages/cli/test/commands/auth/login.test.ts index 2a928b6fd9..8aa33afda5 100644 --- a/packages/cli/test/commands/auth/login.test.ts +++ b/packages/cli/test/commands/auth/login.test.ts @@ -11,7 +11,15 @@ * `prompt()` is controllable). */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; // Mock isatty to simulate interactive terminal for the re-auth prompt path. // Bun's ESM wrapper for CJS built-ins exposes `default` + `ReadStream` + @@ -93,12 +101,8 @@ vi.mock("../../../src/lib/account-selection.js", async (importOriginal) => { await importOriginal< typeof import("../../../src/lib/account-selection.js") >(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -107,12 +111,8 @@ import * as accountSelection from "../../../src/lib/account-selection.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -121,12 +121,8 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/db/auth.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -135,12 +131,8 @@ import * as dbAuth from "../../../src/lib/db/auth.js"; vi.mock("../../../src/lib/db/user.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -170,18 +162,15 @@ vi.mock("../../../src/lib/interactive-login.js", async (importOriginal) => { await importOriginal< typeof import("../../../src/lib/interactive-login.js") >(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as interactiveLogin from "../../../src/lib/interactive-login.js"; import type { SentryCliRcConfig } from "../../../src/lib/sentryclirc.js"; import { useEnvSandbox } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; type LoginFlags = { readonly token?: string; @@ -199,6 +188,9 @@ type LoginFunc = ( email?: string, ) => Promise; +/** Account id that the mocked `setAuthToken` hands back. */ +const TEST_ACCOUNT_ID = "test-account"; + const SAMPLE_USER = { id: "42", name: "Jane Doe", @@ -236,7 +228,7 @@ function createContext() { /** Assert setAuthToken was called with the expected token and a host option. */ function expectTokenStored( - spy: ReturnType, + spy: MockInstance<(typeof dbAuth)["setAuthToken"]>, expectedToken: string, newAccount = true, ): void { @@ -254,17 +246,23 @@ function expectTokenStored( describe("loginCommand.func --token path", () => { useEnvSandbox(["SENTRY_HOST", "SENTRY_URL"]); - let isAuthenticatedSpy: ReturnType; - let isEnvTokenActiveSpy: ReturnType; - let setAuthTokenSpy: ReturnType; - let checkTokenAccessSpy: ReturnType; - let clearAuthSpy: ReturnType; - let removeAccountSpy: ReturnType; - let getCurrentUserSpy: ReturnType; - let setUserInfoSpy: ReturnType; - let runInteractiveLoginSpy: ReturnType; - let hasStoredAuthCredentialsSpy: ReturnType; - let listOrgsUncachedSpy: ReturnType; + let isAuthenticatedSpy: MockInstance<(typeof dbAuth)["isAuthenticated"]>; + let isEnvTokenActiveSpy: MockInstance<(typeof dbAuth)["isEnvTokenActive"]>; + let setAuthTokenSpy: MockInstance<(typeof dbAuth)["setAuthToken"]>; + let checkTokenAccessSpy: MockInstance<(typeof apiClient)["checkTokenAccess"]>; + let clearAuthSpy: MockInstance<(typeof dbAuth)["clearAuth"]>; + let removeAccountSpy: MockInstance<(typeof dbAuth)["removeAccount"]>; + let getCurrentUserSpy: MockInstance<(typeof apiClient)["getCurrentUser"]>; + let setUserInfoSpy: MockInstance<(typeof dbUser)["setUserInfo"]>; + let runInteractiveLoginSpy: MockInstance< + (typeof interactiveLogin)["runInteractiveLogin"] + >; + let hasStoredAuthCredentialsSpy: MockInstance< + (typeof dbAuth)["hasStoredAuthCredentials"] + >; + let listOrgsUncachedSpy: MockInstance< + (typeof apiClient)["listOrganizationsUncached"] + >; let func: LoginFunc; beforeEach(async () => { @@ -517,7 +515,8 @@ describe("loginCommand.func --token path", () => { isEnvTokenActiveSpy.mockReturnValue(true); hasStoredAuthCredentialsSpy.mockReturnValue(false); // Set env var directly — getActiveEnvVarName() reads env vars via getEnvToken() - process.env.SENTRY_TOKEN = "sntrys_token_456"; + // Set env var directly — getActiveEnvVarName() reads env vars via getEnvToken() + process.env["SENTRY_TOKEN"] = "sntrys_token_456"; runInteractiveLoginSpy.mockResolvedValue({ method: "oauth", configPath: "/fake", @@ -529,13 +528,13 @@ describe("loginCommand.func --token path", () => { expect(runInteractiveLoginSpy).toHaveBeenCalled(); } finally { - delete process.env.SENTRY_TOKEN; + delete process.env["SENTRY_TOKEN"]; } }); test("--token: stores token, fetches user, writes success", async () => { isAuthenticatedSpy.mockReturnValue(false); - setAuthTokenSpy.mockReturnValue(undefined); + setAuthTokenSpy.mockReturnValue(TEST_ACCOUNT_ID); checkTokenAccessSpy.mockResolvedValue(undefined); getCurrentUserSpy.mockResolvedValue(SAMPLE_USER); setUserInfoSpy.mockReturnValue(undefined); @@ -571,8 +570,8 @@ describe("loginCommand.func --token path", () => { "--force --token rejects %s before changing the session or host", async (_, token) => { isAuthenticatedSpy.mockReturnValue(true); - process.env.SENTRY_HOST = "https://previous.example.com"; - process.env.SENTRY_URL = "https://previous.example.com"; + process.env["SENTRY_HOST"] = "https://previous.example.com"; + process.env["SENTRY_URL"] = "https://previous.example.com"; const fetchSpy = vi.spyOn(globalThis, "fetch"); try { @@ -586,8 +585,8 @@ describe("loginCommand.func --token path", () => { }), ).rejects.toBeInstanceOf(MalformedAuthTokenError); - expect(process.env.SENTRY_HOST).toBe("https://previous.example.com"); - expect(process.env.SENTRY_URL).toBe("https://previous.example.com"); + expect(process.env["SENTRY_HOST"]).toBe("https://previous.example.com"); + expect(process.env["SENTRY_URL"]).toBe("https://previous.example.com"); expect(clearAuthSpy).not.toHaveBeenCalled(); expect(setAuthTokenSpy).not.toHaveBeenCalled(); expect(setUserInfoSpy).not.toHaveBeenCalled(); @@ -608,7 +607,7 @@ describe("loginCommand.func --token path", () => { "--token normalizes surrounding whitespace and controls before storage %#", async (token) => { isAuthenticatedSpy.mockReturnValue(false); - setAuthTokenSpy.mockReturnValue(undefined); + setAuthTokenSpy.mockReturnValue(TEST_ACCOUNT_ID); checkTokenAccessSpy.mockResolvedValue(undefined); getCurrentUserSpy.mockResolvedValue(SAMPLE_USER); setUserInfoSpy.mockReturnValue(undefined); @@ -623,7 +622,7 @@ describe("loginCommand.func --token path", () => { test("--token: null user.name is converted to undefined in setUserInfo", async () => { isAuthenticatedSpy.mockReturnValue(false); - setAuthTokenSpy.mockReturnValue(undefined); + setAuthTokenSpy.mockReturnValue(TEST_ACCOUNT_ID); checkTokenAccessSpy.mockResolvedValue(undefined); getCurrentUserSpy.mockResolvedValue({ id: "5", @@ -672,7 +671,7 @@ describe("loginCommand.func --token path", () => { // A network/server failure during validation is not a token problem: // surface the real error and do NOT clear a possibly-valid token (CLI-19). isAuthenticatedSpy.mockReturnValue(false); - setAuthTokenSpy.mockReturnValue(undefined); + setAuthTokenSpy.mockReturnValue(TEST_ACCOUNT_ID); const cause = new ApiError("Server error", 503); checkTokenAccessSpy.mockRejectedValue(cause); clearAuthSpy.mockResolvedValue(undefined); @@ -689,7 +688,7 @@ describe("loginCommand.func --token path", () => { test("--token: shows 'Logged in as' when user info fetch succeeds", async () => { isAuthenticatedSpy.mockReturnValue(false); - setAuthTokenSpy.mockReturnValue(undefined); + setAuthTokenSpy.mockReturnValue(TEST_ACCOUNT_ID); checkTokenAccessSpy.mockResolvedValue(undefined); getCurrentUserSpy.mockResolvedValue({ id: "5", email: "only@email.com" }); setUserInfoSpy.mockReturnValue(undefined); @@ -707,7 +706,7 @@ describe("loginCommand.func --token path", () => { test("--token: login succeeds even when getCurrentUser() fails transiently", async () => { isAuthenticatedSpy.mockReturnValue(false); - setAuthTokenSpy.mockReturnValue(undefined); + setAuthTokenSpy.mockReturnValue(TEST_ACCOUNT_ID); checkTokenAccessSpy.mockResolvedValue(undefined); getCurrentUserSpy.mockRejectedValue(new Error("Network error")); @@ -730,7 +729,7 @@ describe("loginCommand.func --token path", () => { test("--token: warms caches once the result is printed", async () => { isAuthenticatedSpy.mockReturnValue(false); - setAuthTokenSpy.mockReturnValue(undefined); + setAuthTokenSpy.mockReturnValue(TEST_ACCOUNT_ID); checkTokenAccessSpy.mockResolvedValue(undefined); getCurrentUserSpy.mockResolvedValue(SAMPLE_USER); setUserInfoSpy.mockReturnValue(undefined); @@ -819,7 +818,7 @@ describe("loginCommand.func --token path", () => { test("--force --token when authenticated: replaces the active account's token", async () => { isAuthenticatedSpy.mockReturnValue(true); clearAuthSpy.mockResolvedValue(undefined); - setAuthTokenSpy.mockReturnValue(undefined); + setAuthTokenSpy.mockReturnValue(TEST_ACCOUNT_ID); checkTokenAccessSpy.mockResolvedValue(undefined); getCurrentUserSpy.mockResolvedValue(SAMPLE_USER); setUserInfoSpy.mockReturnValue(undefined); @@ -861,18 +860,22 @@ describe("loginCommand.func --token path", () => { * true) and the prompt module (so `prompt()` is controllable). */ describe("login re-authentication interactive prompt", () => { - let isAuthenticatedSpy: ReturnType; - let isEnvTokenActiveSpy: ReturnType; - let clearAuthSpy: ReturnType; - let runInteractiveLoginSpy: ReturnType; - let getUserInfoSpy: ReturnType; - let listOrgsUncachedSpy: ReturnType; + let isAuthenticatedSpy: MockInstance<(typeof dbAuth)["isAuthenticated"]>; + let isEnvTokenActiveSpy: MockInstance<(typeof dbAuth)["isEnvTokenActive"]>; + let clearAuthSpy: MockInstance<(typeof dbAuth)["clearAuth"]>; + let runInteractiveLoginSpy: MockInstance< + (typeof interactiveLogin)["runInteractiveLogin"] + >; + let getUserInfoSpy: MockInstance<(typeof dbUser)["getUserInfo"]>; + let listOrgsUncachedSpy: MockInstance< + (typeof apiClient)["listOrganizationsUncached"] + >; let func: LoginFunc; function createPromptContext() { return { - stdout: { write: vi.fn(() => true) }, - stderr: { write: vi.fn(() => true) }, + stdout: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }; } @@ -890,7 +893,10 @@ describe("login re-authentication interactive prompt", () => { // Defaults isEnvTokenActiveSpy.mockReturnValue(false); clearAuthSpy.mockResolvedValue(undefined); - runInteractiveLoginSpy.mockResolvedValue(true); + runInteractiveLoginSpy.mockResolvedValue({ + method: "oauth", + configPath: "/fake", + }); mockIsatty.mockReturnValue(true); mockPrompt.mockClear(); @@ -996,7 +1002,7 @@ describe("login re-authentication interactive prompt", () => { mockPrompt.mockResolvedValue(true); const setAuthTokenSpy = vi.spyOn(dbAuth, "setAuthToken"); - setAuthTokenSpy.mockImplementation(noop); + setAuthTokenSpy.mockReturnValue(TEST_ACCOUNT_ID); const checkTokenAccessSpy = vi.spyOn(apiClient, "checkTokenAccess"); checkTokenAccessSpy.mockResolvedValue(undefined); const getCurrentUserSpy = vi.spyOn(apiClient, "getCurrentUser"); @@ -1069,22 +1075,22 @@ describe("applyLoginUrl (host resolution)", () => { let savedUrl: string | undefined; beforeEach(() => { - savedHost = process.env.SENTRY_HOST; - savedUrl = process.env.SENTRY_URL; - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + savedHost = process.env["SENTRY_HOST"]; + savedUrl = process.env["SENTRY_URL"]; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; }); afterEach(() => { if (savedHost !== undefined) { - process.env.SENTRY_HOST = savedHost; + process.env["SENTRY_HOST"] = savedHost; } else { - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_HOST"]; } if (savedUrl !== undefined) { - process.env.SENTRY_URL = savedUrl; + process.env["SENTRY_URL"] = savedUrl; } else { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; } }); @@ -1093,8 +1099,8 @@ describe("applyLoginUrl (host resolution)", () => { await import("../../../src/commands/auth/login.js"); const host = applyLoginUrl("https://sentry.example.com"); expect(host).toBe("https://sentry.example.com"); - expect(process.env.SENTRY_HOST).toBe("https://sentry.example.com"); - expect(process.env.SENTRY_URL).toBe("https://sentry.example.com"); + expect(process.env["SENTRY_HOST"]).toBe("https://sentry.example.com"); + expect(process.env["SENTRY_URL"]).toBe("https://sentry.example.com"); }); test("no --url + no env falls back to SaaS default", async () => { @@ -1104,7 +1110,7 @@ describe("applyLoginUrl (host resolution)", () => { }); test("no --url + SENTRY_HOST with scheme uses env host", async () => { - process.env.SENTRY_HOST = "https://sentry.acme.com"; + process.env["SENTRY_HOST"] = "https://sentry.acme.com"; const { applyLoginUrl } = await import("../../../src/commands/auth/login.js"); expect(applyLoginUrl(undefined)).toBe("https://sentry.acme.com"); @@ -1114,22 +1120,25 @@ describe("applyLoginUrl (host resolution)", () => { // Regression: applyLoginUrl previously called normalizeOrigin directly // on bare hostnames. new URL("sentry.acme.com") throws → silent fallback // to SaaS default → token mis-scoped. - process.env.SENTRY_HOST = "sentry.acme.com"; + // Regression: applyLoginUrl previously called normalizeOrigin directly + // on bare hostnames. new URL("sentry.acme.com") throws → silent fallback + // to SaaS default → token mis-scoped. + process.env["SENTRY_HOST"] = "sentry.acme.com"; const { applyLoginUrl } = await import("../../../src/commands/auth/login.js"); expect(applyLoginUrl(undefined)).toBe("https://sentry.acme.com"); }); test("no --url + bare hostname SENTRY_URL prefixes https://", async () => { - process.env.SENTRY_URL = "sentry.acme.com"; + process.env["SENTRY_URL"] = "sentry.acme.com"; const { applyLoginUrl } = await import("../../../src/commands/auth/login.js"); expect(applyLoginUrl(undefined)).toBe("https://sentry.acme.com"); }); test("SENTRY_HOST takes precedence over SENTRY_URL", async () => { - process.env.SENTRY_HOST = "https://host.example.com"; - process.env.SENTRY_URL = "https://url.example.com"; + process.env["SENTRY_HOST"] = "https://host.example.com"; + process.env["SENTRY_URL"] = "https://url.example.com"; const { applyLoginUrl } = await import("../../../src/commands/auth/login.js"); expect(applyLoginUrl(undefined)).toBe("https://host.example.com"); @@ -1141,10 +1150,10 @@ describe("applyLoginUrl (trust anchor registration)", () => { let savedUrl: string | undefined; beforeEach(async () => { - savedHost = process.env.SENTRY_HOST; - savedUrl = process.env.SENTRY_URL; - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + savedHost = process.env["SENTRY_HOST"]; + savedUrl = process.env["SENTRY_URL"]; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; const { resetEnvTokenHostForTesting } = await import("../../../src/lib/env-token-host.js"); const { resetLoginTrustAnchorForTesting } = @@ -1155,14 +1164,14 @@ describe("applyLoginUrl (trust anchor registration)", () => { afterEach(async () => { if (savedHost !== undefined) { - process.env.SENTRY_HOST = savedHost; + process.env["SENTRY_HOST"] = savedHost; } else { - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_HOST"]; } if (savedUrl !== undefined) { - process.env.SENTRY_URL = savedUrl; + process.env["SENTRY_URL"] = savedUrl; } else { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; } const { resetEnvTokenHostForTesting } = await import("../../../src/lib/env-token-host.js"); @@ -1186,7 +1195,7 @@ describe("applyLoginUrl (trust anchor registration)", () => { }); test("SENTRY_HOST from boot env registers trust anchor (shell export is trusted)", async () => { - process.env.SENTRY_HOST = "https://sentry.acme.com"; + process.env["SENTRY_HOST"] = "https://sentry.acme.com"; const { captureEnvTokenHost } = await import("../../../src/lib/env-token-host.js"); captureEnvTokenHost(); @@ -1210,7 +1219,9 @@ describe("applyLoginUrl (trust anchor registration)", () => { // Simulate .sentryclirc shim writing env.SENTRY_URL AFTER boot (the // auth login has skipRcUrlCheck: true). This is the attacker path. - process.env.SENTRY_URL = "https://evil.com"; + // Simulate .sentryclirc shim writing env.SENTRY_URL AFTER boot (the + // auth login has skipRcUrlCheck: true). This is the attacker path. + process.env["SENTRY_URL"] = "https://evil.com"; const { applyLoginUrl } = await import("../../../src/commands/auth/login.js"); @@ -1234,9 +1245,9 @@ function makeRcConfig( url?: string, ): SentryCliRcConfig { return { - token, - url, - sources: { token: token ? "~/.sentryclirc" : undefined }, + ...(token === undefined ? {} : { token }), + ...(url === undefined ? {} : { url }), + sources: token ? { token: "~/.sentryclirc" } : {}, }; } @@ -1279,11 +1290,17 @@ describe("rcTokenHint", () => { }); describe("loginCommand.func scope selection (--read-only / --scope)", () => { - let isAuthenticatedSpy: ReturnType; - let isEnvTokenActiveSpy: ReturnType; - let hasStoredAuthCredentialsSpy: ReturnType; - let runInteractiveLoginSpy: ReturnType; - let listOrgsUncachedSpy: ReturnType; + let isAuthenticatedSpy: MockInstance<(typeof dbAuth)["isAuthenticated"]>; + let isEnvTokenActiveSpy: MockInstance<(typeof dbAuth)["isEnvTokenActive"]>; + let hasStoredAuthCredentialsSpy: MockInstance< + (typeof dbAuth)["hasStoredAuthCredentials"] + >; + let runInteractiveLoginSpy: MockInstance< + (typeof interactiveLogin)["runInteractiveLogin"] + >; + let listOrgsUncachedSpy: MockInstance< + (typeof apiClient)["listOrganizationsUncached"] + >; let func: LoginFunc; beforeEach(async () => { diff --git a/packages/cli/test/commands/auth/logout.test.ts b/packages/cli/test/commands/auth/logout.test.ts index 614a2d159c..badbe7ade4 100644 --- a/packages/cli/test/commands/auth/logout.test.ts +++ b/packages/cli/test/commands/auth/logout.test.ts @@ -94,7 +94,7 @@ describe("logoutCommand.func", () => { }); test("env token only (SENTRY_AUTH_TOKEN): throws AuthError with env var message", async () => { - process.env.SENTRY_AUTH_TOKEN = "sntrys_env_123"; + process.env["SENTRY_AUTH_TOKEN"] = "sntrys_env_123"; const func = await loadFunc(); const { context } = createContext(); @@ -108,7 +108,7 @@ describe("logoutCommand.func", () => { }); test("env token only (SENTRY_TOKEN): shows correct env var name in error", async () => { - process.env.SENTRY_TOKEN = "sntrys_token_456"; + process.env["SENTRY_TOKEN"] = "sntrys_token_456"; const func = await loadFunc(); const { context } = createContext(); @@ -119,7 +119,7 @@ describe("logoutCommand.func", () => { }); test("stored OAuth with env var set: removes stored account (env var still present)", async () => { - process.env.SENTRY_AUTH_TOKEN = "sntrys_env_123"; + process.env["SENTRY_AUTH_TOKEN"] = "sntrys_env_123"; addAccount("stored-token", "https://sentry.io", { userId: "1", email: "me@example.com", diff --git a/packages/cli/test/commands/auth/refresh.test.ts b/packages/cli/test/commands/auth/refresh.test.ts index c61a533a6a..1051da8919 100644 --- a/packages/cli/test/commands/auth/refresh.test.ts +++ b/packages/cli/test/commands/auth/refresh.test.ts @@ -5,7 +5,15 @@ * Covers the env-token guard and the main refresh flow. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { refreshCommand } from "../../../src/commands/auth/refresh.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as dbAuth from "../../../src/lib/db/auth.js"; @@ -39,10 +47,18 @@ function createContext() { return { context, getStdout: () => stdoutLines.join("") }; } +/** Fields of a `RefreshTokenResult` that these tests do not vary. */ +const REFRESH_RESULT_BASE = { + host: "https://sentry.io", + identity: "user-1", + source: "oauth", + refreshable: true, +} satisfies Partial; + describe("refreshCommand.func", () => { - let isEnvTokenActiveSpy: ReturnType; - let getAuthConfigSpy: ReturnType; - let refreshTokenSpy: ReturnType; + let isEnvTokenActiveSpy: MockInstance<(typeof dbAuth)["isEnvTokenActive"]>; + let getAuthConfigSpy: MockInstance<(typeof dbAuth)["getAuthConfig"]>; + let refreshTokenSpy: MockInstance<(typeof dbAuth)["refreshToken"]>; let func: RefreshFunc; beforeEach(async () => { @@ -84,10 +100,11 @@ describe("refreshCommand.func", () => { test("env token (SENTRY_TOKEN): throws AuthError with SENTRY_TOKEN in message", async () => { isEnvTokenActiveSpy.mockReturnValue(true); // Clear SENTRY_AUTH_TOKEN so SENTRY_TOKEN takes priority - const savedAuthToken = process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_AUTH_TOKEN; + const savedAuthToken = process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_AUTH_TOKEN"]; + // Set env var directly — getActiveEnvVarName() reads env vars via getEnvToken() // Set env var directly — getActiveEnvVarName() reads env vars via getEnvToken() - process.env.SENTRY_TOKEN = "sntrys_token_456"; + process.env["SENTRY_TOKEN"] = "sntrys_token_456"; const { context } = createContext(); @@ -100,9 +117,9 @@ describe("refreshCommand.func", () => { // Should NOT say SENTRY_AUTH_TOKEN expect((err as AuthError).message).not.toContain("SENTRY_AUTH_TOKEN"); } finally { - delete process.env.SENTRY_TOKEN; + delete process.env["SENTRY_TOKEN"]; if (savedAuthToken !== undefined) { - process.env.SENTRY_AUTH_TOKEN = savedAuthToken; + process.env["SENTRY_AUTH_TOKEN"] = savedAuthToken; } } @@ -135,6 +152,7 @@ describe("refreshCommand.func", () => { refreshToken: "refresh_abc", }); refreshTokenSpy.mockResolvedValue({ + ...REFRESH_RESULT_BASE, token: "new_token", refreshed: true, expiresIn: 3600, @@ -157,6 +175,7 @@ describe("refreshCommand.func", () => { refreshToken: "refresh_abc", }); refreshTokenSpy.mockResolvedValue({ + ...REFRESH_RESULT_BASE, token: "current_token", refreshed: false, expiresIn: 1800, @@ -178,6 +197,7 @@ describe("refreshCommand.func", () => { refreshToken: "refresh_abc", }); refreshTokenSpy.mockResolvedValue({ + ...REFRESH_RESULT_BASE, token: "new_token", refreshed: true, }); @@ -198,6 +218,7 @@ describe("refreshCommand.func", () => { refreshToken: "refresh_abc", }); refreshTokenSpy.mockResolvedValue({ + ...REFRESH_RESULT_BASE, token: "new_token", refreshed: true, expiresIn: 3600, @@ -215,10 +236,12 @@ describe("refreshCommand.func", () => { }); describe("refreshCommand.func scope re-authentication (--scope / --read-only)", () => { - let isEnvTokenActiveSpy: ReturnType; - let getAuthConfigSpy: ReturnType; - let refreshTokenSpy: ReturnType; - let runInteractiveLoginSpy: ReturnType; + let isEnvTokenActiveSpy: MockInstance<(typeof dbAuth)["isEnvTokenActive"]>; + let getAuthConfigSpy: MockInstance<(typeof dbAuth)["getAuthConfig"]>; + let refreshTokenSpy: MockInstance<(typeof dbAuth)["refreshToken"]>; + let runInteractiveLoginSpy: MockInstance< + (typeof interactiveLogin)["runInteractiveLogin"] + >; let func: RefreshFunc; beforeEach(async () => { @@ -358,6 +381,7 @@ describe("refreshCommand.func scope re-authentication (--scope / --read-only)", test("no scope flags uses standard token refresh path", async () => { refreshTokenSpy.mockResolvedValue({ + ...REFRESH_RESULT_BASE, token: "new_token", refreshed: true, expiresIn: 3600, diff --git a/packages/cli/test/commands/auth/status.test.ts b/packages/cli/test/commands/auth/status.test.ts index 5d5744e6c9..a839f6d379 100644 --- a/packages/cli/test/commands/auth/status.test.ts +++ b/packages/cli/test/commands/auth/status.test.ts @@ -10,18 +10,22 @@ * output and parse JSON for --json output. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { statusCommand } from "../../../src/commands/auth/status.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -30,12 +34,8 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/db/auth.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -44,12 +44,8 @@ import * as dbAuth from "../../../src/lib/db/auth.js"; vi.mock("../../../src/lib/db/defaults.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -58,12 +54,8 @@ import * as dbDefaults from "../../../src/lib/db/defaults.js"; vi.mock("../../../src/lib/db/index.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -72,12 +64,8 @@ import * as dbIndex from "../../../src/lib/db/index.js"; vi.mock("../../../src/lib/db/user.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -114,14 +102,20 @@ function createContext() { } describe("statusCommand.func", () => { - let getAuthConfigSpy: ReturnType; - let getAuthTokenSpy: ReturnType; - let isAuthenticatedSpy: ReturnType; - let getUserInfoSpy: ReturnType; - let getDefaultOrgSpy: ReturnType; - let getDefaultProjectSpy: ReturnType; - let getDbPathSpy: ReturnType; - let listOrgsSpy: ReturnType; + let getAuthConfigSpy: MockInstance<(typeof dbAuth)["getAuthConfig"]>; + let getAuthTokenSpy: MockInstance<(typeof dbAuth)["getAuthToken"]>; + let isAuthenticatedSpy: MockInstance<(typeof dbAuth)["isAuthenticated"]>; + let getUserInfoSpy: MockInstance<(typeof dbUser)["getUserInfo"]>; + let getDefaultOrgSpy: MockInstance< + (typeof dbDefaults)["getDefaultOrganization"] + >; + let getDefaultProjectSpy: MockInstance< + (typeof dbDefaults)["getDefaultProject"] + >; + let getDbPathSpy: MockInstance<(typeof dbIndex)["getDbPath"]>; + let listOrgsSpy: MockInstance< + (typeof apiClient)["listOrganizationsUncached"] + >; let func: StatusFunc; beforeEach(async () => { @@ -136,7 +130,7 @@ describe("statusCommand.func", () => { // Defaults that most tests override getAuthTokenSpy.mockReturnValue("fake-oauth-token"); - getUserInfoSpy.mockReturnValue(null); + getUserInfoSpy.mockReturnValue(undefined); getDefaultOrgSpy.mockReturnValue(null); getDefaultProjectSpy.mockReturnValue(null); getDbPathSpy.mockReturnValue("/fake/db/path"); @@ -429,7 +423,9 @@ describe("statusCommand.func", () => { source: "oauth", }); isAuthenticatedSpy.mockReturnValue(true); - listOrgsSpy.mockResolvedValue([{ name: "My Org", slug: "my-org" }]); + listOrgsSpy.mockResolvedValue([ + { id: "1", name: "My Org", slug: "my-org" }, + ]); const { context, getOutput } = createContext(); await func.call(context, humanFlags); @@ -480,6 +476,7 @@ describe("statusCommand.func", () => { }); isAuthenticatedSpy.mockReturnValue(true); getUserInfoSpy.mockReturnValue({ + userId: "user-1", name: "Jane Doe", email: "jane@example.com", }); @@ -560,13 +557,16 @@ describe("statusCommand.func", () => { }); isAuthenticatedSpy.mockReturnValue(true); getUserInfoSpy.mockReturnValue({ + userId: "user-1", name: "Jane Doe", email: "jane@example.com", username: "janedoe", }); getDefaultOrgSpy.mockReturnValue("my-org"); getDefaultProjectSpy.mockReturnValue("my-project"); - listOrgsSpy.mockResolvedValue([{ name: "My Org", slug: "my-org" }]); + listOrgsSpy.mockResolvedValue([ + { id: "2", name: "My Org", slug: "my-org" }, + ]); const { context, getOutput } = createContext(); await func.call(context, jsonFlags); diff --git a/packages/cli/test/commands/auth/switch.test.ts b/packages/cli/test/commands/auth/switch.test.ts index b85e8b98d6..3be44860df 100644 --- a/packages/cli/test/commands/auth/switch.test.ts +++ b/packages/cli/test/commands/auth/switch.test.ts @@ -21,6 +21,7 @@ import { useEnvSandbox, useTestConfigDir, } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; type ListFunc = (this: unknown, flags: { json?: boolean }) => Promise; type SwitchFunc = ( @@ -43,7 +44,7 @@ function createContext() { return { context: { stdout: { write: vi.fn((s: string) => chunks.push(s)) }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, getOutput: () => chunks.join(""), @@ -100,7 +101,7 @@ describe("auth list", () => { const out = getOutput(); const parsed = JSON.parse(out) as Array>; - expect(parsed.map((a) => [a.email, a.active])).toEqual([ + expect(parsed.map((a) => [a["email"], a["active"]])).toEqual([ ["jane@example.com", false], ["jane@corp.example.com", true], ]); @@ -167,7 +168,7 @@ describe("auth list", () => { }); test("lists it after the stored accounts, with its user", async () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; seedTwoAccounts(); const func = (await listCommand.loader()) as unknown as ListFunc; const { context, getOutput } = createContext(); @@ -190,7 +191,7 @@ describe("auth list", () => { }); test("labels it by its variable when the server doesn't say whose it is", async () => { - process.env.SENTRY_TOKEN = "other-token"; + process.env["SENTRY_TOKEN"] = "other-token"; const func = (await listCommand.loader()) as unknown as ListFunc; const { context, getOutput } = createContext(); @@ -202,7 +203,7 @@ describe("auth list", () => { test("leaves out a token set after boot, e.g. from .sentryclirc", async () => { getEnvTokenHost(); - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; seedTwoAccounts(); const func = (await listCommand.loader()) as unknown as ListFunc; const { context, getOutput } = createContext(); diff --git a/packages/cli/test/commands/auth/whoami.test.ts b/packages/cli/test/commands/auth/whoami.test.ts index 769838f061..f2d07762b6 100644 --- a/packages/cli/test/commands/auth/whoami.test.ts +++ b/packages/cli/test/commands/auth/whoami.test.ts @@ -6,18 +6,22 @@ * branches without real HTTP calls or database access. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { whoamiCommand } from "../../../src/commands/auth/whoami.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -26,12 +30,8 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/db/auth.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -40,12 +40,8 @@ import * as dbAuth from "../../../src/lib/db/auth.js"; vi.mock("../../../src/lib/db/user.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -125,11 +121,11 @@ function createContext() { } describe("whoamiCommand.func", () => { - let isAuthenticatedSpy: ReturnType; - let getAuthTokenSpy: ReturnType; - let storedAuthConfigSpy: ReturnType; - let getCurrentUserSpy: ReturnType; - let setUserInfoSpy: ReturnType; + let isAuthenticatedSpy: MockInstance<(typeof dbAuth)["isAuthenticated"]>; + let getAuthTokenSpy: MockInstance<(typeof dbAuth)["getAuthToken"]>; + let storedAuthConfigSpy: MockInstance<(typeof dbAuth)["getAuthConfig"]>; + let getCurrentUserSpy: MockInstance<(typeof apiClient)["getCurrentUser"]>; + let setUserInfoSpy: MockInstance<(typeof dbUser)["setUserInfo"]>; let func: WhoamiFunc; beforeEach(async () => { @@ -156,12 +152,12 @@ describe("whoamiCommand.func", () => { }); describe("unauthenticated", () => { - let getAuthConfigSpy: ReturnType; + let getAuthConfigSpy: MockInstance<(typeof dbAuth)["getAuthConfig"]>; let savedAuthToken: string | undefined; beforeEach(() => { - savedAuthToken = process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_AUTH_TOKEN; + savedAuthToken = process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_AUTH_TOKEN"]; getAuthConfigSpy = vi .spyOn(dbAuth, "getAuthConfig") .mockReturnValue(undefined); @@ -174,7 +170,7 @@ describe("whoamiCommand.func", () => { afterEach(() => { getAuthConfigSpy.mockRestore(); if (savedAuthToken !== undefined) { - process.env.SENTRY_AUTH_TOKEN = savedAuthToken; + process.env["SENTRY_AUTH_TOKEN"] = savedAuthToken; } }); diff --git a/packages/cli/test/commands/bash-hook.test.ts b/packages/cli/test/commands/bash-hook.test.ts index 907f3e28d2..47ca6a7015 100644 --- a/packages/cli/test/commands/bash-hook.test.ts +++ b/packages/cli/test/commands/bash-hook.test.ts @@ -17,9 +17,10 @@ useTestConfigDir("bash-hook-"); /** * Run bash-hook command and capture stdout. */ -async function runBashHook( - args: string[], -): Promise<{ output: string; exitCode: number }> { +async function runBashHook(args: string[]): Promise<{ + output: string; + exitCode: NonNullable; +}> { let output = ""; const mockContext: SentryContext = { process: { diff --git a/packages/cli/test/commands/build/download.test.ts b/packages/cli/test/commands/build/download.test.ts index 70b3bdaf88..9b335fcf93 100644 --- a/packages/cli/test/commands/build/download.test.ts +++ b/packages/cli/test/commands/build/download.test.ts @@ -18,6 +18,7 @@ import * as preprod from "../../../src/lib/api/preprod-artifacts.js"; import * as region from "../../../src/lib/region.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; +import { loadCommand } from "../../helpers.js"; let tmpDir: string; @@ -81,7 +82,7 @@ describe("build download", () => { installUrl: "https://us.sentry.io/dl/?response_format=plist", }); const { context, output } = createContext(); - const func = await downloadCommand.loader(); + const func = await loadCommand(downloadCommand); await func.call(context, { output: undefined }, "build-1"); @@ -102,7 +103,7 @@ describe("build download", () => { }); const outPath = join(tmpDir, "custom.apk"); const { context } = createContext(); - const func = await downloadCommand.loader(); + const func = await loadCommand(downloadCommand); await func.call(context, { output: outPath }, "b2"); @@ -113,7 +114,7 @@ describe("build download", () => { test("rejects a non-installable build without downloading", async () => { installSpy.mockResolvedValue({ isInstallable: false, installUrl: null }); const { context } = createContext(); - const func = await downloadCommand.loader(); + const func = await loadCommand(downloadCommand); await expect( func.call(context, { output: undefined }, "b3"), diff --git a/packages/cli/test/commands/build/upload.test.ts b/packages/cli/test/commands/build/upload.test.ts index 69b838a816..e8f8c5c60e 100644 --- a/packages/cli/test/commands/build/upload.test.ts +++ b/packages/cli/test/commands/build/upload.test.ts @@ -22,7 +22,7 @@ import * as preprod from "../../../src/lib/api/preprod-artifacts.js"; import { setAuthToken } from "../../../src/lib/db/auth.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; -import { useTestConfigDir } from "../../helpers.js"; +import { useTestConfigDir, loadCommand, at } from "../../helpers.js"; useTestConfigDir("build-upload-cmd-"); @@ -66,7 +66,7 @@ async function writeApk(name = "app-release.apk"): Promise { */ async function runViaApp( args: string[], -): Promise<{ stderr: string; exitCode: number | undefined }> { +): Promise<{ stderr: string; exitCode: NodeJS.Process["exitCode"] }> { let stderr = ""; const context: SentryContext = { process: { ...process, exitCode: undefined }, @@ -95,6 +95,8 @@ describe("build upload", () => { tmpDir = await mkdtemp(join(tmpdir(), "build-upload-")); setAuthToken("test-token", 3600); vi.spyOn(resolveTarget, "resolveOrgAndProject").mockResolvedValue({ + orgDisplay: "test-org", + projectDisplay: "test-project", org: "test-org", project: "test-project", }); @@ -111,7 +113,7 @@ describe("build upload", () => { test("uploads an APK and reports the artifact URL", async () => { const apk = await writeApk(); const harness = createContext(); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await func.call(harness.context, {}, apk); @@ -129,7 +131,7 @@ describe("build upload", () => { test("passes build metadata flags through to the API", async () => { const apk = await writeApk(); const harness = createContext(); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await func.call( harness.context, @@ -150,7 +152,7 @@ describe("build upload", () => { test("folds explicit git-metadata flags into the assemble body", async () => { const apk = await writeApk(); const harness = createContext(); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); const sha = "abcdef01".repeat(5); // 40 hex chars await func.call( @@ -174,7 +176,7 @@ describe("build upload", () => { const bad = join(tmpDir, "notes.txt"); await writeFile(bad, "not a build"); const harness = createContext(); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await func.call(harness.context, {}, bad); @@ -197,7 +199,7 @@ describe("build upload", () => { test("uploads an XCArchive directory", async () => { const dir = await writeXcarchive(); const harness = createContext(); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await func.call(harness.context, {}, dir); @@ -211,7 +213,7 @@ describe("build upload", () => { await mkdir(dir); await writeFile(join(dir, "readme.txt"), "hello"); const harness = createContext(); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await func.call(harness.context, {}, dir); @@ -230,7 +232,7 @@ describe("build upload", () => { }), ); const harness = createContext(); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await func.call(harness.context, {}, ipa); @@ -243,7 +245,7 @@ describe("build upload", () => { const bad = join(tmpDir, "bad.txt"); await writeFile(bad, "nope"); const harness = createContext(); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await func.call(harness.context, {}, apk, bad); @@ -299,7 +301,7 @@ describe("build upload", () => { "archive.xcarchive/dSYMs/Framework.dSYM/Contents/symbols" ], ).toEqual(strToU8("framework symbols")); - expect(existsSync(uploads[0].path)).toBe(false); + expect(existsSync(at(uploads, 0).path)).toBe(false); }); test.each(["apk", "aab", "xcarchive"])( @@ -317,7 +319,7 @@ describe("build upload", () => { ); } const harness = createContext(); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await func.call(harness.context, { dsym: ["unused.dSYM"] }, path); expect(uploadSpy).not.toHaveBeenCalled(); expect(harness.exitCode).toBe(1); @@ -326,7 +328,7 @@ describe("build upload", () => { ); test("rejects --dsym with multiple builds before resolving or uploading", async () => { - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await expect( func.call( createContext().context, @@ -354,7 +356,7 @@ describe("build upload", () => { }), ); const harness = createContext(); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await func.call(harness.context, { dsym: [zipPath] }, ipa); expect(uploadSpy).not.toHaveBeenCalled(); expect(harness.exitCode).toBe(1); diff --git a/packages/cli/test/commands/cli.test.ts b/packages/cli/test/commands/cli.test.ts index b9980c412f..ec5f2b3a4d 100644 --- a/packages/cli/test/commands/cli.test.ts +++ b/packages/cli/test/commands/cli.test.ts @@ -13,6 +13,8 @@ import { feedbackCommand } from "../../src/commands/cli/feedback.js"; import type { UpgradeResult } from "../../src/commands/cli/upgrade.js"; import { upgradeCommand } from "../../src/commands/cli/upgrade.js"; import { extractInputUrl } from "../../src/lib/fetch-input.js"; +import { loadCommand } from "../helpers.js"; +import type { Writer } from "../../src/types/index.js"; /** * Create a mock context with a process.stderr.write spy for capturing @@ -66,10 +68,10 @@ function createMockContext(overrides: Partial<{ execPath: string }> = {}): { describe("feedbackCommand.func", () => { test("throws ValidationError for empty message", async () => { // Access func through loader - const func = await feedbackCommand.loader(); + const func = await loadCommand(feedbackCommand); const mockContext = { - stdout: { write: vi.fn(() => true) }, - stderr: { write: vi.fn(() => true) }, + stdout: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, }; await expect(func.call(mockContext, {}, "")).rejects.toThrow( @@ -78,10 +80,10 @@ describe("feedbackCommand.func", () => { }); test("throws ValidationError for whitespace-only message", async () => { - const func = await feedbackCommand.loader(); + const func = await loadCommand(feedbackCommand); const mockContext = { - stdout: { write: vi.fn(() => true) }, - stderr: { write: vi.fn(() => true) }, + stdout: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, }; await expect(func.call(mockContext, {}, " ")).rejects.toThrow( @@ -90,10 +92,10 @@ describe("feedbackCommand.func", () => { }); test("throws ConfigError when Sentry is disabled", async () => { - const func = await feedbackCommand.loader(); + const func = await loadCommand(feedbackCommand); const mockContext = { - stdout: { write: vi.fn(() => true) }, - stderr: { write: vi.fn(() => true) }, + stdout: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, }; // Sentry is disabled in test environment (no DSN) @@ -130,7 +132,7 @@ describe("upgradeCommand.func", () => { headers: { "Content-Type": "application/json" }, }); - const func = await upgradeCommand.loader(); + const func = await loadCommand(upgradeCommand); const { context, getStdout, restore } = createMockContext(); restoreStderr = restore; @@ -152,7 +154,7 @@ describe("upgradeCommand.func", () => { headers: { "Content-Type": "application/json" }, }); - const func = await upgradeCommand.loader(); + const func = await loadCommand(upgradeCommand); const { context, getStdout, restore } = createMockContext(); restoreStderr = restore; @@ -177,7 +179,7 @@ describe("upgradeCommand.func", () => { }); }; - const func = await upgradeCommand.loader(); + const func = await loadCommand(upgradeCommand); const { context, getStdout, restore } = createMockContext(); restoreStderr = restore; @@ -201,7 +203,7 @@ describe("upgradeCommand.func", () => { headers: { "Content-Type": "application/json" }, }); - const func = await upgradeCommand.loader(); + const func = await loadCommand(upgradeCommand); const { context, getStdout, restore } = createMockContext(); restoreStderr = restore; @@ -220,7 +222,7 @@ describe("upgradeCommand.func", () => { return new Response("Not Found", { status: 404 }); }; - const func = await upgradeCommand.loader(); + const func = await loadCommand(upgradeCommand); const { context, restore } = createMockContext(); restoreStderr = restore; diff --git a/packages/cli/test/commands/cli/completion.test.ts b/packages/cli/test/commands/cli/completion.test.ts index b817254c1e..7a55882ec3 100644 --- a/packages/cli/test/commands/cli/completion.test.ts +++ b/packages/cli/test/commands/cli/completion.test.ts @@ -19,7 +19,7 @@ import type { SentryContext } from "../../../src/context.js"; async function runCompletion( args: string[], shellEnv?: string, -): Promise<{ output: string; exitCode: number | undefined }> { +): Promise<{ output: string; exitCode: NodeJS.Process["exitCode"] }> { let output = ""; const env = { ...process.env, SHELL: shellEnv }; const mockContext: SentryContext = { diff --git a/packages/cli/test/commands/cli/defaults.test.ts b/packages/cli/test/commands/cli/defaults.test.ts index a7ce599762..7239e6fd99 100644 --- a/packages/cli/test/commands/cli/defaults.test.ts +++ b/packages/cli/test/commands/cli/defaults.test.ts @@ -16,6 +16,7 @@ import { getDefaultProject, getDefaultUrl, getOnOffPreference, + type DefaultsState, ON_OFF_PREFERENCES, setDefaultOrganization, setDefaultProject, @@ -29,7 +30,8 @@ import { computeTelemetryEffective, isTelemetryEnabled, } from "../../../src/lib/telemetry.js"; -import { useTestConfigDir } from "../../helpers.js"; +import { useTestConfigDir, loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; // Force chalk to produce ANSI output in test environment chalk.level = 3; @@ -186,22 +188,22 @@ describe("isTelemetryEnabled", () => { // so the lazy require("../telemetry.js") is skipped. Under vitest // (Node.js), that CJS require path can't resolve ESM .js imports. getDatabase(); - savedNoTelemetry = process.env.SENTRY_CLI_NO_TELEMETRY; - savedDoNotTrack = process.env.DO_NOT_TRACK; + savedNoTelemetry = process.env["SENTRY_CLI_NO_TELEMETRY"]; + savedDoNotTrack = process.env["DO_NOT_TRACK"]; // Clear both env vars so persistent preference is tested - delete process.env.SENTRY_CLI_NO_TELEMETRY; - delete process.env.DO_NOT_TRACK; + delete process.env["SENTRY_CLI_NO_TELEMETRY"]; + delete process.env["DO_NOT_TRACK"]; }; const teardown = () => { if (savedNoTelemetry !== undefined) { - process.env.SENTRY_CLI_NO_TELEMETRY = savedNoTelemetry; + process.env["SENTRY_CLI_NO_TELEMETRY"] = savedNoTelemetry; } else { - delete process.env.SENTRY_CLI_NO_TELEMETRY; + delete process.env["SENTRY_CLI_NO_TELEMETRY"]; } if (savedDoNotTrack !== undefined) { - process.env.DO_NOT_TRACK = savedDoNotTrack; + process.env["DO_NOT_TRACK"] = savedDoNotTrack; } else { - delete process.env.DO_NOT_TRACK; + delete process.env["DO_NOT_TRACK"]; } }; @@ -238,7 +240,7 @@ describe("isTelemetryEnabled", () => { setup(); try { setOnOffPreference("telemetry", true); - process.env.SENTRY_CLI_NO_TELEMETRY = "1"; + process.env["SENTRY_CLI_NO_TELEMETRY"] = "1"; expect(isTelemetryEnabled()).toBe(false); } finally { teardown(); @@ -249,7 +251,7 @@ describe("isTelemetryEnabled", () => { setup(); try { setOnOffPreference("telemetry", true); - process.env.DO_NOT_TRACK = "1"; + process.env["DO_NOT_TRACK"] = "1"; expect(isTelemetryEnabled()).toBe(false); } finally { teardown(); @@ -260,8 +262,9 @@ describe("isTelemetryEnabled", () => { setup(); try { // Both set — SENTRY_CLI_NO_TELEMETRY is checked first - process.env.SENTRY_CLI_NO_TELEMETRY = "1"; - process.env.DO_NOT_TRACK = "0"; + // Both set — SENTRY_CLI_NO_TELEMETRY is checked first + process.env["SENTRY_CLI_NO_TELEMETRY"] = "1"; + process.env["DO_NOT_TRACK"] = "0"; expect(isTelemetryEnabled()).toBe(false); } finally { teardown(); @@ -271,7 +274,7 @@ describe("isTelemetryEnabled", () => { test("DO_NOT_TRACK=0 does not disable telemetry", () => { setup(); try { - process.env.DO_NOT_TRACK = "0"; + process.env["DO_NOT_TRACK"] = "0"; expect(isTelemetryEnabled()).toBe(true); } finally { teardown(); @@ -291,21 +294,21 @@ describe("computeTelemetryEffective", () => { // Force DB initialization while SENTRY_CLI_NO_TELEMETRY is still set // (see isTelemetryEnabled setup comment for rationale). getDatabase(); - savedNoTelemetry = process.env.SENTRY_CLI_NO_TELEMETRY; - savedDoNotTrack = process.env.DO_NOT_TRACK; - delete process.env.SENTRY_CLI_NO_TELEMETRY; - delete process.env.DO_NOT_TRACK; + savedNoTelemetry = process.env["SENTRY_CLI_NO_TELEMETRY"]; + savedDoNotTrack = process.env["DO_NOT_TRACK"]; + delete process.env["SENTRY_CLI_NO_TELEMETRY"]; + delete process.env["DO_NOT_TRACK"]; }; const teardown = () => { if (savedNoTelemetry !== undefined) { - process.env.SENTRY_CLI_NO_TELEMETRY = savedNoTelemetry; + process.env["SENTRY_CLI_NO_TELEMETRY"] = savedNoTelemetry; } else { - delete process.env.SENTRY_CLI_NO_TELEMETRY; + delete process.env["SENTRY_CLI_NO_TELEMETRY"]; } if (savedDoNotTrack !== undefined) { - process.env.DO_NOT_TRACK = savedDoNotTrack; + process.env["DO_NOT_TRACK"] = savedDoNotTrack; } else { - delete process.env.DO_NOT_TRACK; + delete process.env["DO_NOT_TRACK"]; } }; @@ -345,7 +348,7 @@ describe("computeTelemetryEffective", () => { setup(); try { setOnOffPreference("telemetry", true); - process.env.SENTRY_CLI_NO_TELEMETRY = "1"; + process.env["SENTRY_CLI_NO_TELEMETRY"] = "1"; const result = computeTelemetryEffective(); expect(result.enabled).toBe(false); expect(result.source).toBe("env:SENTRY_CLI_NO_TELEMETRY"); @@ -358,7 +361,7 @@ describe("computeTelemetryEffective", () => { setup(); try { setOnOffPreference("telemetry", true); - process.env.DO_NOT_TRACK = "1"; + process.env["DO_NOT_TRACK"] = "1"; const result = computeTelemetryEffective(); expect(result.enabled).toBe(false); expect(result.source).toBe("env:DO_NOT_TRACK"); @@ -372,16 +375,27 @@ describe("computeTelemetryEffective", () => { // formatDefaultsResult (human formatter) // --------------------------------------------------------------------------- +/** A {@link DefaultsState} with every default unset, plus `overrides`. */ +function defaultsState(overrides: Partial = {}): DefaultsState { + return { + organization: null, + project: null, + url: null, + headers: null, + "ca-cert": null, + telemetry: null, + "agent-skills": null, + graphics: null, + tips: null, + ...overrides, + }; +} + describe("formatDefaultsResult", () => { test("show action with empty defaults", () => { const result = formatDefaultsResult({ action: "show", - defaults: { - organization: null, - project: null, - telemetry: null, - url: null, - }, + defaults: defaultsState(), telemetryEffective: { enabled: true, source: "default" }, }); const plain = stripAnsi(result); @@ -395,14 +409,14 @@ describe("formatDefaultsResult", () => { test("show action with populated defaults", () => { const result = formatDefaultsResult({ action: "show", - defaults: { + defaults: defaultsState({ organization: "my-org", project: "my-proj", telemetry: "off", graphics: "off", tips: "off", url: "https://sentry.example.com", - }, + }), telemetryEffective: { enabled: false, source: "preference" }, }); const plain = stripAnsi(result); @@ -417,12 +431,9 @@ describe("formatDefaultsResult", () => { test("show action with env var override shows note", () => { const result = formatDefaultsResult({ action: "show", - defaults: { - organization: null, - project: null, + defaults: defaultsState({ telemetry: "on", - url: null, - }, + }), telemetryEffective: { enabled: false, source: "env:SENTRY_CLI_NO_TELEMETRY", @@ -436,12 +447,7 @@ describe("formatDefaultsResult", () => { test("show action with DO_NOT_TRACK override shows note", () => { const result = formatDefaultsResult({ action: "show", - defaults: { - organization: null, - project: null, - telemetry: null, - url: null, - }, + defaults: defaultsState(), telemetryEffective: { enabled: false, source: "env:DO_NOT_TRACK" }, }); const plain = stripAnsi(result); @@ -452,12 +458,9 @@ describe("formatDefaultsResult", () => { test("show action without env override shows no note", () => { const result = formatDefaultsResult({ action: "show", - defaults: { - organization: null, - project: null, + defaults: defaultsState({ telemetry: "off", - url: null, - }, + }), telemetryEffective: { enabled: false, source: "preference" }, }); const plain = stripAnsi(result); @@ -467,12 +470,9 @@ describe("formatDefaultsResult", () => { test("set action formats correctly", () => { const result = formatDefaultsResult({ action: "set", - defaults: { + defaults: defaultsState({ organization: "my-org", - project: null, - telemetry: null, - url: null, - }, + }), changed: { key: "organization", previousValue: null, @@ -488,12 +488,7 @@ describe("formatDefaultsResult", () => { test("clear action formats correctly", () => { const result = formatDefaultsResult({ action: "clear", - defaults: { - organization: null, - project: null, - telemetry: null, - url: null, - }, + defaults: defaultsState(), changed: { key: "project", previousValue: "old-proj", newValue: null }, }); const plain = stripAnsi(result); @@ -504,12 +499,7 @@ describe("formatDefaultsResult", () => { test("clear-all action formats correctly", () => { const result = formatDefaultsResult({ action: "clear-all", - defaults: { - organization: null, - project: null, - telemetry: null, - url: null, - }, + defaults: defaultsState(), }); const plain = stripAnsi(result); expect(plain).toContain("All defaults cleared"); @@ -518,12 +508,7 @@ describe("formatDefaultsResult", () => { test("set action with unknown key falls back to key name", () => { const result = formatDefaultsResult({ action: "set", - defaults: { - organization: null, - project: null, - telemetry: null, - url: null, - }, + defaults: defaultsState(), changed: { key: "unknown_key", previousValue: null, newValue: "val" }, }); const plain = stripAnsi(result); @@ -543,13 +528,13 @@ describe("defaultsCommand.func show-all aliases", () => { flags: Record, ...args: string[] ): Promise { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); const context = { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }; - const func = await defaultsCommand.loader(); + const func = await loadCommand(defaultsCommand); await (func as any).call(context, flags, ...args); return stdoutWrite.mock.calls.map((c) => String(c[0])).join(""); } diff --git a/packages/cli/test/commands/cli/fix.test.ts b/packages/cli/test/commands/cli/fix.test.ts index ea5a84c4be..f6934fee5f 100644 --- a/packages/cli/test/commands/cli/fix.test.ts +++ b/packages/cli/test/commands/cli/fix.test.ts @@ -23,7 +23,7 @@ import { } from "../../../src/lib/db/schema.js"; import { Database } from "../../../src/lib/db/sqlite.js"; import { EXIT, OutputError } from "../../../src/lib/errors.js"; -import { useTestConfigDir } from "../../helpers.js"; +import { useTestConfigDir, loadCommand } from "../../helpers.js"; /** * Generate DDL for creating a database with pre-migration tables. @@ -34,11 +34,11 @@ function createPreMigrationDatabase(db: Database): void { const preMigrationTables = ["dsn_cache"]; const statements: string[] = []; - for (const tableName of Object.keys(EXPECTED_TABLES)) { + for (const [tableName, ddl] of Object.entries(EXPECTED_TABLES)) { if (preMigrationTables.includes(tableName)) { statements.push(generatePreMigrationTableDDL(tableName)); } else { - statements.push(EXPECTED_TABLES[tableName]); + statements.push(ddl); } } @@ -59,9 +59,9 @@ function createDatabaseWithMissingTables( ): void { const statements: string[] = []; - for (const tableName of Object.keys(EXPECTED_TABLES)) { + for (const [tableName, ddl] of Object.entries(EXPECTED_TABLES)) { if (missingTables.includes(tableName)) continue; - statements.push(EXPECTED_TABLES[tableName]); + statements.push(ddl); } db.exec(statements.join(";\n")); @@ -110,7 +110,7 @@ async function runFix(dryRun: boolean) { let exitCode = 0; try { - const func = await fixCommand.loader(); + const func = await loadCommand(fixCommand); await func.call(context, { "dry-run": dryRun, json: false }); // Successful return — exitCode stays 0 } catch (err) { @@ -482,7 +482,7 @@ describe("sentry cli fix — ownership detection", () => { let exitCode = 0; try { - const func = await fixCommand.loader(); + const func = await loadCommand(fixCommand); await func.call(context, { "dry-run": dryRun, json: false }); } catch (err) { if (err instanceof OutputError) { @@ -563,17 +563,17 @@ describe("sentry cli fix — ownership detection", () => { getDatabase(); chmodSync(join(getOwnershipTestDir(), "cli.db"), 0o600); - const origSudoUser = process.env.SUDO_USER; - process.env.SUDO_USER = "testuser123"; + const origSudoUser = process.env["SUDO_USER"]; + process.env["SUDO_USER"] = "testuser123"; try { const { output } = await runFixWithUid(false, () => 9999); expect(output).toContain("testuser123"); } finally { if (origSudoUser === undefined) { - delete process.env.SUDO_USER; + delete process.env["SUDO_USER"]; } else { - process.env.SUDO_USER = origSudoUser; + process.env["SUDO_USER"] = origSudoUser; } } }); @@ -582,20 +582,20 @@ describe("sentry cli fix — ownership detection", () => { getDatabase(); chmodSync(join(getOwnershipTestDir(), "cli.db"), 0o600); - const origSudoUser = process.env.SUDO_USER; - const origUser = process.env.USER; - delete process.env.SUDO_USER; - process.env.USER = "fallbackuser"; + const origSudoUser = process.env["SUDO_USER"]; + const origUser = process.env["USER"]; + delete process.env["SUDO_USER"]; + process.env["USER"] = "fallbackuser"; try { const { output } = await runFixWithUid(false, () => 9999); expect(output).toContain("fallbackuser"); } finally { - if (origSudoUser !== undefined) process.env.SUDO_USER = origSudoUser; + if (origSudoUser !== undefined) process.env["SUDO_USER"] = origSudoUser; if (origUser !== undefined) { - process.env.USER = origUser; + process.env["USER"] = origUser; } else { - delete process.env.USER; + delete process.env["USER"]; } } }); @@ -656,10 +656,10 @@ describe("sentry cli fix — ownership detection", () => { getDatabase(); chmodSync(join(getOwnershipTestDir(), "cli.db"), 0o600); - const origSudoUser = process.env.SUDO_USER; - const origUser = process.env.USER; - process.env.SUDO_USER = "__nonexistent_user_xyzzy__"; - delete process.env.USER; + const origSudoUser = process.env["SUDO_USER"]; + const origUser = process.env["USER"]; + process.env["SUDO_USER"] = "__nonexistent_user_xyzzy__"; + delete process.env["USER"]; try { const { output, exitCode } = await runFixWithUid(false, () => 0); @@ -668,11 +668,11 @@ describe("sentry cli fix — ownership detection", () => { expect(output).toContain("Could not determine a non-root UID"); } finally { if (origSudoUser !== undefined) { - process.env.SUDO_USER = origSudoUser; + process.env["SUDO_USER"] = origSudoUser; } else { - delete process.env.SUDO_USER; + delete process.env["SUDO_USER"]; } - if (origUser !== undefined) process.env.USER = origUser; + if (origUser !== undefined) process.env["USER"] = origUser; } }); }); diff --git a/packages/cli/test/commands/cli/setup.test.ts b/packages/cli/test/commands/cli/setup.test.ts index e3004a0e74..cb5fc24988 100644 --- a/packages/cli/test/commands/cli/setup.test.ts +++ b/packages/cli/test/commands/cli/setup.test.ts @@ -1921,7 +1921,7 @@ describe("sentry cli setup — legacy migration records new path", () => { homeDir: testHome, env: { SENTRY_INSTALL_DIR: installDir, - SENTRY_CONFIG_DIR: process.env.SENTRY_CONFIG_DIR, + SENTRY_CONFIG_DIR: process.env["SENTRY_CONFIG_DIR"], }, }); restoreStderr = restore; diff --git a/packages/cli/test/commands/cli/uninstall.test.ts b/packages/cli/test/commands/cli/uninstall.test.ts index d8dee56bd0..af6c182fae 100644 --- a/packages/cli/test/commands/cli/uninstall.test.ts +++ b/packages/cli/test/commands/cli/uninstall.test.ts @@ -51,7 +51,7 @@ afterEach(() => { */ async function runUninstall( args: string[], -): Promise<{ output: string; exitCode: number | undefined }> { +): Promise<{ output: string; exitCode: NodeJS.Process["exitCode"] }> { let output = ""; const mockContext: SentryContext = { process: { diff --git a/packages/cli/test/commands/cli/upgrade.test.ts b/packages/cli/test/commands/cli/upgrade.test.ts index a811ad6cc2..dfbaf28781 100644 --- a/packages/cli/test/commands/cli/upgrade.test.ts +++ b/packages/cli/test/commands/cli/upgrade.test.ts @@ -24,7 +24,15 @@ import { delimiter, join } from "node:path"; import { gzipSync } from "node:zlib"; import { run } from "@stricli/core"; import { coerce as semverCoerce, inc as semverInc } from "semver"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; // Make child_process namespace mutable so vi.spyOn works on ESM exports vi.mock("node:child_process", async (importOriginal) => { @@ -118,8 +126,8 @@ function createMockContext( // whether to render) is not suppressed in non-TTY test environments. // The formatUpgradeResult output will contain ANSI codes, but test // assertions use toContain() which matches through them. - const origPlain = process.env.SENTRY_PLAIN_OUTPUT; - process.env.SENTRY_PLAIN_OUTPUT = "0"; + const origPlain = process.env["SENTRY_PLAIN_OUTPUT"]; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; // Capture logger output (routed to process.stderr) const origStderrWrite = process.stderr.write.bind(process.stderr); @@ -188,9 +196,9 @@ function createMockContext( process.stderr.write = origStderrWrite; process.stdout.write = origStdoutWrite; if (origPlain === undefined) { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } else { - process.env.SENTRY_PLAIN_OUTPUT = origPlain; + process.env["SENTRY_PLAIN_OUTPUT"] = origPlain; } }, }; @@ -903,7 +911,7 @@ describe("sentry cli upgrade — curl full upgrade path (child_process.spawn spy let testDir: string; let spawnedArgs: Array<{ cmd: string; args: string[] }>; - let spawnSpy: ReturnType; + let spawnSpy: MockInstance<(typeof child_process)["spawn"]>; let restoreStderr: (() => void) | undefined; /** Redirect curl install paths to temp dir instead of ~/.sentry/bin/ */ @@ -1675,7 +1683,7 @@ describe("sentry cli upgrade — migrateToStandaloneForNightly (child_process.sp useTestConfigDir("test-upgrade-migrate-"); let testDir: string; - let migrateSpawnSpy: ReturnType; + let migrateSpawnSpy: MockInstance<(typeof child_process)["spawn"]>; let restoreStderr: (() => void) | undefined; /** Redirect curl install paths to temp dir instead of ~/.sentry/bin/ */ @@ -1946,22 +1954,22 @@ describe("resolveUpgradeInstallDir", () => { let savedXdgBinHome: string | undefined; beforeEach(() => { - savedInstallDir = process.env.SENTRY_INSTALL_DIR; - savedXdgBinHome = process.env.XDG_BIN_HOME; - delete process.env.SENTRY_INSTALL_DIR; - delete process.env.XDG_BIN_HOME; + savedInstallDir = process.env["SENTRY_INSTALL_DIR"]; + savedXdgBinHome = process.env["XDG_BIN_HOME"]; + delete process.env["SENTRY_INSTALL_DIR"]; + delete process.env["XDG_BIN_HOME"]; }); afterEach(() => { if (savedInstallDir === undefined) { - delete process.env.SENTRY_INSTALL_DIR; + delete process.env["SENTRY_INSTALL_DIR"]; } else { - process.env.SENTRY_INSTALL_DIR = savedInstallDir; + process.env["SENTRY_INSTALL_DIR"] = savedInstallDir; } if (savedXdgBinHome === undefined) { - delete process.env.XDG_BIN_HOME; + delete process.env["XDG_BIN_HOME"]; } else { - process.env.XDG_BIN_HOME = savedXdgBinHome; + process.env["XDG_BIN_HOME"] = savedXdgBinHome; } }); diff --git a/packages/cli/test/commands/code-mappings/upload.test.ts b/packages/cli/test/commands/code-mappings/upload.test.ts index 572171014d..b1fb796191 100644 --- a/packages/cli/test/commands/code-mappings/upload.test.ts +++ b/packages/cli/test/commands/code-mappings/upload.test.ts @@ -5,13 +5,19 @@ * Upload tests are limited to validation since actual uploads require API access. */ +import type { SentryContext } from "../../../src/context.js"; import { mkdtemp, rm, writeFile } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join } from "node:path"; import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; import { uploadCommand } from "../../../src/commands/code-mappings/upload.js"; import { ValidationError } from "../../../src/lib/errors.js"; -import { useTestConfigDir } from "../../helpers.js"; +import { + useTestConfigDir, + loadCommand, + type TestCommandFunction, +} from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; useTestConfigDir("code-mappings-"); @@ -27,17 +33,17 @@ afterEach(async () => { function makeContext() { return { - stdout: { write: vi.fn(() => true) }, - stderr: { write: vi.fn(() => true) }, + stdout: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: tempDir, }; } describe("code-mappings upload validation", () => { - let func: Awaited>; + let func: TestCommandFunction; beforeEach(async () => { - func = await uploadCommand.loader(); + func = await loadCommand(uploadCommand); }); test("rejects nonexistent file", async () => { @@ -129,8 +135,8 @@ describe("extractRepoName", () => { // The command will pass validation but fail at org/project resolution // since we don't have real credentials. That's expected. - let func: Awaited>; - func = await uploadCommand.loader(); + let func: TestCommandFunction; + func = await loadCommand(uploadCommand); const ctx = makeContext(); // Should fail at org/project resolution, NOT at validation diff --git a/packages/cli/test/commands/dart-symbol-map/upload.test.ts b/packages/cli/test/commands/dart-symbol-map/upload.test.ts index 37a74009f5..3304afc791 100644 --- a/packages/cli/test/commands/dart-symbol-map/upload.test.ts +++ b/packages/cli/test/commands/dart-symbol-map/upload.test.ts @@ -29,9 +29,11 @@ afterEach(async () => { /** * Run the dart-symbol-map upload command and capture stdout/stderr. */ -async function runUpload( - args: string[], -): Promise<{ output: string; exitCode: number | undefined; error?: string }> { +async function runUpload(args: string[]): Promise<{ + output: string; + exitCode: NodeJS.Process["exitCode"]; + error?: string; +}> { let output = ""; let error = ""; const mockContext: SentryContext = { diff --git a/packages/cli/test/commands/dashboard/create.test.ts b/packages/cli/test/commands/dashboard/create.test.ts index 690ab64611..94d327f25b 100644 --- a/packages/cli/test/commands/dashboard/create.test.ts +++ b/packages/cli/test/commands/dashboard/create.test.ts @@ -5,19 +5,23 @@ * Uses spyOn pattern to mock API client and resolve-target. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { createCommand } from "../../../src/commands/dashboard/create.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -27,29 +31,26 @@ import { ContextError, ValidationError } from "../../../src/lib/errors.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; import type { DashboardDetail } from "../../../src/types/dashboard.js"; -import { parseFailure } from "../../helpers.js"; +import { parseFailure, loadCommand, rejection } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; // --------------------------------------------------------------------------- // Helpers // --------------------------------------------------------------------------- function createMockContext(cwd = "/tmp") { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd, }, stdoutWrite, @@ -72,10 +73,12 @@ const sampleDashboard: DashboardDetail = { // --------------------------------------------------------------------------- describe("dashboard create", () => { - let createDashboardSpy: ReturnType; - let resolveOrgSpy: ReturnType; - let resolveAllTargetsSpy: ReturnType; - let fetchProjectIdSpy: ReturnType; + let createDashboardSpy: MockInstance<(typeof apiClient)["createDashboard"]>; + let resolveOrgSpy: MockInstance<(typeof resolveTarget)["resolveOrg"]>; + let resolveAllTargetsSpy: MockInstance< + (typeof resolveTarget)["resolveAllTargets"] + >; + let fetchProjectIdSpy: MockInstance<(typeof resolveTarget)["fetchProjectId"]>; beforeEach(() => { createDashboardSpy = vi.spyOn(apiClient, "createDashboard"); @@ -99,7 +102,7 @@ describe("dashboard create", () => { test("creates dashboard with title and verifies API args", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "My Dashboard"); expect(createDashboardSpy).toHaveBeenCalledWith("acme-corp", { @@ -111,7 +114,7 @@ describe("dashboard create", () => { test("JSON output contains dashboard data and url", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: true }, "My Dashboard"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -123,7 +126,7 @@ describe("dashboard create", () => { test("human output contains 'Created dashboard' and title", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "My Dashboard"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -133,9 +136,11 @@ describe("dashboard create", () => { test("throws ValidationError when title is missing", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); - const err = await func.call(context, { json: false }).catch(parseFailure); + const err = parseFailure( + await rejection(func.call(context, { json: false })), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("Dashboard title is required"); expect(createDashboardSpy).not.toHaveBeenCalled(); @@ -143,7 +148,7 @@ describe("dashboard create", () => { test("two args parses target + title correctly", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "my-org/", "My Dashboard"); expect(createDashboardSpy).toHaveBeenCalledWith("my-org", { @@ -155,7 +160,7 @@ describe("dashboard create", () => { test("words after the target are one title", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "my-org/", "My", "Dashboard"); expect(createDashboardSpy).toHaveBeenCalledWith("my-org", { @@ -169,7 +174,7 @@ describe("dashboard create", () => { resolveOrgSpy.mockResolvedValue(null); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await expect( func.call(context, { json: false }, "My Dashboard"), @@ -178,7 +183,7 @@ describe("dashboard create", () => { test("explicit org/project target calls fetchProjectId", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call( context, { json: false }, diff --git a/packages/cli/test/commands/dashboard/list.test.ts b/packages/cli/test/commands/dashboard/list.test.ts index 3a860d1bd5..21f85e9058 100644 --- a/packages/cli/test/commands/dashboard/list.test.ts +++ b/packages/cli/test/commands/dashboard/list.test.ts @@ -22,12 +22,8 @@ import { vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -36,12 +32,8 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/browser.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -51,12 +43,8 @@ import { ContextError } from "../../../src/lib/errors.js"; vi.mock("../../../src/lib/db/pagination.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -65,12 +53,8 @@ import * as paginationDb from "../../../src/lib/db/pagination.js"; vi.mock("../../../src/lib/polling.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -79,25 +63,23 @@ import * as polling from "../../../src/lib/polling.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; import type { DashboardListItem } from "../../../src/types/dashboard.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; // --------------------------------------------------------------------------- // Helpers // --------------------------------------------------------------------------- function createMockContext(cwd = "/tmp") { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -205,11 +187,10 @@ describe("dashboard list command", () => { resolveOrgSpy.mockResolvedValue("test-org"); listDashboardsPaginatedSpy.mockResolvedValue({ data: [DASHBOARD_A, DASHBOARD_B], - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, defaultFlags({ json: true })); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -226,11 +207,10 @@ describe("dashboard list command", () => { resolveOrgSpy.mockResolvedValue("test-org"); listDashboardsPaginatedSpy.mockResolvedValue({ data: [], - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, defaultFlags({ json: true })); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -246,11 +226,10 @@ describe("dashboard list command", () => { resolveOrgSpy.mockResolvedValue("test-org"); listDashboardsPaginatedSpy.mockResolvedValue({ data: [DASHBOARD_A, DASHBOARD_B], - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, defaultFlags()); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -265,11 +244,10 @@ describe("dashboard list command", () => { resolveOrgSpy.mockResolvedValue("test-org"); listDashboardsPaginatedSpy.mockResolvedValue({ data: [], - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, defaultFlags()); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -284,7 +262,7 @@ describe("dashboard list command", () => { resolveOrgSpy.mockResolvedValue("test-org"); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, defaultFlags({ web: true })); expect(openInBrowserSpy).toHaveBeenCalled(); @@ -299,11 +277,10 @@ describe("dashboard list command", () => { resolveOrgSpy.mockResolvedValue("test-org"); listDashboardsPaginatedSpy.mockResolvedValue({ data: [DASHBOARD_A], - nextCursor: undefined, }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, defaultFlags({ json: true, limit: 10 })); expect(withProgressSpy).toHaveBeenCalled(); @@ -327,7 +304,7 @@ describe("dashboard list command", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, defaultFlags({ json: true, limit: 2 })); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -344,7 +321,7 @@ describe("dashboard list command", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, defaultFlags({ limit: 2 })); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -355,11 +332,10 @@ describe("dashboard list command", () => { resolveOrgSpy.mockResolvedValue("test-org"); listDashboardsPaginatedSpy.mockResolvedValue({ data: [DASHBOARD_A], - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, defaultFlags({ json: true })); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -379,11 +355,10 @@ describe("dashboard list command", () => { }) .mockResolvedValueOnce({ data: [DASHBOARD_C], - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); // Request 3 items, which exceeds a single page of 2 await func.call(context, defaultFlags({ json: true, limit: 3 })); @@ -404,11 +379,10 @@ describe("dashboard list command", () => { resolveOrgSpy.mockResolvedValue("test-org"); listDashboardsPaginatedSpy.mockResolvedValue({ data: [DASHBOARD_A, DASHBOARD_B, DASHBOARD_C], - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); // "Error*" should match "Errors Overview" only await func.call(context, defaultFlags({ json: true }), "Error*"); @@ -423,11 +397,10 @@ describe("dashboard list command", () => { // directly (explicit/org-all mode), no resolveOrg call needed listDashboardsPaginatedSpy.mockResolvedValue({ data: [DASHBOARD_A, DASHBOARD_B, DASHBOARD_C], - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, defaultFlags({ json: true }), "my-org/", "*API*"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -438,7 +411,7 @@ describe("dashboard list command", () => { test("a dashboard URL fails to parse with a view suggestion, before any request", async () => { const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const error = await func .call( @@ -459,11 +432,10 @@ describe("dashboard list command", () => { resolveOrgSpy.mockResolvedValue("test-org"); listDashboardsPaginatedSpy.mockResolvedValue({ data: [DASHBOARD_A, DASHBOARD_B, DASHBOARD_C], - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); // Lowercase "error*" should still match "Errors Overview" await func.call(context, defaultFlags({ json: true }), "error*"); @@ -477,11 +449,10 @@ describe("dashboard list command", () => { resolveOrgSpy.mockResolvedValue("test-org"); listDashboardsPaginatedSpy.mockResolvedValue({ data: [DASHBOARD_A, DASHBOARD_B, DASHBOARD_C], - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, defaultFlags(), "NoMatch*"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -492,11 +463,10 @@ describe("dashboard list command", () => { resolveOrgSpy.mockResolvedValue("test-org"); listDashboardsPaginatedSpy.mockResolvedValue({ data: [DASHBOARD_A, DASHBOARD_B, DASHBOARD_C], - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); // "Perf" is a prefix of "Performance" → fuzzy match finds it await func.call(context, defaultFlags(), "Perf"); @@ -514,11 +484,10 @@ describe("dashboard list command", () => { // directly without calling resolveOrg listDashboardsPaginatedSpy.mockResolvedValue({ data: [DASHBOARD_A], - nextCursor: undefined, }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, defaultFlags({ json: true }), "my-org/"); expect(listDashboardsPaginatedSpy).toHaveBeenCalledWith( @@ -533,7 +502,7 @@ describe("dashboard list command", () => { ); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect(func.call(context, defaultFlags())).rejects.toThrow( "organization", @@ -547,12 +516,14 @@ describe("dashboard list command", () => { test("handles dashboards with undefined title in human output", async () => { resolveOrgSpy.mockResolvedValue("test-org"); listDashboardsPaginatedSpy.mockResolvedValue({ - data: [{ id: "1", title: undefined, widgetDisplay: [] }, DASHBOARD_B], - nextCursor: undefined, + data: [ + { id: "1", title: undefined, widgetDisplay: [] }, + DASHBOARD_B, + ], }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, defaultFlags()); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -563,12 +534,13 @@ describe("dashboard list command", () => { test("handles dashboards with undefined title in JSON output", async () => { resolveOrgSpy.mockResolvedValue("test-org"); listDashboardsPaginatedSpy.mockResolvedValue({ - data: [{ id: "1", title: undefined, widgetDisplay: [] }], - nextCursor: undefined, + data: [ + { id: "1", title: undefined, widgetDisplay: [] }, + ], }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, defaultFlags({ json: true })); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -579,12 +551,14 @@ describe("dashboard list command", () => { test("glob filter does not crash on dashboards with undefined title", async () => { resolveOrgSpy.mockResolvedValue("test-org"); listDashboardsPaginatedSpy.mockResolvedValue({ - data: [{ id: "1", title: undefined, widgetDisplay: [] }, DASHBOARD_B], - nextCursor: undefined, + data: [ + { id: "1", title: undefined, widgetDisplay: [] }, + DASHBOARD_B, + ], }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, defaultFlags({ json: true }), "Perf*"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); diff --git a/packages/cli/test/commands/dashboard/resolve.test.ts b/packages/cli/test/commands/dashboard/resolve.test.ts index 3d86e04447..9736f7c114 100644 --- a/packages/cli/test/commands/dashboard/resolve.test.ts +++ b/packages/cli/test/commands/dashboard/resolve.test.ts @@ -6,7 +6,15 @@ * test/lib/dashboard-arguments.test.ts. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { applyGroupLimitAutoDefault, autoDefaultGroupLimit, @@ -23,12 +31,8 @@ import { vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -44,12 +48,8 @@ import { vi.mock("../../../src/lib/region.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -58,12 +58,8 @@ import * as region from "../../../src/lib/region.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -74,7 +70,9 @@ import * as resolveTarget from "../../../src/lib/resolve-target.js"; // --------------------------------------------------------------------------- describe("resolveDashboardId", () => { - let listDashboardsPaginatedSpy: ReturnType; + let listDashboardsPaginatedSpy: MockInstance< + (typeof apiClient)["listDashboardsPaginated"] + >; beforeEach(() => { listDashboardsPaginatedSpy = vi.spyOn(apiClient, "listDashboardsPaginated"); @@ -96,7 +94,6 @@ describe("resolveDashboardId", () => { { id: "10", title: "Errors Overview" }, { id: "20", title: "Performance" }, ], - nextCursor: undefined, }); const id = await resolveDashboardId("test-org", "Performance"); @@ -106,7 +103,6 @@ describe("resolveDashboardId", () => { test("title match is case-insensitive", async () => { listDashboardsPaginatedSpy.mockResolvedValue({ data: [{ id: "10", title: "Errors Overview" }], - nextCursor: undefined, }); const id = await resolveDashboardId("test-org", "errors overview"); @@ -119,7 +115,6 @@ describe("resolveDashboardId", () => { { id: "default-overview", title: "General" }, { id: "20", title: "Performance" }, ], - nextCursor: undefined, }); const id = await resolveDashboardId("test-org", "default-overview"); @@ -129,7 +124,6 @@ describe("resolveDashboardId", () => { test("ID match is case-insensitive", async () => { listDashboardsPaginatedSpy.mockResolvedValue({ data: [{ id: "default-overview", title: "General" }], - nextCursor: undefined, }); const id = await resolveDashboardId("test-org", "Default-Overview"); @@ -142,7 +136,6 @@ describe("resolveDashboardId", () => { { id: "perf", title: "Performance Dashboard" }, { id: "30", title: "perf" }, ], - nextCursor: undefined, }); const id = await resolveDashboardId("test-org", "perf"); @@ -152,7 +145,6 @@ describe("resolveDashboardId", () => { test("title match still works when no ID matches", async () => { listDashboardsPaginatedSpy.mockResolvedValue({ data: [{ id: "default-overview", title: "General" }], - nextCursor: undefined, }); const id = await resolveDashboardId("test-org", "General"); @@ -165,7 +157,6 @@ describe("resolveDashboardId", () => { { id: "10", title: "Errors Overview" }, { id: "20", title: "Performance" }, ], - nextCursor: undefined, }); try { @@ -184,7 +175,6 @@ describe("resolveDashboardId", () => { { id: "10", title: "Errors Overview" }, { id: "20", title: "Performance" }, ], - nextCursor: undefined, }); try { @@ -202,7 +192,6 @@ describe("resolveDashboardId", () => { test("no dashboards at all shows empty org message", async () => { listDashboardsPaginatedSpy.mockResolvedValue({ data: [], - nextCursor: undefined, }); try { @@ -219,10 +208,9 @@ describe("resolveDashboardId", () => { test("handles dashboards with undefined title without crashing", async () => { listDashboardsPaginatedSpy.mockResolvedValue({ data: [ - { id: "10", title: undefined as unknown as string }, + { id: "10", title: undefined }, { id: "20", title: "Performance" }, ], - nextCursor: undefined, }); const id = await resolveDashboardId("test-org", "Performance"); @@ -231,8 +219,7 @@ describe("resolveDashboardId", () => { test("undefined title dashboards are collected as '(untitled)' in suggestions", async () => { listDashboardsPaginatedSpy.mockResolvedValue({ - data: [{ id: "10", title: undefined as unknown as string }], - nextCursor: undefined, + data: [{ id: "10", title: undefined }], }); try { @@ -251,8 +238,12 @@ describe("resolveDashboardId", () => { // --------------------------------------------------------------------------- describe("resolveOrgFromTarget", () => { - let resolveOrgOnlyTargetSpy: ReturnType; - let resolveEffectiveOrgSpy: ReturnType; + let resolveOrgOnlyTargetSpy: MockInstance< + (typeof resolveTarget)["resolveOrgOnlyTarget"] + >; + let resolveEffectiveOrgSpy: MockInstance< + (typeof region)["resolveEffectiveOrg"] + >; beforeEach(() => { resolveOrgOnlyTargetSpy = vi.spyOn(resolveTarget, "resolveOrgOnlyTarget"); @@ -372,7 +363,7 @@ describe("enrichDashboardError", () => { id: "100", title: "Error Overview", dateCreated: "", - createdBy: { id: 0, name: "", email: "" }, + createdBy: { name: "", email: "" }, widgets: [], projects: [], }, @@ -380,12 +371,11 @@ describe("enrichDashboardError", () => { id: "200", title: "Performance", dateCreated: "", - createdBy: { id: 0, name: "", email: "" }, + createdBy: { name: "", email: "" }, widgets: [], projects: [], }, ], - nextCursor: undefined, }); try { await enrichDashboardError(apiErr, { diff --git a/packages/cli/test/commands/dashboard/restore.test.ts b/packages/cli/test/commands/dashboard/restore.test.ts index 3a2f33980c..f810743e9d 100644 --- a/packages/cli/test/commands/dashboard/restore.test.ts +++ b/packages/cli/test/commands/dashboard/restore.test.ts @@ -6,7 +6,15 @@ */ import { ArgumentParseError } from "@stricli/core"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolve from "../../../src/commands/dashboard/resolve.js"; import { restoreCommand } from "../../../src/commands/dashboard/restore.js"; @@ -16,14 +24,16 @@ import * as apiClient from "../../../src/lib/api-client.js"; import * as polling from "../../../src/lib/polling.js"; import { ValidationError } from "../../../src/lib/errors.js"; import type { DashboardDetail } from "../../../src/types/dashboard.js"; +import { loadCommand, at } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; // --------------------------------------------------------------------------- // Helpers // --------------------------------------------------------------------------- function createMockContext(cwd = "/tmp") { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -71,10 +81,16 @@ const RESTORED_DASHBOARD: DashboardDetail = { // --------------------------------------------------------------------------- describe("dashboard restore command", () => { - let restoreDashboardRevisionSpy: ReturnType; - let resolveOrgFromTargetSpy: ReturnType; - let resolveDashboardIdSpy: ReturnType; - let withProgressSpy: ReturnType; + let restoreDashboardRevisionSpy: MockInstance< + (typeof apiClient)["restoreDashboardRevision"] + >; + let resolveOrgFromTargetSpy: MockInstance< + (typeof resolve)["resolveOrgFromTarget"] + >; + let resolveDashboardIdSpy: MockInstance< + (typeof resolve)["resolveDashboardId"] + >; + let withProgressSpy: MockInstance<(typeof polling)["withProgress"]>; beforeEach(() => { restoreDashboardRevisionSpy = vi.spyOn( @@ -111,7 +127,7 @@ describe("dashboard restore command", () => { test("restores dashboard and outputs JSON", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await restoreCommand.loader(); + const func = await loadCommand(restoreCommand); await func.call( context, defaultFlags({ json: true, revision: "42" }), @@ -134,7 +150,7 @@ describe("dashboard restore command", () => { test("restores dashboard and outputs human-readable format", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await restoreCommand.loader(); + const func = await loadCommand(restoreCommand); await func.call(context, defaultFlags({ revision: "42" }), "123"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -145,8 +161,8 @@ describe("dashboard restore command", () => { test("human output includes dashboard details table", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await restoreCommand.loader(); - await func.call(context, defaultFlags({ revision: 1 }), "123"); + const func = await loadCommand(restoreCommand); + await func.call(context, defaultFlags({ revision: "1" }), "123"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); expect(output).toContain("ID"); @@ -162,7 +178,7 @@ describe("dashboard restore command", () => { test("uses dashboard ID from positional argument", async () => { const { context } = createMockContext(); - const func = await restoreCommand.loader(); + const func = await loadCommand(restoreCommand); await func.call( context, defaultFlags({ json: true, revision: "5" }), @@ -179,7 +195,7 @@ describe("dashboard restore command", () => { test("two args parses target + dashboard correctly", async () => { const { context } = createMockContext(); - const func = await restoreCommand.loader(); + const func = await loadCommand(restoreCommand); await func.call( context, defaultFlags({ json: true, revision: "10" }), @@ -192,7 +208,7 @@ describe("dashboard restore command", () => { test("resolves dashboard by title", async () => { const { context } = createMockContext(); - const func = await restoreCommand.loader(); + const func = await loadCommand(restoreCommand); await func.call( context, defaultFlags({ json: true, revision: "3" }), @@ -207,7 +223,7 @@ describe("dashboard restore command", () => { test("joins an unquoted title after a target", async () => { const { context } = createMockContext(); - const func = await restoreCommand.loader(); + const func = await loadCommand(restoreCommand); await func.call( context, defaultFlags({ json: true, revision: "3" }), @@ -224,7 +240,7 @@ describe("dashboard restore command", () => { test("takes the org and dashboard ID from a pasted dashboard URL", async () => { const { context } = createMockContext(); - const func = await restoreCommand.loader(); + const func = await loadCommand(restoreCommand); await func.call( context, defaultFlags({ json: true, revision: "3" }), @@ -241,7 +257,7 @@ describe("dashboard restore command", () => { test("fails to parse a missing dashboard before any request", async () => { const { context } = createMockContext(); - const func = await restoreCommand.loader(); + const func = await loadCommand(restoreCommand); const error = await func .call(context, defaultFlags({ revision: "3" })) @@ -266,7 +282,7 @@ describe("dashboard restore command", () => { // what happens when an invalid value is passed. The parse function // will throw ValidationError directly. const { context } = createMockContext(); - const func = await restoreCommand.loader(); + const func = await loadCommand(restoreCommand); // We can't easily test the flag parsing directly, but we can verify // the API is called with the correct revision when valid @@ -284,7 +300,7 @@ describe("dashboard restore command", () => { restoreDashboardRevisionSpy.mockRejectedValue(apiError); const { context } = createMockContext(); - const func = await restoreCommand.loader(); + const func = await loadCommand(restoreCommand); await expect( func.call(context, defaultFlags({ revision: "999" }), "123"), @@ -297,13 +313,11 @@ describe("dashboard restore command", () => { test("shows progress message during restore", async () => { const { context } = createMockContext(); - const func = await restoreCommand.loader(); + const func = await loadCommand(restoreCommand); await func.call(context, defaultFlags({ revision: "42" }), "123"); expect(withProgressSpy).toHaveBeenCalled(); - const [opts] = withProgressSpy.mock.calls[0] as [ - { message: string; json: boolean }, - ]; + const [opts] = at(withProgressSpy.mock.calls, 0); expect(opts.message).toContain("Restoring revision 42"); }); }); diff --git a/packages/cli/test/commands/dashboard/revisions.test.ts b/packages/cli/test/commands/dashboard/revisions.test.ts index 7003928718..331f7e57e2 100644 --- a/packages/cli/test/commands/dashboard/revisions.test.ts +++ b/packages/cli/test/commands/dashboard/revisions.test.ts @@ -5,7 +5,15 @@ * Uses spyOn pattern to mock API client, pagination DB, resolve, and polling modules. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolve from "../../../src/commands/dashboard/resolve.js"; import { revisionsCommand } from "../../../src/commands/dashboard/revisions.js"; @@ -16,14 +24,16 @@ import * as paginationDb from "../../../src/lib/db/pagination.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as polling from "../../../src/lib/polling.js"; import type { DashboardRevision } from "../../../src/types/dashboard.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; // --------------------------------------------------------------------------- // Helpers // --------------------------------------------------------------------------- function createMockContext(cwd = "/tmp") { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -95,13 +105,23 @@ const REVISION_C: DashboardRevision = { // --------------------------------------------------------------------------- describe("dashboard revisions command", () => { - let listDashboardRevisionsPaginatedSpy: ReturnType; - let resolveOrgFromTargetSpy: ReturnType; - let resolveDashboardIdSpy: ReturnType; - let withProgressSpy: ReturnType; - let advancePaginationStateSpy: ReturnType; - let hasPreviousPageSpy: ReturnType; - let resolveCursorSpy: ReturnType; + let listDashboardRevisionsPaginatedSpy: MockInstance< + (typeof apiClient)["listDashboardRevisionsPaginated"] + >; + let resolveOrgFromTargetSpy: MockInstance< + (typeof resolve)["resolveOrgFromTarget"] + >; + let resolveDashboardIdSpy: MockInstance< + (typeof resolve)["resolveDashboardId"] + >; + let withProgressSpy: MockInstance<(typeof polling)["withProgress"]>; + let advancePaginationStateSpy: MockInstance< + (typeof paginationDb)["advancePaginationState"] + >; + let hasPreviousPageSpy: MockInstance< + (typeof paginationDb)["hasPreviousPage"] + >; + let resolveCursorSpy: MockInstance<(typeof paginationDb)["resolveCursor"]>; beforeEach(() => { listDashboardRevisionsPaginatedSpy = vi.spyOn( @@ -151,11 +171,10 @@ describe("dashboard revisions command", () => { test("outputs JSON envelope with { data, hasMore, hasPrev } when --json", async () => { listDashboardRevisionsPaginatedSpy.mockResolvedValue({ data: [REVISION_A, REVISION_B], - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await revisionsCommand.loader(); + const func = await loadCommand(revisionsCommand); await func.call(context, defaultFlags({ json: true }), "123"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -172,11 +191,10 @@ describe("dashboard revisions command", () => { test("outputs { data: [], hasMore: false } when no revisions exist", async () => { listDashboardRevisionsPaginatedSpy.mockResolvedValue({ data: [], - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await revisionsCommand.loader(); + const func = await loadCommand(revisionsCommand); await func.call(context, defaultFlags({ json: true }), "123"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -191,11 +209,10 @@ describe("dashboard revisions command", () => { test("outputs human-readable table with column headers", async () => { listDashboardRevisionsPaginatedSpy.mockResolvedValue({ data: [REVISION_A, REVISION_B], - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await revisionsCommand.loader(); + const func = await loadCommand(revisionsCommand); await func.call(context, defaultFlags(), "123"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -208,11 +225,10 @@ describe("dashboard revisions command", () => { test("shows empty state message when no revisions exist", async () => { listDashboardRevisionsPaginatedSpy.mockResolvedValue({ data: [], - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await revisionsCommand.loader(); + const func = await loadCommand(revisionsCommand); await func.call(context, defaultFlags(), "123"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -230,7 +246,7 @@ describe("dashboard revisions command", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await revisionsCommand.loader(); + const func = await loadCommand(revisionsCommand); await func.call(context, defaultFlags({ json: true, limit: 2 }), "123"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -246,7 +262,7 @@ describe("dashboard revisions command", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await revisionsCommand.loader(); + const func = await loadCommand(revisionsCommand); await func.call(context, defaultFlags({ limit: 2 }), "123"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -257,11 +273,10 @@ describe("dashboard revisions command", () => { hasPreviousPageSpy.mockReturnValue(true); listDashboardRevisionsPaginatedSpy.mockResolvedValue({ data: [REVISION_B, REVISION_C], - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await revisionsCommand.loader(); + const func = await loadCommand(revisionsCommand); await func.call(context, defaultFlags({ limit: 2 }), "123"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -275,7 +290,7 @@ describe("dashboard revisions command", () => { .mockResolvedValueOnce({ data: page, nextCursor: "100:2:0" }); const { context, stdoutWrite } = createMockContext(); - const func = await revisionsCommand.loader(); + const func = await loadCommand(revisionsCommand); await func.call(context, defaultFlags({ json: true, limit: 200 }), "123"); // The revisions endpoint uses OffsetPaginator, whose cursor encodes the @@ -299,11 +314,10 @@ describe("dashboard revisions command", () => { test("uses dashboard ID from positional argument", async () => { listDashboardRevisionsPaginatedSpy.mockResolvedValue({ data: [REVISION_A], - nextCursor: undefined, }); const { context } = createMockContext(); - const func = await revisionsCommand.loader(); + const func = await loadCommand(revisionsCommand); await func.call(context, defaultFlags({ json: true }), "456"); expect(resolveDashboardIdSpy).toHaveBeenCalledWith("test-org", "456"); @@ -317,11 +331,10 @@ describe("dashboard revisions command", () => { test("two args parses target + dashboard correctly", async () => { listDashboardRevisionsPaginatedSpy.mockResolvedValue({ data: [REVISION_A], - nextCursor: undefined, }); const { context } = createMockContext(); - const func = await revisionsCommand.loader(); + const func = await loadCommand(revisionsCommand); await func.call(context, defaultFlags({ json: true }), "my-org/", "789"); expect(resolveDashboardIdSpy).toHaveBeenCalledWith("test-org", "789"); @@ -330,11 +343,10 @@ describe("dashboard revisions command", () => { test("resolves dashboard by title", async () => { listDashboardRevisionsPaginatedSpy.mockResolvedValue({ data: [REVISION_A], - nextCursor: undefined, }); const { context } = createMockContext(); - const func = await revisionsCommand.loader(); + const func = await loadCommand(revisionsCommand); await func.call( context, defaultFlags({ json: true }), diff --git a/packages/cli/test/commands/dashboard/widget/add.test.ts b/packages/cli/test/commands/dashboard/widget/add.test.ts index ac783e8184..4559844460 100644 --- a/packages/cli/test/commands/dashboard/widget/add.test.ts +++ b/packages/cli/test/commands/dashboard/widget/add.test.ts @@ -6,19 +6,23 @@ */ import { ArgumentParseError } from "@stricli/core"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { addCommand } from "../../../../src/commands/dashboard/widget/add.js"; vi.mock("../../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -30,28 +34,26 @@ vi.mock("../../../../src/lib/resolve-target.js", async (importOriginal) => { await importOriginal< typeof import("../../../../src/lib/resolve-target.js") >(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../../src/lib/resolve-target.js"; import type { DashboardDetail } from "../../../../src/types/dashboard.js"; +import { loadCommand, at, must, rejection } from "../../../helpers.js"; +import type { Writer } from "../../../../src/types/index.js"; // --------------------------------------------------------------------------- // Helpers // --------------------------------------------------------------------------- function createMockContext(cwd = "/tmp") { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd, }, stdoutWrite, @@ -105,9 +107,11 @@ const sampleDashboard: DashboardDetail = { // --------------------------------------------------------------------------- describe("dashboard widget add", () => { - let getDashboardSpy: ReturnType; - let updateDashboardSpy: ReturnType; - let resolveOrgOnlyTargetSpy: ReturnType; + let getDashboardSpy: MockInstance<(typeof apiClient)["getDashboard"]>; + let updateDashboardSpy: MockInstance<(typeof apiClient)["updateDashboard"]>; + let resolveOrgOnlyTargetSpy: MockInstance< + (typeof resolveTarget)["resolveOrgOnlyTarget"] + >; beforeEach(() => { getDashboardSpy = vi.spyOn(apiClient, "getDashboard"); @@ -131,7 +135,7 @@ describe("dashboard widget add", () => { test("adds widget with correct API args (getDashboard then updateDashboard)", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); await func.call( context, { json: false, display: "line", query: ["count"] }, @@ -151,7 +155,7 @@ describe("dashboard widget add", () => { }), ); // Original widgets should be preserved plus the new one - const body = updateDashboardSpy.mock.calls[0]?.[2]; + const body = at(updateDashboardSpy.mock.calls, 0)[2]; expect(body.widgets.length).toBe(3); }); @@ -167,9 +171,9 @@ describe("dashboard widget add", () => { resolveOrgOnlyTargetSpy.mockResolvedValue("my-org"); const listDashboardsSpy = vi .spyOn(apiClient, "listDashboardsPaginated") - .mockResolvedValue({ data: [], nextCursor: undefined }); + .mockResolvedValue({ data: [] }); const { context, stdoutWrite } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); try { await func.call( @@ -209,7 +213,7 @@ describe("dashboard widget add", () => { test("JSON output contains dashboard, widget, and url", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); await func.call( context, { json: true, display: "big_number", query: ["count"] }, @@ -227,7 +231,7 @@ describe("dashboard widget add", () => { test("human output contains 'Added widget' and title", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); await func.call( context, { json: false, display: "line", query: ["count"] }, @@ -242,11 +246,11 @@ describe("dashboard widget add", () => { test("fails to parse the arguments when the title is missing (less than 2 positional args)", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); - const err = await func - .call(context, { json: false, display: "line" }, "123") - .catch((e: Error) => e); + const err = await rejection( + func.call(context, { json: false, display: "line" }, "123"), + ); expect(err).toBeInstanceOf(ArgumentParseError); const { exception } = err as ArgumentParseError; expect(exception).toBeInstanceOf(ValidationError); @@ -258,39 +262,39 @@ describe("dashboard widget add", () => { test("throws ValidationError for invalid display type", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); - const err = await func - .call( + const err = await rejection( + func.call( context, { json: false, display: "invalid_type" }, "123", "Bad Widget", - ) - .catch((e: Error) => e); + ), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("Invalid --display"); }); test("throws ValidationError for invalid aggregate function", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); - const err = await func - .call( + const err = await rejection( + func.call( context, { json: false, display: "line", query: ["not_a_function"] }, "123", "Bad Widget", - ) - .catch((e: Error) => e); + ), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("Unknown aggregate function"); }); test("issue line dataset does not default columns", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); await func.call( context, { json: false, display: "line", dataset: "issue" }, @@ -298,14 +302,14 @@ describe("dashboard widget add", () => { "Issues Over Time", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const addedWidget = body.widgets.at(-1); - expect(addedWidget.queries[0].columns).toEqual([]); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const addedWidget = at(body.widgets, -1); + expect(at(must(addedWidget.queries), 0).columns).toEqual([]); }); test("issue dataset defaults columns to ['issue'] and orderby to -count()", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); await func.call( context, { json: false, display: "table", dataset: "issue" }, @@ -313,16 +317,16 @@ describe("dashboard widget add", () => { "Top Issues", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const addedWidget = body.widgets.at(-1); - expect(addedWidget.queries[0].columns).toEqual(["issue"]); - expect(addedWidget.queries[0].fields).toContain("issue"); - expect(addedWidget.queries[0].orderby).toBe("-count()"); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const addedWidget = at(body.widgets, -1); + expect(at(must(addedWidget.queries), 0).columns).toEqual(["issue"]); + expect(at(must(addedWidget.queries), 0).fields).toContain("issue"); + expect(at(must(addedWidget.queries), 0).orderby).toBe("-count()"); }); test("resolves dataset alias 'errors' to 'error-events' in PUT body", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); await func.call( context, { @@ -335,14 +339,14 @@ describe("dashboard widget add", () => { "Error Count", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const addedWidget = body.widgets.at(-1); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const addedWidget = at(body.widgets, -1); expect(addedWidget.widgetType).toBe("error-events"); }); test("resolves dataset alias 'metricsEnhanced' to 'tracemetrics'", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); await func.call( context, { @@ -355,8 +359,8 @@ describe("dashboard widget add", () => { "Latency", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const addedWidget = body.widgets.at(-1); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const addedWidget = at(body.widgets, -1); expect(addedWidget.widgetType).toBe("tracemetrics"); }); @@ -365,7 +369,7 @@ describe("dashboard widget add", () => { // "errors", dataset-aware validation must see "error-events" (canonical) // before deciding whether to accept the aggregate. const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); await func.call( context, { @@ -378,15 +382,17 @@ describe("dashboard widget add", () => { "Last Seen", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const addedWidget = body.widgets.at(-1); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const addedWidget = at(body.widgets, -1); expect(addedWidget.widgetType).toBe("error-events"); - expect(addedWidget.queries[0].aggregates).toEqual(["last_seen()"]); + expect(at(must(addedWidget.queries), 0).aggregates).toEqual([ + "last_seen()", + ]); }); test("case-insensitive dataset values are accepted", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); await func.call( context, { @@ -399,17 +405,17 @@ describe("dashboard widget add", () => { "Errors", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const addedWidget = body.widgets.at(-1); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const addedWidget = at(body.widgets, -1); expect(addedWidget.widgetType).toBe("error-events"); }); test("rejects unknown --dataset with canonical list", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); - const err = await func - .call( + const err = await rejection( + func.call( context, { json: false, @@ -419,8 +425,8 @@ describe("dashboard widget add", () => { }, "123", "Bad", - ) - .catch((e: Error) => e); + ), + ); expect(err).toBeInstanceOf(ValidationError); // Error message surfaces the normalized (lowercased) value. @@ -430,7 +436,7 @@ describe("dashboard widget add", () => { test("issue dataset respects explicit --group-by over default", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); await func.call( context, { @@ -444,9 +450,9 @@ describe("dashboard widget add", () => { "Issues by Project", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const addedWidget = body.widgets.at(-1); - expect(addedWidget.queries[0].columns).toEqual(["project"]); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const addedWidget = at(body.widgets, -1); + expect(at(must(addedWidget.queries), 0).columns).toEqual(["project"]); }); // ------------------------------------------------------------------------- @@ -455,7 +461,7 @@ describe("dashboard widget add", () => { test("uses explicit layout when --col --row --width --height provided", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); await func.call( context, { @@ -471,17 +477,17 @@ describe("dashboard widget add", () => { "Full Width Widget", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const addedWidget = body.widgets.at(-1); - expect(addedWidget.layout.x).toBe(0); - expect(addedWidget.layout.y).toBe(5); - expect(addedWidget.layout.w).toBe(6); - expect(addedWidget.layout.h).toBe(3); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const addedWidget = at(body.widgets, -1); + expect(must(addedWidget.layout).x).toBe(0); + expect(must(addedWidget.layout).y).toBe(5); + expect(must(addedWidget.layout).w).toBe(6); + expect(must(addedWidget.layout).h).toBe(3); }); test("partial layout flags override auto-layout defaults", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); await func.call( context, { @@ -494,25 +500,25 @@ describe("dashboard widget add", () => { "Positioned Counter", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const addedWidget = body.widgets.at(-1); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const addedWidget = at(body.widgets, -1); // x overridden, other values from auto-layout defaults for big_number (w:2, h:1) - expect(addedWidget.layout.x).toBe(4); - expect(addedWidget.layout.w).toBe(2); - expect(addedWidget.layout.h).toBe(1); + expect(must(addedWidget.layout).x).toBe(4); + expect(must(addedWidget.layout).w).toBe(2); + expect(must(addedWidget.layout).h).toBe(1); }); test("throws ValidationError for width > 6", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); - const err = await func - .call( + const func = await loadCommand(addCommand); + const err = await rejection( + func.call( context, { json: false, display: "line", query: ["count"], width: 7 }, "123", "Too Wide", - ) - .catch((e: Error) => e); + ), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("--width"); }); @@ -520,37 +526,37 @@ describe("dashboard widget add", () => { test("throws ValidationError when --col overflows with auto-layout default width", async () => { // table display defaults to w=6, so --col 1 would produce x=1 + w=6 = 7 > 6 const { context } = createMockContext(); - const func = await addCommand.loader(); - const err = await func - .call( + const func = await loadCommand(addCommand); + const err = await rejection( + func.call( context, { json: false, display: "table", query: ["count"], col: 1 }, "123", "Wide Table", - ) - .catch((e: Error) => e); + ), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("overflows the grid"); }); test("throws ValidationError for negative row", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); - const err = await func - .call( + const func = await loadCommand(addCommand); + const err = await rejection( + func.call( context, { json: false, display: "line", query: ["count"], row: -1 }, "123", "Bad Y", - ) - .catch((e: Error) => e); + ), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("--row"); }); test("auto-defaults orderby when group-by + limit provided", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); await func.call( context, { @@ -564,14 +570,14 @@ describe("dashboard widget add", () => { "Top Browsers", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const addedWidget = body.widgets.at(-1); - expect(addedWidget.queries[0].orderby).toBe("-count()"); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const addedWidget = at(body.widgets, -1); + expect(at(must(addedWidget.queries), 0).orderby).toBe("-count()"); }); test("auto-defaults --limit to 5 when --group-by is used without --limit", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); await func.call( context, { @@ -584,16 +590,16 @@ describe("dashboard widget add", () => { "Top Browsers", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const addedWidget = body.widgets.at(-1); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const addedWidget = at(body.widgets, -1); expect(addedWidget.limit).toBe(5); - expect(addedWidget.queries[0].columns).toEqual(["browser.name"]); - expect(addedWidget.queries[0].orderby).toBe("-count()"); + expect(at(must(addedWidget.queries), 0).columns).toEqual(["browser.name"]); + expect(at(must(addedWidget.queries), 0).orderby).toBe("-count()"); }); test("explicit --limit wins over auto-default for grouped widgets", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); await func.call( context, { @@ -607,14 +613,14 @@ describe("dashboard widget add", () => { "Top Browsers", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const addedWidget = body.widgets.at(-1); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const addedWidget = at(body.widgets, -1); expect(addedWidget.limit).toBe(10); }); test("ungrouped widget does not get an auto-default limit", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); await func.call( context, { json: false, display: "big_number", query: ["count"] }, @@ -622,8 +628,8 @@ describe("dashboard widget add", () => { "Total Count", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const addedWidget = body.widgets.at(-1); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const addedWidget = at(body.widgets, -1); expect(addedWidget.limit).toBeUndefined(); }); @@ -632,7 +638,7 @@ describe("dashboard widget add", () => { // ["issue"] but should not auto-default a limit — existing widgets of // this shape may legitimately have no limit. const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); await func.call( context, { json: false, display: "table", dataset: "issue" }, @@ -640,8 +646,8 @@ describe("dashboard widget add", () => { "Top Issues", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const addedWidget = body.widgets.at(-1); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const addedWidget = at(body.widgets, -1); expect(addedWidget.limit).toBeUndefined(); }); @@ -649,7 +655,7 @@ describe("dashboard widget add", () => { test("--layout dense passes dense mode to auto-placer", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); await func.call( context, { json: false, display: "big_number", query: ["count"], layout: "dense" }, @@ -657,17 +663,17 @@ describe("dashboard widget add", () => { "Dense Widget", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const addedWidget = body.widgets.at(-1); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const addedWidget = at(body.widgets, -1); // Existing widgets: big_number at (0,0,2,1) and table at (2,0,4,2). // Dense mode finds the first gap. The gap at (0,1) fits a 2x1 big_number. - expect(addedWidget.layout.x).toBe(0); - expect(addedWidget.layout.y).toBe(1); + expect(must(addedWidget.layout).x).toBe(0); + expect(must(addedWidget.layout).y).toBe(1); }); test("--layout sequential (default) uses sequential placement", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); + const func = await loadCommand(addCommand); await func.call( context, { @@ -680,19 +686,19 @@ describe("dashboard widget add", () => { "Sequential Widget", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const addedWidget = body.widgets.at(-1); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const addedWidget = at(body.widgets, -1); // Existing widgets: big_number at (0,0,2,1) and table at (2,0,4,2). // Last widget is table at x=2,w=4 → cursor=(6,0) → 6+2=8 > 6 → wrap to (0,2). - expect(addedWidget.layout.x).toBe(0); - expect(addedWidget.layout.y).toBe(2); + expect(must(addedWidget.layout).x).toBe(0); + expect(must(addedWidget.layout).y).toBe(2); }); test("--layout invalid rejects with ValidationError", async () => { const { context } = createMockContext(); - const func = await addCommand.loader(); - const err = await func - .call( + const func = await loadCommand(addCommand); + const err = await rejection( + func.call( context, { json: false, @@ -702,8 +708,8 @@ describe("dashboard widget add", () => { }, "123", "Bad Layout", - ) - .catch((e: unknown) => e); + ), + ); expect(err).toBeInstanceOf(ValidationError); expect((err as ValidationError).message).toContain("--layout"); diff --git a/packages/cli/test/commands/dashboard/widget/delete.test.ts b/packages/cli/test/commands/dashboard/widget/delete.test.ts index a071258722..12fdacafae 100644 --- a/packages/cli/test/commands/dashboard/widget/delete.test.ts +++ b/packages/cli/test/commands/dashboard/widget/delete.test.ts @@ -5,19 +5,23 @@ * Uses spyOn pattern to mock API client and resolve-target. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { deleteCommand } from "../../../../src/commands/dashboard/widget/delete.js"; vi.mock("../../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -29,28 +33,26 @@ vi.mock("../../../../src/lib/resolve-target.js", async (importOriginal) => { await importOriginal< typeof import("../../../../src/lib/resolve-target.js") >(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../../src/lib/resolve-target.js"; import type { DashboardDetail } from "../../../../src/types/dashboard.js"; +import { loadCommand, at, rejection } from "../../../helpers.js"; +import type { Writer } from "../../../../src/types/index.js"; // --------------------------------------------------------------------------- // Helpers // --------------------------------------------------------------------------- function createMockContext(cwd = "/tmp") { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd, }, stdoutWrite, @@ -104,9 +106,11 @@ const sampleDashboard: DashboardDetail = { // --------------------------------------------------------------------------- describe("dashboard widget delete", () => { - let getDashboardSpy: ReturnType; - let updateDashboardSpy: ReturnType; - let resolveOrgOnlyTargetSpy: ReturnType; + let getDashboardSpy: MockInstance<(typeof apiClient)["getDashboard"]>; + let updateDashboardSpy: MockInstance<(typeof apiClient)["updateDashboard"]>; + let resolveOrgOnlyTargetSpy: MockInstance< + (typeof resolveTarget)["resolveOrgOnlyTarget"] + >; beforeEach(() => { getDashboardSpy = vi.spyOn(apiClient, "getDashboard"); @@ -130,7 +134,7 @@ describe("dashboard widget delete", () => { test("deletes widget by index", async () => { const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call(context, { json: false, yes: true, index: 0 }, "123"); expect(getDashboardSpy).toHaveBeenCalledWith("acme-corp", "123"); @@ -144,50 +148,50 @@ describe("dashboard widget delete", () => { }), ); // Only one widget should remain after deleting index 0 - const body = updateDashboardSpy.mock.calls[0]?.[2]; + const body = at(updateDashboardSpy.mock.calls, 0)[2]; expect(body.widgets.length).toBe(1); - expect(body.widgets[0].title).toBe("Slow Spans"); + expect(at(body.widgets, 0).title).toBe("Slow Spans"); }); test("deletes widget by title", async () => { const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call( context, { json: false, yes: true, title: "Slow Spans" }, "123", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; + const body = at(updateDashboardSpy.mock.calls, 0)[2]; expect(body.widgets.length).toBe(1); - expect(body.widgets[0].title).toBe("Error Count"); + expect(at(body.widgets, 0).title).toBe("Error Count"); }); test("throws ValidationError when neither --index nor --title provided", async () => { const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); - const err = await func - .call(context, { json: false, yes: true }, "123") - .catch((e: Error) => e); + const err = await rejection( + func.call(context, { json: false, yes: true }, "123"), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("--index or --title"); }); test("throws ValidationError when index is out of range", async () => { const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); - const err = await func - .call(context, { json: false, yes: true, index: 99 }, "123") - .catch((e: Error) => e); + const err = await rejection( + func.call(context, { json: false, yes: true, index: 99 }, "123"), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("out of range"); }); test("human output contains 'Removed widget' and title", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call(context, { json: false, yes: true, index: 0 }, "123"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); diff --git a/packages/cli/test/commands/dashboard/widget/edit.test.ts b/packages/cli/test/commands/dashboard/widget/edit.test.ts index 21964b89f2..dbe626a752 100644 --- a/packages/cli/test/commands/dashboard/widget/edit.test.ts +++ b/packages/cli/test/commands/dashboard/widget/edit.test.ts @@ -5,19 +5,23 @@ * Uses spyOn pattern to mock API client and resolve-target. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { editCommand } from "../../../../src/commands/dashboard/widget/edit.js"; vi.mock("../../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -29,28 +33,26 @@ vi.mock("../../../../src/lib/resolve-target.js", async (importOriginal) => { await importOriginal< typeof import("../../../../src/lib/resolve-target.js") >(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../../src/lib/resolve-target.js"; import type { DashboardDetail } from "../../../../src/types/dashboard.js"; +import { loadCommand, at, must, rejection } from "../../../helpers.js"; +import type { Writer } from "../../../../src/types/index.js"; // --------------------------------------------------------------------------- // Helpers // --------------------------------------------------------------------------- function createMockContext(cwd = "/tmp") { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd, }, stdoutWrite, @@ -104,9 +106,11 @@ const sampleDashboard: DashboardDetail = { // --------------------------------------------------------------------------- describe("dashboard widget edit", () => { - let getDashboardSpy: ReturnType; - let updateDashboardSpy: ReturnType; - let resolveOrgOnlyTargetSpy: ReturnType; + let getDashboardSpy: MockInstance<(typeof apiClient)["getDashboard"]>; + let updateDashboardSpy: MockInstance<(typeof apiClient)["updateDashboard"]>; + let resolveOrgOnlyTargetSpy: MockInstance< + (typeof resolveTarget)["resolveOrgOnlyTarget"] + >; beforeEach(() => { getDashboardSpy = vi.spyOn(apiClient, "getDashboard"); @@ -130,7 +134,7 @@ describe("dashboard widget edit", () => { test("edits widget by index with new display type", async () => { const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); await func.call(context, { json: false, index: 0, display: "line" }, "123"); expect(getDashboardSpy).toHaveBeenCalledWith("acme-corp", "123"); @@ -151,14 +155,18 @@ describe("dashboard widget edit", () => { test("asks for --display when the widget's display type is null", async () => { getDashboardSpy.mockResolvedValue({ ...sampleDashboard, - widgets: [{ ...sampleDashboard.widgets?.[0], displayType: null }], + widgets: [{ ...at(must(sampleDashboard.widgets), 0), displayType: null }], }); const { context } = createMockContext(); - const func = await editCommand.loader(); - - const err = await func - .call(context, { json: false, index: 0, "new-title": "Renamed" }, "123") - .catch((e: Error) => e); + const func = await loadCommand(editCommand); + + const err = await rejection( + func.call( + context, + { json: false, index: 0, "new-title": "Renamed" }, + "123", + ), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("--display"); expect(updateDashboardSpy).not.toHaveBeenCalled(); @@ -167,66 +175,70 @@ describe("dashboard widget edit", () => { test("sets --display on a widget whose display type is null", async () => { getDashboardSpy.mockResolvedValue({ ...sampleDashboard, - widgets: [{ ...sampleDashboard.widgets?.[0], displayType: null }], + widgets: [{ ...at(must(sampleDashboard.widgets), 0), displayType: null }], }); const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); await func.call(context, { json: false, index: 0, display: "line" }, "123"); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - expect(body.widgets[0].displayType).toBe("line"); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + expect(at(body.widgets, 0).displayType).toBe("line"); }); test("edits widget by title (case-insensitive)", async () => { const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); await func.call( context, { json: false, title: "error count", display: "bar" }, "123", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - expect(body.widgets[0].displayType).toBe("bar"); - expect(body.widgets[0].title).toBe("Error Count"); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + expect(at(body.widgets, 0).displayType).toBe("bar"); + expect(at(body.widgets, 0).title).toBe("Error Count"); }); test("throws ValidationError when neither --index nor --title provided", async () => { const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); - const err = await func - .call(context, { json: false, display: "line" }, "123") - .catch((e: Error) => e); + const err = await rejection( + func.call(context, { json: false, display: "line" }, "123"), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("--index or --title"); }); test("throws ValidationError for invalid aggregate", async () => { const { context } = createMockContext(); - const func = await editCommand.loader(); - - const err = await func - .call(context, { json: false, index: 0, query: ["bogus_func"] }, "123") - .catch((e: Error) => e); + const func = await loadCommand(editCommand); + + const err = await rejection( + func.call( + context, + { json: false, index: 0, query: ["bogus_func"] }, + "123", + ), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("Unknown aggregate function"); }); test("preserves existing fields when no query flags provided", async () => { const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); await func.call(context, { json: false, index: 1, display: "bar" }, "123"); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const edited = body.widgets[1]; + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const edited = at(body.widgets, 1); // Display changed but queries preserved from original expect(edited.displayType).toBe("bar"); - expect(edited.queries[0].aggregates).toEqual([ + expect(at(must(edited.queries), 0).aggregates).toEqual([ "p95(span.duration)", "count()", ]); - expect(edited.queries[0].columns).toEqual(["span.description"]); + expect(at(must(edited.queries), 0).columns).toEqual(["span.description"]); }); // The backend validates displayType and widgetType as independent enums — @@ -254,16 +266,16 @@ describe("dashboard widget edit", () => { ], }); const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); await func.call( context, { json: false, index: 0, dataset: "issue" }, "123", ); expect(updateDashboardSpy).toHaveBeenCalledTimes(1); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - expect(body.widgets[0].displayType).toBe("big_number"); - expect(body.widgets[0].widgetType).toBe("issue"); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + expect(at(body.widgets, 0).displayType).toBe("big_number"); + expect(at(body.widgets, 0).widgetType).toBe("issue"); }); test("allows --display change to table on preprod-app-size widget", async () => { @@ -288,16 +300,16 @@ describe("dashboard widget edit", () => { ], }); const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); await func.call( context, { json: false, index: 0, display: "table" }, "123", ); expect(updateDashboardSpy).toHaveBeenCalledTimes(1); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - expect(body.widgets[0].displayType).toBe("table"); - expect(body.widgets[0].widgetType).toBe("preprod-app-size"); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + expect(at(body.widgets, 0).displayType).toBe("table"); + expect(at(body.widgets, 0).widgetType).toBe("preprod-app-size"); }); test("allows --dataset change on widget with text display type", async () => { @@ -314,7 +326,7 @@ describe("dashboard widget edit", () => { ], }); const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); // Should not throw — "text" is untracked, no dataset constraint applies await func.call(context, { json: false, index: 0, dataset: "logs" }, "123"); expect(updateDashboardSpy).toHaveBeenCalled(); @@ -323,7 +335,7 @@ describe("dashboard widget edit", () => { test("allows --display change to untracked display type (text)", async () => { // Changing --display to an untracked type should also skip cross-validation. const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); // sampleDashboard widget[0] is displayType: "big_number", widgetType: "spans" // Changing to "text" should not throw even though "text" isn't in spans' supported types. await func.call(context, { json: false, index: 0, display: "text" }, "123"); @@ -336,61 +348,61 @@ describe("dashboard widget edit", () => { test("applies --col and --row layout flags to existing widget", async () => { const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); await func.call(context, { json: false, index: 0, col: 4, row: 3 }, "123"); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const edited = body.widgets[0]; - expect(edited.layout.x).toBe(4); - expect(edited.layout.y).toBe(3); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const edited = at(body.widgets, 0); + expect(must(edited.layout).x).toBe(4); + expect(must(edited.layout).y).toBe(3); // Width and height preserved from original - expect(edited.layout.w).toBe(2); - expect(edited.layout.h).toBe(1); + expect(must(edited.layout).w).toBe(2); + expect(must(edited.layout).h).toBe(1); }); test("applies --width and --height layout flags", async () => { const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); await func.call( context, { json: false, index: 1, col: 0, width: 6, height: 4 }, "123", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const edited = body.widgets[1]; - expect(edited.layout.w).toBe(6); - expect(edited.layout.h).toBe(4); - expect(edited.layout.x).toBe(0); - expect(edited.layout.y).toBe(0); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const edited = at(body.widgets, 1); + expect(must(edited.layout).w).toBe(6); + expect(must(edited.layout).h).toBe(4); + expect(must(edited.layout).x).toBe(0); + expect(must(edited.layout).y).toBe(0); }); test("preserves existing layout when no layout flags provided", async () => { const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); await func.call(context, { json: false, index: 0, display: "line" }, "123"); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - const edited = body.widgets[0]; + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + const edited = at(body.widgets, 0); expect(edited.layout).toEqual({ x: 0, y: 0, w: 2, h: 1 }); }); test("throws ValidationError for col out of range", async () => { const { context } = createMockContext(); - const func = await editCommand.loader(); - const err = await func - .call(context, { json: false, index: 0, col: 6 }, "123") - .catch((e: Error) => e); + const func = await loadCommand(editCommand); + const err = await rejection( + func.call(context, { json: false, index: 0, col: 6 }, "123"), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("--col"); }); test("throws ValidationError for negative width", async () => { const { context } = createMockContext(); - const func = await editCommand.loader(); - const err = await func - .call(context, { json: false, index: 0, width: 0 }, "123") - .catch((e: Error) => e); + const func = await loadCommand(editCommand); + const err = await rejection( + func.call(context, { json: false, index: 0, width: 0 }, "123"), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("--width"); }); @@ -418,27 +430,27 @@ describe("dashboard widget edit", () => { ], }); const { context } = createMockContext(); - const func = await editCommand.loader(); - const err = await func - .call(context, { json: false, index: 0, col: 4 }, "123") - .catch((e: Error) => e); + const func = await loadCommand(editCommand); + const err = await rejection( + func.call(context, { json: false, index: 0, col: 4 }, "123"), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("overflows the grid"); }); test("throws ValidationError when col + width overflows grid", async () => { const { context } = createMockContext(); - const func = await editCommand.loader(); - const err = await func - .call(context, { json: false, index: 0, col: 4, width: 4 }, "123") - .catch((e: Error) => e); + const func = await loadCommand(editCommand); + const err = await rejection( + func.call(context, { json: false, index: 0, col: 4, width: 4 }, "123"), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("overflows the grid"); }); test("validates aggregates against new dataset when --dataset changes", async () => { const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); // "last_seen" is valid for error-events but not spans. // Here we change the existing spans widget to error-events dataset while @@ -454,22 +466,24 @@ describe("dashboard widget edit", () => { "123", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - expect(body.widgets[0].widgetType).toBe("error-events"); - expect(body.widgets[0].queries[0].aggregates).toEqual(["last_seen()"]); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + expect(at(body.widgets, 0).widgetType).toBe("error-events"); + expect(at(must(at(body.widgets, 0).queries), 0).aggregates).toEqual([ + "last_seen()", + ]); }); test("resolves --dataset alias 'errors' to 'error-events' in PUT body", async () => { const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); await func.call( context, { json: false, index: 0, dataset: "errors" }, "123", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - expect(body.widgets[0].widgetType).toBe("error-events"); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + expect(at(body.widgets, 0).widgetType).toBe("error-events"); }); test("dataset alias is resolved BEFORE dataset-aware aggregate validation", async () => { @@ -479,7 +493,7 @@ describe("dashboard widget edit", () => { // validateAggregateNames runs, "errors" falls through the canonical // branch and "Unknown aggregate function" is thrown. const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); await func.call( context, { @@ -491,23 +505,25 @@ describe("dashboard widget edit", () => { "123", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - expect(body.widgets[0].widgetType).toBe("error-events"); - expect(body.widgets[0].queries[0].aggregates).toEqual(["last_seen()"]); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + expect(at(body.widgets, 0).widgetType).toBe("error-events"); + expect(at(must(at(body.widgets, 0).queries), 0).aggregates).toEqual([ + "last_seen()", + ]); }); test("case-insensitive --dataset values are accepted", async () => { const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); await func.call(context, { json: false, index: 0, dataset: "LOGS" }, "123"); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - expect(body.widgets[0].widgetType).toBe("logs"); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + expect(at(body.widgets, 0).widgetType).toBe("logs"); }); test("auto-defaults --limit to 5 when adding --group-by without --limit", async () => { const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); // Widget 0 (Error Count) has no existing limit or group-by. await func.call( @@ -521,14 +537,16 @@ describe("dashboard widget edit", () => { "123", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - expect(body.widgets[0].limit).toBe(5); - expect(body.widgets[0].queries[0].columns).toEqual(["browser.name"]); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + expect(at(body.widgets, 0).limit).toBe(5); + expect(at(must(at(body.widgets, 0).queries), 0).columns).toEqual([ + "browser.name", + ]); }); test("explicit --limit wins over auto-default when adding --group-by", async () => { const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); // line widgets have no row cap; bar/table cap at 10, which would mask the // explicit-limit signal we want to assert. @@ -544,8 +562,8 @@ describe("dashboard widget edit", () => { "123", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - expect(body.widgets[0].limit).toBe(25); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + expect(at(body.widgets, 0).limit).toBe(25); }); test("preserves existing limit when adding --group-by to a widget that has one", async () => { @@ -555,15 +573,15 @@ describe("dashboard widget edit", () => { ...sampleDashboard, widgets: [ { - ...sampleDashboard.widgets[0], + ...at(must(sampleDashboard.widgets), 0), limit: 8, }, - ...sampleDashboard.widgets.slice(1), + ...must(sampleDashboard.widgets).slice(1), ], }); const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); await func.call( context, { @@ -575,13 +593,13 @@ describe("dashboard widget edit", () => { "123", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - expect(body.widgets[0].limit).toBe(8); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + expect(at(body.widgets, 0).limit).toBe(8); }); test("does not auto-default limit when only changing --query on an ungrouped widget", async () => { const { context } = createMockContext(); - const func = await editCommand.loader(); + const func = await loadCommand(editCommand); await func.call( context, @@ -589,7 +607,7 @@ describe("dashboard widget edit", () => { "123", ); - const body = updateDashboardSpy.mock.calls[0]?.[2]; - expect(body.widgets[0].limit).toBeUndefined(); + const body = at(updateDashboardSpy.mock.calls, 0)[2]; + expect(at(body.widgets, 0).limit).toBeUndefined(); }); }); diff --git a/packages/cli/test/commands/dashboard/widget/preservation.test.ts b/packages/cli/test/commands/dashboard/widget/preservation.test.ts index 0e69084ece..411246e8b6 100644 --- a/packages/cli/test/commands/dashboard/widget/preservation.test.ts +++ b/packages/cli/test/commands/dashboard/widget/preservation.test.ts @@ -1,7 +1,7 @@ import { beforeAll, beforeEach, afterAll, expect, test } from "vitest"; import type { DashboardDetail } from "../../../../src/types/dashboard.js"; import { createE2EContext, type E2EContext } from "../../../fixture.js"; -import { useTestConfigDir } from "../../../helpers.js"; +import { useTestConfigDir, at } from "../../../helpers.js"; import { TEST_TOKEN } from "../../../mocks/routes.js"; import { createMockServer } from "../../../mocks/server.js"; @@ -137,7 +137,7 @@ test.each([ const result = await ctx.run([ "dashboard", "widget", - args[0], + at(args, 0), "test-org/123", ...args.slice(1), "--json", @@ -147,13 +147,13 @@ test.each([ const reload = await ctx.run(["api", endpoint]); expect(reload.exitCode, reload.stderr).toBe(0); const expected = structuredClone(savedDashboard); - const transformed = expected.widgets![0]; + const transformed = at(expected.widgets!, 0); if (name === "rename") { transformed.title = "Renamed"; } else if (name === "move") { transformed.layout!.y = 4; } else if (name === "filter") { - transformed.queries![0].conditions = "span.op:queue"; + at(transformed.queries!, 0).conditions = "span.op:queue"; } else if (name === "delete another widget") { expected.widgets!.splice(1, 1); } @@ -196,7 +196,7 @@ test("describes saved transformations after an edit", async () => { }); test("reports unavailable transformation settings after an edit", async () => { - for (const query of stored.widgets![0].queries!) { + for (const query of at(stored.widgets!, 0).queries!) { delete query.transformations; } @@ -242,6 +242,8 @@ test("reports the saved widget transformations in edit JSON", async () => { (query: { transformations?: unknown }) => query.transformations, ), ).toEqual( - savedDashboard.widgets![0].queries!.map((query) => query.transformations), + at(savedDashboard.widgets!, 0).queries!.map( + (query) => query.transformations, + ), ); }); diff --git a/packages/cli/test/commands/debug-files/bundle-jvm.test.ts b/packages/cli/test/commands/debug-files/bundle-jvm.test.ts index c7176936c6..7e14347f43 100644 --- a/packages/cli/test/commands/debug-files/bundle-jvm.test.ts +++ b/packages/cli/test/commands/debug-files/bundle-jvm.test.ts @@ -12,6 +12,8 @@ import { join } from "node:path"; import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; import { bundleJvmCommand } from "../../../src/commands/debug-files/bundle-jvm.js"; import { ValidationError } from "../../../src/lib/errors.js"; +import type { Writer } from "../../../src/types/index.js"; +import { at } from "../../helpers.js"; const VALID_DEBUG_ID = "12345678-1234-1234-1234-123456789abc"; @@ -30,8 +32,8 @@ type CmdFunc = ( function makeContext() { return { - stdout: { write: vi.fn(() => true) }, - stderr: { write: vi.fn(() => true) }, + stdout: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }; } @@ -73,7 +75,7 @@ describe("sentry debug-files bundle-jvm", () => { expect(existsSync(join(outputDir, `${VALID_DEBUG_ID}.zip`))).toBe(true); // Verify stdout received output containing the debug ID - const writeCall = ctx.stdout.write.mock.calls[0]; + const writeCall = at(ctx.stdout.write.mock.calls, 0); expect(writeCall).toBeDefined(); const output = typeof writeCall[0] === "string" @@ -136,7 +138,7 @@ describe("sentry debug-files bundle-jvm", () => { tempDir, ); - const writeCall = ctx.stdout.write.mock.calls[0]; + const writeCall = at(ctx.stdout.write.mock.calls, 0); expect(writeCall).toBeDefined(); const output = typeof writeCall[0] === "string" @@ -169,7 +171,7 @@ describe("sentry debug-files bundle-jvm", () => { tempDir, ); - const writeCall = ctx.stdout.write.mock.calls[0]; + const writeCall = at(ctx.stdout.write.mock.calls, 0); expect(writeCall).toBeDefined(); const output = typeof writeCall[0] === "string" diff --git a/packages/cli/test/commands/debug-files/bundle-sources.test.ts b/packages/cli/test/commands/debug-files/bundle-sources.test.ts index fd785697e1..092044b510 100644 --- a/packages/cli/test/commands/debug-files/bundle-sources.test.ts +++ b/packages/cli/test/commands/debug-files/bundle-sources.test.ts @@ -48,7 +48,7 @@ const KNOWN_DEBUG_ID = "0f13a5da-412a-fbf7-c866-2048f3294f3d"; /** Run `debug-files bundle-sources` and capture stdout + exit code. */ async function runBundleSources( args: string[], -): Promise<{ output: string; exitCode: number | undefined }> { +): Promise<{ output: string; exitCode: NodeJS.Process["exitCode"] }> { let output = ""; const mockContext: SentryContext = { process: { ...process, exitCode: undefined }, diff --git a/packages/cli/test/commands/debug-files/check.test.ts b/packages/cli/test/commands/debug-files/check.test.ts index 9184d88ce1..f8d44a4547 100644 --- a/packages/cli/test/commands/debug-files/check.test.ts +++ b/packages/cli/test/commands/debug-files/check.test.ts @@ -38,7 +38,7 @@ const KNOWN_DEBUG_ID = "0f13a5da-412a-fbf7-c866-2048f3294f3d"; /** Run `debug-files check` and capture stdout + exit code. */ async function runCheck( args: string[], -): Promise<{ output: string; exitCode: number | undefined }> { +): Promise<{ output: string; exitCode: NodeJS.Process["exitCode"] }> { let output = ""; const mockContext: SentryContext = { process: { ...process, exitCode: undefined }, diff --git a/packages/cli/test/commands/debug-files/find.test.ts b/packages/cli/test/commands/debug-files/find.test.ts index 3594f156da..5437ff136c 100644 --- a/packages/cli/test/commands/debug-files/find.test.ts +++ b/packages/cli/test/commands/debug-files/find.test.ts @@ -37,7 +37,7 @@ const BREAKPAD_ID = "0f13a5da-412a-fbf7-c866-2048f3294f3d"; async function runFind( args: string[], -): Promise<{ output: string; exitCode: number | undefined }> { +): Promise<{ output: string; exitCode: NodeJS.Process["exitCode"] }> { let output = ""; const mockContext: SentryContext = { process: { ...process, exitCode: undefined }, diff --git a/packages/cli/test/commands/debug-files/print-sources.test.ts b/packages/cli/test/commands/debug-files/print-sources.test.ts index 44f04351a1..46e7e2b4dd 100644 --- a/packages/cli/test/commands/debug-files/print-sources.test.ts +++ b/packages/cli/test/commands/debug-files/print-sources.test.ts @@ -51,7 +51,7 @@ const BREAKPAD_NO_SOURCES = [ /** Run `debug-files print-sources` and capture stdout + exit code. */ async function runPrintSources( args: string[], -): Promise<{ output: string; exitCode: number | undefined }> { +): Promise<{ output: string; exitCode: NodeJS.Process["exitCode"] }> { let output = ""; const mockContext: SentryContext = { process: { ...process, exitCode: undefined }, diff --git a/packages/cli/test/commands/debug-files/upload.test.ts b/packages/cli/test/commands/debug-files/upload.test.ts index 1ff38014ee..16100d66c6 100644 --- a/packages/cli/test/commands/debug-files/upload.test.ts +++ b/packages/cli/test/commands/debug-files/upload.test.ts @@ -52,8 +52,8 @@ beforeEach(async () => { tempDir = await mkdtemp(join(tmpdir(), "df-upload-test-")); vi.mocked(homedir).mockReturnValue(tempDir); savedEnv = { - SENTRY_ORG: process.env.SENTRY_ORG, - SENTRY_PROJECT: process.env.SENTRY_PROJECT, + SENTRY_ORG: process.env["SENTRY_ORG"], + SENTRY_PROJECT: process.env["SENTRY_PROJECT"], }; // The real-upload path fetches chunk-upload options before scanning to gate // on the server's max file size. Stub it so tests need no network. @@ -128,9 +128,11 @@ async function writeIl2cppFixture(): Promise { } /** Run `debug-files upload` and capture stdout + exit code. */ -async function runUpload( - args: string[], -): Promise<{ output: string; error: string; exitCode: number | undefined }> { +async function runUpload(args: string[]): Promise<{ + output: string; + error: string; + exitCode: NodeJS.Process["exitCode"]; +}> { let output = ""; let error = ""; const mockContext: SentryContext = { @@ -234,8 +236,8 @@ describe("sentry debug-files upload", () => { }); test("--no-upload needs no credentials", async () => { - delete process.env.SENTRY_ORG; - delete process.env.SENTRY_PROJECT; + delete process.env["SENTRY_ORG"]; + delete process.env["SENTRY_PROJECT"]; await writeBreakpad(); const { exitCode } = await runUpload([tempDir, "--no-upload"]); expect(exitCode).toBe(0); @@ -336,8 +338,8 @@ describe("sentry debug-files upload", () => { // ── Upload orchestration ───────────────────────────────────────── test("uploads scanned files via uploadDebugFiles", async () => { - process.env.SENTRY_ORG = "test-org"; - process.env.SENTRY_PROJECT = "test-project"; + process.env["SENTRY_ORG"] = "test-org"; + process.env["SENTRY_PROJECT"] = "test-project"; await writeBreakpad(); const spy = vi.spyOn(debugFilesApi, "uploadDebugFiles").mockResolvedValue([ @@ -365,8 +367,8 @@ describe("sentry debug-files upload", () => { }); test("server maxFileSize gating all files exits non-zero with a clear error", async () => { - process.env.SENTRY_ORG = "test-org"; - process.env.SENTRY_PROJECT = "test-project"; + process.env["SENTRY_ORG"] = "test-org"; + process.env["SENTRY_PROJECT"] = "test-project"; await writeBreakpad(); // Advertise a 10-byte cap; the fixture is well over that, so it is skipped // during the scan and never reaches uploadDebugFiles. Because a real DIF @@ -390,8 +392,8 @@ describe("sentry debug-files upload", () => { }); test("a partial size-drop still uploads the rest but exits non-zero", async () => { - process.env.SENTRY_ORG = "test-org"; - process.env.SENTRY_PROJECT = "test-project"; + process.env["SENTRY_ORG"] = "test-org"; + process.env["SENTRY_PROJECT"] = "test-project"; // One in-cap file and one valid-header file well over the cap. await writeBreakpad("small.sym"); const bigBody = `${[ @@ -436,8 +438,8 @@ describe("sentry debug-files upload", () => { }); test("wait mode surfaces processing errors with a non-zero exit", async () => { - process.env.SENTRY_ORG = "test-org"; - process.env.SENTRY_PROJECT = "test-project"; + process.env["SENTRY_ORG"] = "test-org"; + process.env["SENTRY_PROJECT"] = "test-project"; await writeBreakpad(); vi.spyOn(debugFilesApi, "uploadDebugFiles").mockResolvedValue([ @@ -455,8 +457,8 @@ describe("sentry debug-files upload", () => { }); test("a not_found result exits non-zero (chunk delivery incomplete)", async () => { - process.env.SENTRY_ORG = "test-org"; - process.env.SENTRY_PROJECT = "test-project"; + process.env["SENTRY_ORG"] = "test-org"; + process.env["SENTRY_PROJECT"] = "test-project"; await writeBreakpad(); vi.spyOn(debugFilesApi, "uploadDebugFiles").mockResolvedValue([ @@ -474,8 +476,8 @@ describe("sentry debug-files upload", () => { }); test("filesUploaded excludes failed/dropped results", async () => { - process.env.SENTRY_ORG = "test-org"; - process.env.SENTRY_PROJECT = "test-project"; + process.env["SENTRY_ORG"] = "test-org"; + process.env["SENTRY_PROJECT"] = "test-project"; await writeBreakpad(); vi.spyOn(debugFilesApi, "uploadDebugFiles").mockResolvedValue([ @@ -503,8 +505,8 @@ describe("sentry debug-files upload", () => { }); test("--require-all note is preserved alongside an upload failure", async () => { - process.env.SENTRY_ORG = "test-org"; - process.env.SENTRY_PROJECT = "test-project"; + process.env["SENTRY_ORG"] = "test-org"; + process.env["SENTRY_PROJECT"] = "test-project"; await writeBreakpad(); vi.spyOn(debugFilesApi, "uploadDebugFiles").mockResolvedValue([ @@ -533,8 +535,8 @@ describe("sentry debug-files upload", () => { }); test("--require-all on a real upload fails when an --id is missing", async () => { - process.env.SENTRY_ORG = "test-org"; - process.env.SENTRY_PROJECT = "test-project"; + process.env["SENTRY_ORG"] = "test-org"; + process.env["SENTRY_PROJECT"] = "test-project"; await writeBreakpad(); const spy = vi.spyOn(debugFilesApi, "uploadDebugFiles").mockResolvedValue([ @@ -561,8 +563,8 @@ describe("sentry debug-files upload", () => { }); test("--require-all is honored when the queue is empty (real upload)", async () => { - process.env.SENTRY_ORG = "test-org"; - process.env.SENTRY_PROJECT = "test-project"; + process.env["SENTRY_ORG"] = "test-org"; + process.env["SENTRY_PROJECT"] = "test-project"; await writeBreakpad(); const spy = vi.spyOn(debugFilesApi, "uploadDebugFiles"); @@ -581,8 +583,8 @@ describe("sentry debug-files upload", () => { }); test("--id without --require-all does not fail on a real upload", async () => { - process.env.SENTRY_ORG = "test-org"; - process.env.SENTRY_PROJECT = "test-project"; + process.env["SENTRY_ORG"] = "test-org"; + process.env["SENTRY_PROJECT"] = "test-project"; await writeBreakpad(); vi.spyOn(debugFilesApi, "uploadDebugFiles").mockResolvedValue([ @@ -604,8 +606,8 @@ describe("sentry debug-files upload", () => { }); test("reports nothing to upload when no debug files are found", async () => { - process.env.SENTRY_ORG = "test-org"; - process.env.SENTRY_PROJECT = "test-project"; + process.env["SENTRY_ORG"] = "test-org"; + process.env["SENTRY_PROJECT"] = "test-project"; await writeFile(join(tempDir, "notes.txt"), "not a debug file"); const spy = vi.spyOn(debugFilesApi, "uploadDebugFiles"); @@ -704,8 +706,8 @@ describe("sentry debug-files upload", () => { }); test("passes the extracted PPDB through to uploadDebugFiles", async () => { - process.env.SENTRY_ORG = "test-org"; - process.env.SENTRY_PROJECT = "test-project"; + process.env["SENTRY_ORG"] = "test-org"; + process.env["SENTRY_PROJECT"] = "test-project"; await writeDifFixture("embedded-ppdb.dll", "App.dll"); const spy = vi .spyOn(debugFilesApi, "uploadDebugFiles") @@ -723,8 +725,8 @@ describe("sentry debug-files upload", () => { // ── Fat Mach-O ─────────────────────────────────────────────────── test("uploads each slice of a fat Mach-O dSYM as its own DIF", async () => { - process.env.SENTRY_ORG = "test-org"; - process.env.SENTRY_PROJECT = "test-project"; + process.env["SENTRY_ORG"] = "test-org"; + process.env["SENTRY_PROJECT"] = "test-project"; await writeFile(join(tempDir, "FooWatch"), watchFatMachO()); const spy = vi .spyOn(debugFilesApi, "uploadDebugFiles") @@ -745,8 +747,8 @@ describe("sentry debug-files upload", () => { }); test("--id uploads only the matching slice of a fat Mach-O", async () => { - process.env.SENTRY_ORG = "test-org"; - process.env.SENTRY_PROJECT = "test-project"; + process.env["SENTRY_ORG"] = "test-org"; + process.env["SENTRY_PROJECT"] = "test-project"; await writeFile(join(tempDir, "FooWatch"), watchFatMachO()); const spy = vi .spyOn(debugFilesApi, "uploadDebugFiles") @@ -783,8 +785,8 @@ describe("sentry debug-files upload", () => { }); test("--il2cpp-mapping threads the mapping DIF through to uploadDebugFiles", async () => { - process.env.SENTRY_ORG = "test-org"; - process.env.SENTRY_PROJECT = "test-project"; + process.env["SENTRY_ORG"] = "test-org"; + process.env["SENTRY_PROJECT"] = "test-project"; await writeIl2cppFixture(); const spy = vi .spyOn(debugFilesApi, "uploadDebugFiles") diff --git a/packages/cli/test/commands/docs.test.ts b/packages/cli/test/commands/docs.test.ts index 8cd0c79493..7d2a3d3ad9 100644 --- a/packages/cli/test/commands/docs.test.ts +++ b/packages/cli/test/commands/docs.test.ts @@ -18,12 +18,14 @@ vi.mock("../../src/lib/polling.js", () => ({ withProgress })); import { listCommand } from "../../src/commands/docs/list.js"; import { queryCommand } from "../../src/commands/docs/query.js"; +import { loadCommand } from "../helpers.js"; +import type { Writer } from "../../src/types/index.js"; function createContext(): { context: SentryContext; stdoutWrite: ReturnType; } { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { configDir: "/tmp", @@ -31,7 +33,7 @@ function createContext(): { env: process.env, homeDir: "/tmp", process, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, stdin: process.stdin, stdout: { write: stdoutWrite }, }, @@ -78,7 +80,7 @@ beforeEach(() => { describe("docs commands", () => { test("queries docs with automatic safe context and returns it in JSON", async () => { const { context, stdoutWrite } = createContext(); - const func = await queryCommand.loader(); + const func = await loadCommand(queryCommand); await func.call(context, { json: true }, "How", "do", "I", "trace?"); @@ -134,7 +136,7 @@ describe("docs commands", () => { test("lists deterministic keyword matches with a bounded limit", async () => { const { context, stdoutWrite } = createContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: false, limit: 5 }, "nextjs", "tracing"); diff --git a/packages/cli/test/commands/dsn/list.test.ts b/packages/cli/test/commands/dsn/list.test.ts index fd59a46c01..6644e6519b 100644 --- a/packages/cli/test/commands/dsn/list.test.ts +++ b/packages/cli/test/commands/dsn/list.test.ts @@ -20,7 +20,12 @@ import { } from "../../../src/lib/response-cache.js"; import { resetAuthenticatedFetch } from "../../../src/lib/sentry-client.js"; import { mockProcess } from "../../fixture.js"; -import { mockFetch, useEnvSandbox, useTestConfigDir } from "../../helpers.js"; +import { + mockFetch, + useEnvSandbox, + useTestConfigDir, + loadCommand, +} from "../../helpers.js"; useEnvSandbox([ "SENTRY_ORG", @@ -209,7 +214,7 @@ async function invoke( } = {}, ) { const ctx = createContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( ctx.context, { diff --git a/packages/cli/test/commands/event/analytics.func.test.ts b/packages/cli/test/commands/event/analytics.func.test.ts index c92997d933..7962ae8255 100644 --- a/packages/cli/test/commands/event/analytics.func.test.ts +++ b/packages/cli/test/commands/event/analytics.func.test.ts @@ -5,12 +5,8 @@ import { analyticsCommand } from "../../../src/commands/event/analytics.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -18,13 +14,15 @@ import * as apiClient from "../../../src/lib/api-client.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; import { parsePeriod } from "../../../src/lib/time-range.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, stdoutWrite, @@ -68,7 +66,7 @@ describe("event analytics", () => { getDroppedEventsSpy.mockResolvedValue(response()); const { context } = createMockContext(); - const func = await analyticsCommand.loader(); + const func = await loadCommand(analyticsCommand); await func.call( context, { dataset: "tracemetrics", period: parsePeriod("24h"), json: true }, @@ -89,7 +87,7 @@ describe("event analytics", () => { getDroppedEventsSpy.mockResolvedValue(response()); const { context, stdoutWrite } = createMockContext(); - const func = await analyticsCommand.loader(); + const func = await loadCommand(analyticsCommand); await func.call( context, { dataset: "errors", period: parsePeriod("90d"), json: false }, @@ -119,7 +117,7 @@ describe("event analytics", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await analyticsCommand.loader(); + const func = await loadCommand(analyticsCommand); await func.call( context, { dataset: "errors", period: parsePeriod("90d"), json: false }, @@ -150,7 +148,7 @@ describe("event analytics", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await analyticsCommand.loader(); + const func = await loadCommand(analyticsCommand); await func.call( context, { dataset: "errors", period: parsePeriod("90d"), json: true }, diff --git a/packages/cli/test/commands/event/list.func.test.ts b/packages/cli/test/commands/event/list.func.test.ts index 577b0a1b3b..377c2aac97 100644 --- a/packages/cli/test/commands/event/list.func.test.ts +++ b/packages/cli/test/commands/event/list.func.test.ts @@ -6,7 +6,15 @@ * (pagination hints say "sentry event list", not "sentry issue events"). */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { listCommand } from "../../../src/commands/event/list.js"; vi.mock("../../../src/commands/issue/utils.js", async (importOriginal) => { @@ -14,12 +22,8 @@ vi.mock("../../../src/commands/issue/utils.js", async (importOriginal) => { await importOriginal< typeof import("../../../src/commands/issue/utils.js") >(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -28,12 +32,8 @@ import * as issueUtils from "../../../src/commands/issue/utils.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -42,21 +42,16 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/db/pagination.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as paginationDb from "../../../src/lib/db/pagination.js"; import { parsePeriod } from "../../../src/lib/time-range.js"; import type { IssueEvent, SentryIssue } from "../../../src/types/sentry.js"; - -// Reference paginationDb early to prevent import stripping by auto-organize -const _paginationDbRef = paginationDb; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; // ============================================================================ // Test fixtures @@ -96,7 +91,7 @@ function makeMockEvent(overrides?: Partial): IssueEvent { platform: "javascript", dateCreated: new Date().toISOString(), crashFile: null, - metadata: null, + metadata: {}, ...overrides, }; } @@ -123,18 +118,22 @@ const sampleEvents: IssueEvent[] = [ // ============================================================================ describe("event list command func()", () => { - let listIssueEventsSpy: ReturnType; - let resolveIssueSpy: ReturnType; - let resolveCursorSpy: ReturnType; - let advancePaginationStateSpy: ReturnType; - let hasPreviousPageSpy: ReturnType; + let listIssueEventsSpy: MockInstance<(typeof apiClient)["listIssueEvents"]>; + let resolveIssueSpy: MockInstance<(typeof issueUtils)["resolveIssue"]>; + let resolveCursorSpy: MockInstance<(typeof paginationDb)["resolveCursor"]>; + let advancePaginationStateSpy: MockInstance< + (typeof paginationDb)["advancePaginationState"] + >; + let hasPreviousPageSpy: MockInstance< + (typeof paginationDb)["hasPreviousPage"] + >; function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, stdoutWrite, @@ -172,7 +171,7 @@ describe("event list command func()", () => { listIssueEventsSpy.mockResolvedValue({ data: sampleEvents }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 25, json: true, full: false, period: parsePeriod("7d") }, @@ -196,7 +195,7 @@ describe("event list command func()", () => { listIssueEventsSpy.mockResolvedValue({ data: sampleEvents }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 25, json: false, full: false, period: parsePeriod("7d") }, @@ -223,7 +222,7 @@ describe("event list command func()", () => { hasPreviousPageSpy.mockReturnValue(true); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { @@ -255,7 +254,7 @@ describe("event list command func()", () => { }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 25, json: true, full: false, period: parsePeriod("7d") }, @@ -278,7 +277,7 @@ describe("event list command func()", () => { listIssueEventsSpy.mockResolvedValue({ data: [] }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 25, json: false, full: false, period: parsePeriod("7d") }, @@ -293,14 +292,14 @@ describe("event list command func()", () => { ); }); - test("throws ContextError when org is undefined", async () => { + test("throws ContextError when org is empty", async () => { resolveIssueSpy.mockResolvedValue({ - org: undefined, + org: "", issue: makeMockIssue(), }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call( diff --git a/packages/cli/test/commands/event/send.test.ts b/packages/cli/test/commands/event/send.test.ts index 9d10f7c8d3..2108fa9213 100644 --- a/packages/cli/test/commands/event/send.test.ts +++ b/packages/cli/test/commands/event/send.test.ts @@ -2,6 +2,7 @@ * Tests for `sentry event send` command func(). */ +import type { SentryContext } from "../../../src/context.js"; import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; import { sendCommand } from "../../../src/commands/event/send.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn @@ -11,7 +12,12 @@ import * as eventSendDsn from "../../../src/lib/envelope/event-send-dsn.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn import * as transport from "../../../src/lib/envelope/transport.js"; import { ConfigError, ValidationError } from "../../../src/lib/errors.js"; -import { useTestConfigDir } from "../../helpers.js"; +import { + useTestConfigDir, + loadCommand, + type TestCommandFunction, +} from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; useTestConfigDir("send-event-"); @@ -27,7 +33,7 @@ function makeContext() { return true; }, }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, writes, @@ -35,13 +41,13 @@ function makeContext() { } describe("sendCommand.func()", () => { - let func: Awaited>; + let func: TestCommandFunction; let sendSpy: ReturnType; let detectSpy: ReturnType; beforeEach(async () => { vi.stubEnv("SENTRY_DSN", ""); - func = await sendCommand.loader(); + func = await loadCommand(sendCommand); sendSpy = vi .spyOn(transport, "sendEnvelopeRequest") .mockResolvedValue(undefined); diff --git a/packages/cli/test/commands/event/view.test.ts b/packages/cli/test/commands/event/view.test.ts index 9b76ec29fb..b9ff4bdcfb 100644 --- a/packages/cli/test/commands/event/view.test.ts +++ b/packages/cli/test/commands/event/view.test.ts @@ -7,7 +7,15 @@ // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as Sentry from "@sentry/node"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { collectEventIds, expandNewlineArgs, @@ -26,12 +34,8 @@ import type { ProjectWithOrg } from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for vi.mocked access @@ -41,12 +45,8 @@ import { ProjectSpecificationType } from "../../../src/lib/arg-parsing.js"; vi.mock("../../../src/lib/browser.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -64,12 +64,8 @@ import { vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -79,17 +75,15 @@ import { resolveProjectBoundSlug } from "../../../src/lib/resolve-target.js"; vi.mock("../../../src/lib/span-tree.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as spanTree from "../../../src/lib/span-tree.js"; import type { SentryEvent } from "../../../src/types/index.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; describe("parseEventViewInput", () => { describe("single argument (event ID only)", () => { @@ -530,10 +524,10 @@ describe("parseEventViewInput", () => { let savedSentryHost: string | undefined; beforeEach(async () => { - savedSentryUrl = process.env.SENTRY_URL; - savedSentryHost = process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; - delete process.env.SENTRY_HOST; + savedSentryUrl = process.env["SENTRY_URL"]; + savedSentryHost = process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; + delete process.env["SENTRY_HOST"]; const { resetEnvTokenHostForTesting } = await import("../../../src/lib/env-token-host.js"); resetEnvTokenHostForTesting(); @@ -541,14 +535,14 @@ describe("parseEventViewInput", () => { afterEach(async () => { if (savedSentryUrl !== undefined) { - process.env.SENTRY_URL = savedSentryUrl; + process.env["SENTRY_URL"] = savedSentryUrl; } else { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; } if (savedSentryHost !== undefined) { - process.env.SENTRY_HOST = savedSentryHost; + process.env["SENTRY_HOST"] = savedSentryHost; } else { - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_HOST"]; } const { resetEnvTokenHostForTesting } = await import("../../../src/lib/env-token-host.js"); @@ -564,7 +558,7 @@ describe("parseEventViewInput", () => { }); test("self-hosted event URL extracts eventId and org, and returns the server without applying it", () => { - process.env.SENTRY_HOST = "https://sentry.example.com"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; const result = parseEventViewInput([ "https://sentry.example.com/organizations/acme/issues/999/events/deadbeef/", ]); @@ -572,17 +566,17 @@ describe("parseEventViewInput", () => { expect(result.targetArg).toBe("acme/"); expect(result.baseUrl).toBe("https://sentry.example.com"); // Parsing has no side effects; resolving the arguments applies it - expect(process.env.SENTRY_URL).toBeUndefined(); + expect(process.env["SENTRY_URL"]).toBeUndefined(); }); test("self-hosted issue URL returns the server without applying it", () => { - process.env.SENTRY_HOST = "https://sentry.example.com"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; const result = parseEventViewInput([ "https://sentry.example.com/organizations/acme/issues/999/", ]); expect(result.issueId).toBe("999"); expect(result.baseUrl).toBe("https://sentry.example.com"); - expect(process.env.SENTRY_URL).toBeUndefined(); + expect(process.env["SENTRY_URL"]).toBeUndefined(); }); test("issue URL without event ID returns issueId for latest event fetch", () => { @@ -604,9 +598,11 @@ describe("parseEventViewInput", () => { describe("resolveProjectBoundSlug", () => { const HINT = "sentry event view / "; - let findProjectsBySlugSpy: ReturnType; - let listProjectsSpy: ReturnType; - let getProjectSpy: ReturnType; + let findProjectsBySlugSpy: MockInstance< + (typeof apiClient)["findProjectsBySlug"] + >; + let listProjectsSpy: MockInstance<(typeof apiClient)["listProjects"]>; + let getProjectSpy: MockInstance<(typeof apiClient)["getProject"]>; beforeEach(() => { findProjectsBySlugSpy = vi.spyOn(apiClient, "findProjectsBySlug"); @@ -652,7 +648,7 @@ describe("resolveProjectBoundSlug", () => { test("throws ResolutionError with org hint when slug matches an organization", async () => { findProjectsBySlugSpy.mockResolvedValue({ projects: [], - orgs: [{ slug: "acme-corp", name: "Acme Corp" }], + orgs: [{ id: "1", slug: "acme-corp", name: "Acme Corp" }], }); try { @@ -669,7 +665,7 @@ describe("resolveProjectBoundSlug", () => { test("org hint replaces / placeholder, not slug in command name", async () => { findProjectsBySlugSpy.mockResolvedValue({ projects: [], - orgs: [{ slug: "sentry", name: "Sentry" }], + orgs: [{ id: "2", slug: "sentry", name: "Sentry" }], }); try { @@ -688,7 +684,7 @@ describe("resolveProjectBoundSlug", () => { test("fetches full project data after fuzzy recovery", async () => { findProjectsBySlugSpy.mockResolvedValue({ projects: [], - orgs: [{ slug: "acme", name: "Acme" }], + orgs: [{ id: "3", slug: "acme", name: "Acme" }], }); listProjectsSpy.mockResolvedValue([ { id: "1", slug: "app-frontend", name: "App Frontend" }, @@ -867,11 +863,19 @@ describe("resolveProjectBoundSlug", () => { }); describe("resolveEventTarget", () => { - let resolveEventInOrgSpy: ReturnType; - let findEventAcrossOrgsSpy: ReturnType; - let resolveOrgAndProjectSpy: ReturnType; - let resolveProjectBoundSlugSpy: ReturnType; - let setTagSpy: ReturnType; + let resolveEventInOrgSpy: MockInstance< + (typeof apiClient)["resolveEventInOrg"] + >; + let findEventAcrossOrgsSpy: MockInstance< + (typeof apiClient)["findEventAcrossOrgs"] + >; + let resolveOrgAndProjectSpy: MockInstance< + (typeof resolveTarget)["resolveOrgAndProject"] + >; + let resolveProjectBoundSlugSpy: MockInstance< + (typeof resolveTarget)["resolveProjectBoundSlug"] + >; + let setTagSpy: MockInstance<(typeof Sentry)["setTag"]>; beforeEach(async () => { resolveEventInOrgSpy = vi.spyOn(apiClient, "resolveEventInOrg"); @@ -916,6 +920,7 @@ describe("resolveEventTarget", () => { resolveProjectBoundSlugSpy.mockResolvedValue({ org: "acme", project: "frontend", + projectData: { id: "1", slug: "frontend", name: "Frontend" }, }); const result = await resolveEventTarget({ @@ -984,7 +989,9 @@ describe("resolveEventTarget", () => { }); describe("resolveOrgAllTarget", () => { - let resolveEventInOrgSpy: ReturnType; + let resolveEventInOrgSpy: MockInstance< + (typeof apiClient)["resolveEventInOrg"] + >; beforeEach(() => { resolveEventInOrgSpy = vi.spyOn(apiClient, "resolveEventInOrg"); @@ -1028,8 +1035,12 @@ describe("resolveOrgAllTarget", () => { }); describe("resolveAutoDetectTarget", () => { - let findEventAcrossOrgsSpy: ReturnType; - let resolveOrgAndProjectSpy: ReturnType; + let findEventAcrossOrgsSpy: MockInstance< + (typeof apiClient)["findEventAcrossOrgs"] + >; + let resolveOrgAndProjectSpy: MockInstance< + (typeof resolveTarget)["resolveOrgAndProject"] + >; beforeEach(() => { findEventAcrossOrgsSpy = vi.spyOn(apiClient, "findEventAcrossOrgs"); @@ -1130,11 +1141,11 @@ describe("viewCommand.func", () => { const attachmentDownloadUrl = `https://sentry.io/sentry/api/0/projects/test-org/test-proj/events/${VALID_EVENT_ID}/attachments/attachment-1/?download=1`; function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, stdoutWrite, @@ -1178,7 +1189,7 @@ describe("viewCommand.func", () => { }); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); // Valid 32-char hex has no slash, "test-org/test-proj" has slash → swap detected await func.call( context, @@ -1201,7 +1212,7 @@ describe("viewCommand.func", () => { }); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); const result = await func.call( context, { json: true, web: false, spans: 0 }, @@ -1209,7 +1220,7 @@ describe("viewCommand.func", () => { VALID_EVENT_ID, ); - expect(result?.hint).toBeUndefined(); + expect(result).toBeUndefined(); }); test("includes attachment metadata and download URLs in JSON", async () => { @@ -1223,7 +1234,7 @@ describe("viewCommand.func", () => { listEventAttachmentsSpy.mockResolvedValue([attachment]); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false, spans: 0 }, @@ -1261,7 +1272,7 @@ describe("viewCommand.func", () => { ]); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, web: false, spans: 0 }, @@ -1290,7 +1301,7 @@ describe("viewCommand.func", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false, spans: 0 }, @@ -1326,7 +1337,7 @@ describe("viewCommand.func", () => { }); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { json: true, web: false, spans: 0 }, "17370"); expect(resolveOrgSpy).toHaveBeenCalled(); @@ -1356,7 +1367,7 @@ describe("viewCommand.func", () => { }); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false, spans: 0 }, @@ -1386,7 +1397,7 @@ describe("viewCommand.func", () => { .mockResolvedValue(sampleEvent); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false, spans: 0 }, @@ -1441,7 +1452,7 @@ describe("viewCommand.func", () => { .mockResolvedValue(sampleEvent); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false, spans: 0 }, @@ -1468,7 +1479,7 @@ describe("viewCommand.func", () => { const getLatestEventSpy = vi.spyOn(apiClient, "getLatestEvent"); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect( func.call(context, { json: true, web: false, spans: 0 }, "test-org/"), ).rejects.toThrow(ResolutionError); @@ -1499,7 +1510,7 @@ describe("viewCommand.func", () => { }); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false, spans: 0 }, @@ -1530,7 +1541,7 @@ describe("viewCommand.func", () => { setOrgRegion("test_org", DEFAULT_SENTRY_URL); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); // Underscores in the slug trigger normalized warning await func.call( context, @@ -1552,7 +1563,7 @@ describe("viewCommand.func", () => { // The behavior under test is "a malformed ID still produces an error", // not the exact class — that's covered by hex-id unit tests. const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect( func.call(context, { json: false, web: false, spans: 0 }, "--h"), @@ -1561,7 +1572,7 @@ describe("viewCommand.func", () => { test("parses the arguments before any API call", async () => { const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect( func.call( @@ -1577,7 +1588,7 @@ describe("viewCommand.func", () => { test("throws error for non-hex event ID", async () => { const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect( func.call(context, { json: false, web: false, spans: 0 }, "not-a-hex-id"), diff --git a/packages/cli/test/commands/explore.test.ts b/packages/cli/test/commands/explore.test.ts index fda9d44e4a..9126321773 100644 --- a/packages/cli/test/commands/explore.test.ts +++ b/packages/cli/test/commands/explore.test.ts @@ -7,7 +7,15 @@ import { execFileSync } from "node:child_process"; import { buildApplication, run } from "@stricli/core"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { exploreCommand } from "../../src/commands/explore.js"; import { buildContext } from "../../src/context.js"; import { createSentrySDK } from "../../src/index.js"; @@ -15,12 +23,8 @@ import { createSentrySDK } from "../../src/index.js"; vi.mock("../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -29,12 +33,8 @@ import * as apiClient from "../../src/lib/api-client.js"; vi.mock("../../src/lib/db/pagination.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -51,24 +51,16 @@ import { DEFAULT_REPLAY_EXPLORE_FIELDS } from "../../src/lib/replay-search.js"; vi.mock("../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../src/lib/resolve-target.js"; import { parsePeriod } from "../../src/lib/time-range.js"; +import type { ReplayListItem } from "../../src/types/replay.js"; import { useTestConfigDir } from "../helpers.js"; -// Keep namespace references alive so linting doesn't strip the imports -const _apiRef = apiClient; -const _paginationRef = paginationDb; -const _resolveRef = resolveTarget; - useTestConfigDir("explore-test-"); type ExploreFunc = ( @@ -117,7 +109,9 @@ const MOCK_EVENTS_RESPONSE = { }; // Shape from events-timeseries responses, with anonymized values and timestamps. -const MOCK_TIME_SERIES_RESPONSE = { +const MOCK_TIME_SERIES_RESPONSE: Awaited< + ReturnType<(typeof apiClient)["queryEventsTimeSeries"]> +> = { meta: { dataset: "errors", start: 1_735_689_600_000, @@ -152,7 +146,7 @@ const MOCK_TIME_SERIES_RESPONSE = { ], }; -const MOCK_REPLAYS_RESPONSE = [ +const MOCK_REPLAYS_RESPONSE: ReplayListItem[] = [ { id: "346789a703f6454384f1de473b8b9fcc", count_dead_clicks: 1, @@ -167,18 +161,27 @@ const MOCK_REPLAYS_RESPONSE = [ urls: ["/checkout"], user: { email: "user@example.com" }, warning_ids: [], + releases: [], }, ]; -let queryEventsSpy: ReturnType; -let queryEventsTimeSeriesSpy: ReturnType; -let queryMetricsMetaSpy: ReturnType; -let listReplaysSpy: ReturnType; -let resolveTargetSpy: ReturnType; -let resolveProjectIdSpy: ReturnType; -let resolveCursorSpy: ReturnType; -let advancePaginationStateSpy: ReturnType; -let hasPreviousPageSpy: ReturnType; +let queryEventsSpy: MockInstance<(typeof apiClient)["queryEvents"]>; +let queryEventsTimeSeriesSpy: MockInstance< + (typeof apiClient)["queryEventsTimeSeries"] +>; +let queryMetricsMetaSpy: MockInstance<(typeof apiClient)["queryMetricsMeta"]>; +let listReplaysSpy: MockInstance<(typeof apiClient)["listReplays"]>; +let resolveTargetSpy: MockInstance< + (typeof resolveTarget)["resolveOrgOptionalTarget"] +>; +let resolveProjectIdSpy: MockInstance< + (typeof resolveTarget)["resolveLogProjectId"] +>; +let resolveCursorSpy: MockInstance<(typeof paginationDb)["resolveCursor"]>; +let advancePaginationStateSpy: MockInstance< + (typeof paginationDb)["advancePaginationState"] +>; +let hasPreviousPageSpy: MockInstance<(typeof paginationDb)["hasPreviousPage"]>; const MOCK_METRICS_META = [ { name: "llm.token_usage", type: "distribution", unit: "none" }, @@ -191,7 +194,6 @@ beforeEach(async () => { queryEventsSpy = vi.spyOn(apiClient, "queryEvents"); queryEventsSpy.mockResolvedValue({ data: MOCK_EVENTS_RESPONSE, - nextCursor: undefined, }); queryEventsTimeSeriesSpy = vi.spyOn(apiClient, "queryEventsTimeSeries"); queryEventsTimeSeriesSpy.mockResolvedValue(MOCK_TIME_SERIES_RESPONSE); @@ -200,7 +202,6 @@ beforeEach(async () => { listReplaysSpy = vi.spyOn(apiClient, "listReplays"); listReplaysSpy.mockResolvedValue({ data: MOCK_REPLAYS_RESPONSE, - nextCursor: undefined, }); // Default: resolveOrgOptionalTarget returns org-only (auto-detect) @@ -256,7 +257,11 @@ async function runExploreArgs(args: string[]) { ...context, process: { ...process, - stderr: { ...process.stderr, write: context.stderr.write }, + // Keep the real stream's members but capture what Stricli writes. + stderr: new Proxy(process.stderr, { + get: (target, key) => + key === "write" ? context.stderr.write : Reflect.get(target, key), + }), exitCode: undefined, }, }; @@ -269,7 +274,7 @@ async function runExploreArgs(args: string[]) { } const parseExploreDataset = ( - exploreCommand.parameters.flags!.dataset as { + exploreCommand.parameters.flags!["dataset"] as { parse: (value: string) => string; } ).parse; @@ -1367,7 +1372,11 @@ describe("sentry explore", () => { const rejectedArgument = (fn: string, argument: string, hint?: string) => ({ code: "invalid_function_argument", - functionArgument: { function: fn, argument, hint }, + functionArgument: { + function: fn, + argument, + ...(hint === undefined ? {} : { hint }), + }, }); const rejectedArgumentError = ( detail: string, @@ -1585,7 +1594,13 @@ describe("sentry explore", () => { query: 'span.description:*"POST', }; const parseError = (code?: string) => - new ApiError("Bad request", 400, detail, undefined, { code }); + new ApiError( + "Bad request", + 400, + detail, + undefined, + code === undefined ? {} : { code }, + ); test("reports an unparseable --query as a query ValidationError", async () => { resolveTargetSpy.mockResolvedValue({ org: "test-org" }); @@ -1836,7 +1851,6 @@ describe("sentry explore", () => { }, }, }, - nextCursor: undefined, }); const { context, getStdout } = createContext(); @@ -1907,7 +1921,6 @@ describe("sentry explore", () => { resolveTargetSpy.mockResolvedValue({ org: "test-org" }); queryEventsSpy.mockResolvedValue({ data: { data: [], meta: { fields: {} } }, - nextCursor: undefined, }); const { context, getStdout } = createContext(); @@ -2069,7 +2082,6 @@ describe("sentry explore", () => { resolveTargetSpy.mockResolvedValue({ org: "test-org" }); queryEventsSpy.mockResolvedValue({ data: MOCK_EVENTS_RESPONSE, - nextCursor: undefined, }); const { context } = createContext(); @@ -2089,7 +2101,6 @@ describe("sentry explore", () => { resolveTargetSpy.mockResolvedValue({ org: "test-org" }); queryEventsSpy.mockResolvedValue({ data: MOCK_EVENTS_RESPONSE, - nextCursor: undefined, }); const { context } = createContext(); diff --git a/packages/cli/test/commands/feedback/list.test.ts b/packages/cli/test/commands/feedback/list.test.ts index a51ae3781b..ce99ff1f43 100644 --- a/packages/cli/test/commands/feedback/list.test.ts +++ b/packages/cli/test/commands/feedback/list.test.ts @@ -11,12 +11,8 @@ import type { SentryFeedback } from "../../../src/types/index.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([key, value]) => [ - key, - typeof value === "function" ? vi.fn(value) : value, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -25,12 +21,8 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/db/pagination.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([key, value]) => [ - key, - typeof value === "function" ? vi.fn(value) : value, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -39,16 +31,14 @@ import * as paginationDb from "../../../src/lib/db/pagination.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([key, value]) => [ - key, - typeof value === "function" ? vi.fn(value) : value, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; function sampleFeedback( overrides: Partial = {}, @@ -64,7 +54,12 @@ function sampleFeedback( firstSeen: "2026-07-16T12:00:00Z", permalink: "https://sentry.io/organizations/test-org/feedback/?feedbackSlug=test-project%3A5146636313", - project: { id: "42", slug: "test-project", name: "Test Project" }, + project: { + id: "42", + slug: "test-project", + name: "Test Project", + platform: null, + }, metadata: { message: "The checkout button does not work", name: "Ada", @@ -75,11 +70,11 @@ function sampleFeedback( } function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", commandPrefix: ["sentry", "feedback", "list"], }, @@ -131,7 +126,7 @@ describe("feedback list", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { @@ -173,7 +168,7 @@ describe("feedback list", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { @@ -218,7 +213,7 @@ describe("feedback list", () => { listFeedbackSpy.mockResolvedValue({ feedback: [sampleFeedback()] }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { status: "all", limit: 25, @@ -246,7 +241,7 @@ describe("feedback list", () => { listFeedbackSpy.mockResolvedValue({ feedback: [sampleFeedback()] }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { @@ -277,7 +272,7 @@ describe("feedback list", () => { listFeedbackSpy.mockResolvedValue({ feedback: [] }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { status: "unresolved", limit: 25, @@ -298,7 +293,7 @@ describe("feedback list", () => { ); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call(context, { status: "unresolved", @@ -314,7 +309,7 @@ describe("feedback list", () => { describe("feedback list: query flag parse", () => { const parseQuery = ( - listCommand.parameters.flags!.query as { parse: (v: string) => string } + listCommand.parameters.flags!["query"] as { parse: (v: string) => string } ).parse; test("rewrites is: OR for the issues endpoint", () => { diff --git a/packages/cli/test/commands/feedback/status.test.ts b/packages/cli/test/commands/feedback/status.test.ts index 80d2ab194c..113d89fab0 100644 --- a/packages/cli/test/commands/feedback/status.test.ts +++ b/packages/cli/test/commands/feedback/status.test.ts @@ -24,6 +24,8 @@ vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { import { resolveIssue } from "../../../src/commands/issue/utils.js"; import { updateIssueStatus } from "../../../src/lib/api-client.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; function feedback(): SentryFeedback { return { @@ -38,11 +40,11 @@ function feedback(): SentryFeedback { } function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, output: () => stdoutWrite.mock.calls.map((call) => call[0]).join(""), @@ -88,7 +90,7 @@ describe.each([ test("updates the checked Feedback and emits the server response as JSON", async () => { const { context, output } = createMockContext(); - const func = await command.loader(); + const func = await loadCommand(command); await func.call(context, { json: true }, "TEST-PROJECT-1A"); expect(resolveIssue).toHaveBeenCalledWith({ @@ -120,7 +122,7 @@ describe.each([ issue: { ...feedback(), issueCategory: "error", issueType: "error" }, }); const { context, output } = createMockContext(); - const func = await command.loader(); + const func = await loadCommand(command); await expect( func.call(context, { json: false }, "TEST-PROJECT-1A"), @@ -136,7 +138,7 @@ describe.each([ const error = new ApiError("Permission denied", 403); vi.mocked(updateIssueStatus).mockRejectedValue(error); const { context, output } = createMockContext(); - const func = await command.loader(); + const func = await loadCommand(command); await expect( func.call(context, { json: false }, "TEST-PROJECT-1A"), @@ -152,7 +154,7 @@ test("feedback unresolve restores Feedback marked as spam", async () => { }); vi.mocked(updateIssueStatus).mockResolvedValue(feedback()); const { context, output } = createMockContext(); - const func = await unresolveCommand.loader(); + const func = await loadCommand(unresolveCommand); await func.call(context, { json: true }, "TEST-PROJECT-1A"); diff --git a/packages/cli/test/commands/feedback/utils.test.ts b/packages/cli/test/commands/feedback/utils.test.ts index 45cb6a1d0c..9b4f4167d3 100644 --- a/packages/cli/test/commands/feedback/utils.test.ts +++ b/packages/cli/test/commands/feedback/utils.test.ts @@ -12,12 +12,8 @@ vi.mock("../../../src/commands/issue/utils.js", async (importOriginal) => { await importOriginal< typeof import("../../../src/commands/issue/utils.js") >(); - return Object.fromEntries( - Object.entries(actual).map(([key, value]) => [ - key, - typeof value === "function" ? vi.fn(value) : value, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking diff --git a/packages/cli/test/commands/feedback/view.test.ts b/packages/cli/test/commands/feedback/view.test.ts index 9e571cabd8..873168bb28 100644 --- a/packages/cli/test/commands/feedback/view.test.ts +++ b/packages/cli/test/commands/feedback/view.test.ts @@ -11,12 +11,8 @@ vi.mock("../../../src/commands/feedback/utils.js", async (importOriginal) => { await importOriginal< typeof import("../../../src/commands/feedback/utils.js") >(); - return Object.fromEntries( - Object.entries(actual).map(([key, value]) => [ - key, - typeof value === "function" ? vi.fn(value) : value, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -25,12 +21,8 @@ import * as feedbackUtils from "../../../src/commands/feedback/utils.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([key, value]) => [ - key, - typeof value === "function" ? vi.fn(value) : value, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -39,16 +31,14 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/browser.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([key, value]) => [ - key, - typeof value === "function" ? vi.fn(value) : value, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as browser from "../../../src/lib/browser.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; const REPLAY_ID = "346789a703f6454384f1de473b8b9fcc"; const EXTRA_REPLAY_ID = "aaaaaaaa03f6454384f1de473b8b9fcc"; @@ -65,7 +55,12 @@ function feedback(): SentryFeedback { firstSeen: "2026-07-16T12:00:00Z", permalink: "https://sentry.io/organizations/test-org/feedback/?feedbackSlug=test-project%3A5146636313", - project: { id: "42", slug: "test-project", name: "Test Project" }, + project: { + id: "42", + slug: "test-project", + name: "Test Project", + platform: null, + }, metadata: { message: "Checkout is broken\nPlease help", name: "Ada", @@ -91,11 +86,11 @@ function event(): SentryEvent { } function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, stdoutWrite, @@ -144,7 +139,7 @@ describe("feedback view", () => { test("flattens feedback and enrichment data in JSON", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { @@ -172,7 +167,7 @@ describe("feedback view", () => { test("renders message, linked error, replay, and attachment context", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { @@ -197,7 +192,7 @@ describe("feedback view", () => { listReplayIdsSpy.mockRejectedValue(new Error("replays unavailable")); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { @@ -222,7 +217,7 @@ describe("feedback view", () => { listAttachmentsSpy.mockRejectedValue(new Error("attachments unavailable")); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { @@ -243,7 +238,7 @@ describe("feedback view", () => { test("opens the feedback permalink without enrichment calls", async () => { const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { diff --git a/packages/cli/test/commands/games/leaderboard.test.ts b/packages/cli/test/commands/games/leaderboard.test.ts index c0fb758390..0d75aa872e 100644 --- a/packages/cli/test/commands/games/leaderboard.test.ts +++ b/packages/cli/test/commands/games/leaderboard.test.ts @@ -3,8 +3,12 @@ import { leaderboardCommand } from "../../../src/commands/games/leaderboard.js"; import { withEnv } from "../../../src/lib/env.js"; import { ApiError, CliError, EXIT } from "../../../src/lib/errors.js"; import { getPlayerHandle } from "../../../src/lib/games/player.js"; -import { useTestConfigDir } from "../../helpers.js"; -import { createMockServer, type MockServer } from "../../mocks/server.js"; +import { useTestConfigDir, loadCommand } from "../../helpers.js"; +import { + createMockServer, + type MockServer, + type StaticResponseBody, +} from "../../mocks/server.js"; useTestConfigDir("test-games-leaderboard-"); @@ -20,7 +24,7 @@ async function run( stderr: { write: () => true }, stdin: { isTTY: false }, }; - const func = await leaderboardCommand.loader(); + const func = await loadCommand(leaderboardCommand); await withEnv({ ...process.env, SENTRY_GAMES_API_URL: server.url }, () => func.call(context as never, flags as never), ); @@ -29,7 +33,7 @@ async function run( async function withServer( status: number, - body: unknown, + body: StaticResponseBody, fn: (server: MockServer) => Promise, ): Promise { const server = createMockServer([ diff --git a/packages/cli/test/commands/games/snake.test.ts b/packages/cli/test/commands/games/snake.test.ts index a5a0c50da6..ae958f7657 100644 --- a/packages/cli/test/commands/games/snake.test.ts +++ b/packages/cli/test/commands/games/snake.test.ts @@ -7,6 +7,7 @@ import { describe, expect, test } from "vitest"; import { snakeCommand } from "../../../src/commands/games/snake.js"; import { withEnv } from "../../../src/lib/env.js"; import { ValidationError } from "../../../src/lib/errors.js"; +import { loadCommand } from "../../helpers.js"; function createContext(isTTY: boolean) { return { @@ -16,7 +17,7 @@ function createContext(isTTY: boolean) { } async function run(isTTY: boolean): Promise { - const func = await snakeCommand.loader(); + const func = await loadCommand(snakeCommand); await func.call(createContext(isTTY), {}); } diff --git a/packages/cli/test/commands/info.test.ts b/packages/cli/test/commands/info.test.ts index e0d3e1fe6e..abbc54bed5 100644 --- a/packages/cli/test/commands/info.test.ts +++ b/packages/cli/test/commands/info.test.ts @@ -13,6 +13,7 @@ import * as users from "../../src/lib/api/users.js"; import * as auth from "../../src/lib/db/auth.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as defaults from "../../src/lib/db/defaults.js"; +import { loadCommand } from "../helpers.js"; function createContext(env: NodeJS.ProcessEnv = {}) { const writes: string[] = []; @@ -50,7 +51,7 @@ describe("sentry info", () => { test("reports unauthenticated and exits 1", async () => { const harness = createContext(); - const func = await infoCommand.loader(); + const func = await loadCommand(infoCommand); await func.call(harness.context, {}); @@ -69,7 +70,7 @@ describe("sentry info", () => { vi.spyOn(defaults, "getDefaultProject").mockReturnValue("web"); const harness = createContext(); - const func = await infoCommand.loader(); + const func = await loadCommand(infoCommand); await func.call(harness.context, {}); expect(harness.output()).toContain("me@example.com"); @@ -80,14 +81,14 @@ describe("sentry info", () => { vi.spyOn(auth, "isAuthenticated").mockReturnValue(true); // getCurrentUser rejects (default) → successful false. const harness = createContext(); - const func = await infoCommand.loader(); + const func = await loadCommand(infoCommand); await func.call(harness.context, {}); expect(harness.exitCode).toBe(1); }); test("--config-status-json emits JSON and always exits 0", async () => { const harness = createContext(); - const func = await infoCommand.loader(); + const func = await loadCommand(infoCommand); await func.call(harness.context, { "config-status-json": true }); @@ -106,7 +107,7 @@ describe("sentry info", () => { }); const harness = createContext(); - const func = await infoCommand.loader(); + const func = await loadCommand(infoCommand); await func.call(harness.context, { "no-defaults": true }); expect(harness.exitCode ?? 0).toBe(0); }); @@ -117,7 +118,7 @@ describe("sentry info", () => { SENTRY_ORG: "envorg", SENTRY_DSN: "https://k@o.ingest.sentry.io/1", }); - const func = await infoCommand.loader(); + const func = await loadCommand(infoCommand); await func.call(harness.context, { "config-status-json": true }); const parsed = JSON.parse(harness.output()); diff --git a/packages/cli/test/commands/init.test.ts b/packages/cli/test/commands/init.test.ts index ef5757072c..5829e4d7da 100644 --- a/packages/cli/test/commands/init.test.ts +++ b/packages/cli/test/commands/init.test.ts @@ -19,7 +19,8 @@ import { initCommand } from "../../src/commands/init.js"; import type { SentryContext } from "../../src/context.js"; import { INIT_GUIDE } from "../../src/generated/init-guide.js"; import { clearSentryCliRcCache } from "../../src/lib/sentryclirc.js"; -import { useTestConfigDir } from "../helpers.js"; +import { useTestConfigDir, loadCommand } from "../helpers.js"; +import type { Writer } from "../../src/types/index.js"; const GUIDE_SOURCE = readFileSync( new URL("../../init.md", import.meta.url), @@ -32,18 +33,18 @@ async function runInit( flags: Record = {}, cwd = "/tmp", ): Promise<{ stdout: string }> { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); const context = { process, env: process.env, stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, stdin: process.stdin, cwd, homeDir: "/tmp", configDir: "/tmp", } as unknown as SentryContext; - const func = await initCommand.loader(); + const func = await loadCommand(initCommand); await func.call(context, { json: false, ...flags }); return { stdout: stdoutWrite.mock.calls.map((call) => call[0]).join("") }; } diff --git a/packages/cli/test/commands/integration/delete.test.ts b/packages/cli/test/commands/integration/delete.test.ts index c7c4eab126..32e561872b 100644 --- a/packages/cli/test/commands/integration/delete.test.ts +++ b/packages/cli/test/commands/integration/delete.test.ts @@ -11,12 +11,8 @@ import { vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -30,12 +26,8 @@ import { vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -49,6 +41,8 @@ vi.mock("../../../src/lib/scope-recovery.js", async (importOriginal) => { // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for vi.mocked access import * as scopeRecovery from "../../../src/lib/scope-recovery.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; const sampleIntegration = { id: "42", @@ -62,11 +56,11 @@ const sampleIntegration = { const yesFlags = { yes: true, force: false, "dry-run": false, json: false }; function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, stdoutWrite, @@ -140,7 +134,7 @@ describe("integration delete", () => { test("removes the integration with --yes", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call(context, yesFlags, "my-org/42"); expect(resolveOrgSpy).toHaveBeenCalledWith({ org: "my-org", cwd: "/tmp" }); @@ -152,7 +146,7 @@ describe("integration delete", () => { test("elevates to org:integrations before deleting", async () => { ensureScopesSpy.mockResolvedValue("elevated"); const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call(context, yesFlags, "my-org/42"); expect(ensureScopesSpy).toHaveBeenCalledWith( @@ -166,7 +160,7 @@ describe("integration delete", () => { test("does not delete when authorization is declined", async () => { ensureScopesSpy.mockResolvedValue("declined"); const { context, stdoutWrite } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call(context, { ...yesFlags, json: true }, "my-org/42"); expect(deleteSpy).not.toHaveBeenCalled(); @@ -175,7 +169,7 @@ describe("integration delete", () => { test("dry-run does not delete", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call(context, { ...yesFlags, "dry-run": true }, "my-org/42"); expect(deleteSpy).not.toHaveBeenCalled(); @@ -185,7 +179,7 @@ describe("integration delete", () => { test("JSON output reports the removed integration", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call(context, { ...yesFlags, json: true }, "my-org/42"); expect(JSON.parse(output(stdoutWrite))).toMatchObject({ @@ -199,7 +193,7 @@ describe("integration delete", () => { test("propagates 404 before attempting the delete", async () => { getSpy.mockRejectedValue(new ApiError("Not found", 404)); const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await expect(func.call(context, yesFlags, "my-org/42")).rejects.toThrow( ApiError, @@ -210,7 +204,7 @@ describe("integration delete", () => { test("explains the role requirement on a 403 that survives elevation", async () => { deleteSpy.mockRejectedValue(new ApiError("Forbidden", 403)); const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); const error = await func .call(context, yesFlags, "my-org/42") @@ -224,7 +218,7 @@ describe("integration delete", () => { ensureScopesSpy.mockResolvedValue("unavailable"); deleteSpy.mockRejectedValue(new ApiError("Forbidden", 403)); const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); const error = await func .call(context, yesFlags, "my-org/42") @@ -239,7 +233,7 @@ describe("integration delete", () => { test("throws ContextError when no org can be resolved", async () => { resolveOrgSpy.mockResolvedValue(null); const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await expect(func.call(context, yesFlags, "42")).rejects.toThrow( ContextError, diff --git a/packages/cli/test/commands/integration/list.test.ts b/packages/cli/test/commands/integration/list.test.ts index 4f0e6ed5cb..f4bfe9140e 100644 --- a/packages/cli/test/commands/integration/list.test.ts +++ b/packages/cli/test/commands/integration/list.test.ts @@ -11,12 +11,8 @@ import { listCommand } from "../../../src/commands/integration/list.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for vi.mocked access @@ -26,18 +22,16 @@ import { DEFAULT_SENTRY_URL } from "../../../src/lib/constants.js"; vi.mock("../../../src/lib/db/pagination.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for vi.mocked access import * as paginationDb from "../../../src/lib/db/pagination.js"; import { setOrgRegion } from "../../../src/lib/db/regions.js"; import type { SentryIntegration } from "../../../src/types/sentry.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; const sampleIntegrations: SentryIntegration[] = [ { @@ -61,8 +55,8 @@ const sampleIntegrations: SentryIntegration[] = [ ]; function createMockContext(cwd = "/tmp") { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -97,7 +91,7 @@ describe("integration list", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 2, json: true }, "my-org/"); const parsed = JSON.parse(stdoutWrite.mock.calls.map((c) => c[0]).join("")); @@ -114,11 +108,10 @@ describe("integration list", () => { test("human output shows provider, ID, and per-org status", async () => { listPaginatedSpy.mockResolvedValue({ data: sampleIntegrations, - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 25, json: false }, "my-org/"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -132,11 +125,10 @@ describe("integration list", () => { listSpy.mockResolvedValue(sampleIntegrations); listPaginatedSpy.mockResolvedValue({ data: sampleIntegrations, - nextCursor: undefined, }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); // No integration is named like `my-project`, so it reads as a project. await func.call(context, { limit: 30, json: true }, "my-org/my-project"); @@ -146,11 +138,10 @@ describe("integration list", () => { test("/ keeps integrations named like it, fuzzily", async () => { listPaginatedSpy.mockResolvedValue({ data: sampleIntegrations, - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: true }, "my-org/sentri"); const parsed = JSON.parse(stdoutWrite.mock.calls.map((c) => c[0]).join("")); @@ -164,11 +155,10 @@ describe("integration list", () => { async (target) => { listPaginatedSpy.mockResolvedValue({ data: sampleIntegrations, - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: true }, target); const parsed = JSON.parse( diff --git a/packages/cli/test/commands/issue/archive.func.test.ts b/packages/cli/test/commands/issue/archive.func.test.ts index d6989c9cbe..26455e04a7 100644 --- a/packages/cli/test/commands/issue/archive.func.test.ts +++ b/packages/cli/test/commands/issue/archive.func.test.ts @@ -5,7 +5,16 @@ * construction, validation errors, and human output. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import type { SentryContext } from "../../../src/context.js"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { archiveCommand, parseUntilSpec, @@ -16,12 +25,8 @@ vi.mock("../../../src/commands/issue/utils.js", async (importOriginal) => { await importOriginal< typeof import("../../../src/commands/issue/utils.js") >(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -30,18 +35,16 @@ import * as issueUtils from "../../../src/commands/issue/utils.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as apiClient from "../../../src/lib/api-client.js"; import { ValidationError } from "../../../src/lib/errors.js"; import type { SentryIssue } from "../../../src/types/sentry.js"; +import { loadCommand, type TestCommandFunction } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; function makeMockIssue(overrides?: Partial): SentryIssue { return { @@ -62,11 +65,11 @@ function makeMockIssue(overrides?: Partial): SentryIssue { } function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, stdoutWrite, @@ -224,14 +227,14 @@ describe("parseUntilSpec", () => { // ── archiveCommand.func() integration tests ──────────────────────── describe("archiveCommand.func()", () => { - let resolveIssueSpy: ReturnType; - let updateSpy: ReturnType; - let func: Awaited>; + let resolveIssueSpy: MockInstance<(typeof issueUtils)["resolveIssue"]>; + let updateSpy: MockInstance<(typeof apiClient)["updateIssueStatus"]>; + let func: TestCommandFunction; beforeEach(async () => { resolveIssueSpy = vi.spyOn(issueUtils, "resolveIssue"); updateSpy = vi.spyOn(apiClient, "updateIssueStatus"); - func = await archiveCommand.loader(); + func = await loadCommand(archiveCommand); }); afterEach(() => { diff --git a/packages/cli/test/commands/issue/events.func.test.ts b/packages/cli/test/commands/issue/events.func.test.ts index a77919692e..587dcfa722 100644 --- a/packages/cli/test/commands/issue/events.func.test.ts +++ b/packages/cli/test/commands/issue/events.func.test.ts @@ -7,7 +7,15 @@ * and pagination DB functions without real HTTP calls or database access. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { eventsCommand } from "../../../src/commands/issue/events.js"; vi.mock("../../../src/commands/issue/utils.js", async (importOriginal) => { @@ -15,12 +23,8 @@ vi.mock("../../../src/commands/issue/utils.js", async (importOriginal) => { await importOriginal< typeof import("../../../src/commands/issue/utils.js") >(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -29,12 +33,8 @@ import * as issueUtils from "../../../src/commands/issue/utils.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -43,21 +43,16 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/db/pagination.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as paginationDb from "../../../src/lib/db/pagination.js"; import { parsePeriod } from "../../../src/lib/time-range.js"; import type { IssueEvent, SentryIssue } from "../../../src/types/sentry.js"; - -// Reference paginationDb early to prevent import stripping by auto-organize -const _paginationDbRef = paginationDb; +import { loadCommand, at } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; // ============================================================================ // Test fixtures @@ -97,7 +92,7 @@ function makeMockEvent(overrides?: Partial): IssueEvent { platform: "javascript", dateCreated: new Date().toISOString(), crashFile: null, - metadata: null, + metadata: {}, ...overrides, }; } @@ -124,18 +119,22 @@ const sampleEvents: IssueEvent[] = [ // ============================================================================ describe("eventsCommand.func()", () => { - let listIssueEventsSpy: ReturnType; - let resolveIssueSpy: ReturnType; - let resolveCursorSpy: ReturnType; - let advancePaginationStateSpy: ReturnType; - let hasPreviousPageSpy: ReturnType; + let listIssueEventsSpy: MockInstance<(typeof apiClient)["listIssueEvents"]>; + let resolveIssueSpy: MockInstance<(typeof issueUtils)["resolveIssue"]>; + let resolveCursorSpy: MockInstance<(typeof paginationDb)["resolveCursor"]>; + let advancePaginationStateSpy: MockInstance< + (typeof paginationDb)["advancePaginationState"] + >; + let hasPreviousPageSpy: MockInstance< + (typeof paginationDb)["hasPreviousPage"] + >; function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, stdoutWrite, @@ -173,7 +172,7 @@ describe("eventsCommand.func()", () => { listIssueEventsSpy.mockResolvedValue({ data: sampleEvents }); const { context, stdoutWrite } = createMockContext(); - const func = await eventsCommand.loader(); + const func = await loadCommand(eventsCommand); await func.call( context, { limit: 25, json: true, full: false, period: parsePeriod("7d") }, @@ -197,7 +196,7 @@ describe("eventsCommand.func()", () => { listIssueEventsSpy.mockResolvedValue({ data: [] }); const { context, stdoutWrite } = createMockContext(); - const func = await eventsCommand.loader(); + const func = await loadCommand(eventsCommand); await func.call( context, { limit: 25, json: true, full: false, period: parsePeriod("7d") }, @@ -220,7 +219,7 @@ describe("eventsCommand.func()", () => { listIssueEventsSpy.mockResolvedValue({ data: [] }); const { context, stdoutWrite } = createMockContext(); - const func = await eventsCommand.loader(); + const func = await loadCommand(eventsCommand); await func.call( context, { limit: 25, json: false, full: false, period: parsePeriod("7d") }, @@ -239,7 +238,7 @@ describe("eventsCommand.func()", () => { listIssueEventsSpy.mockResolvedValue({ data: sampleEvents }); const { context, stdoutWrite } = createMockContext(); - const func = await eventsCommand.loader(); + const func = await loadCommand(eventsCommand); await func.call( context, { limit: 25, json: false, full: false, period: parsePeriod("7d") }, @@ -265,7 +264,7 @@ describe("eventsCommand.func()", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await eventsCommand.loader(); + const func = await loadCommand(eventsCommand); await func.call( context, { @@ -292,7 +291,7 @@ describe("eventsCommand.func()", () => { listIssueEventsSpy.mockResolvedValue({ data: sampleEvents }); const { context, stdoutWrite } = createMockContext(); - const func = await eventsCommand.loader(); + const func = await loadCommand(eventsCommand); await func.call( context, { limit: 100, json: false, full: false, period: parsePeriod("7d") }, @@ -309,10 +308,10 @@ describe("eventsCommand.func()", () => { org: "test-org", issue: makeMockIssue(), }); - listIssueEventsSpy.mockResolvedValue({ data: [sampleEvents[0]] }); + listIssueEventsSpy.mockResolvedValue({ data: [at(sampleEvents, 0)] }); const { context, stdoutWrite } = createMockContext(); - const func = await eventsCommand.loader(); + const func = await loadCommand(eventsCommand); await func.call( context, { limit: 25, json: false, full: false, period: parsePeriod("7d") }, @@ -332,7 +331,7 @@ describe("eventsCommand.func()", () => { listIssueEventsSpy.mockResolvedValue({ data: [] }); const { context } = createMockContext(); - const func = await eventsCommand.loader(); + const func = await loadCommand(eventsCommand); await func.call( context, { @@ -362,7 +361,7 @@ describe("eventsCommand.func()", () => { listIssueEventsSpy.mockResolvedValue({ data: [] }); const { context } = createMockContext(); - const func = await eventsCommand.loader(); + const func = await loadCommand(eventsCommand); await func.call( context, { limit: 25, json: false, full: false, period: parsePeriod("30d") }, @@ -387,7 +386,7 @@ describe("eventsCommand.func()", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await eventsCommand.loader(); + const func = await loadCommand(eventsCommand); await func.call( context, { limit: 2, json: true, full: false, period: parsePeriod("7d") }, @@ -408,7 +407,7 @@ describe("eventsCommand.func()", () => { listIssueEventsSpy.mockResolvedValue({ data: sampleEvents }); const { context, stdoutWrite } = createMockContext(); - const func = await eventsCommand.loader(); + const func = await loadCommand(eventsCommand); await func.call( context, { limit: 25, json: true, full: false, period: parsePeriod("7d") }, @@ -431,7 +430,7 @@ describe("eventsCommand.func()", () => { }); const { context } = createMockContext(); - const func = await eventsCommand.loader(); + const func = await loadCommand(eventsCommand); await func.call( context, { limit: 25, json: true, full: false, period: parsePeriod("7d") }, @@ -456,7 +455,7 @@ describe("eventsCommand.func()", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await eventsCommand.loader(); + const func = await loadCommand(eventsCommand); await func.call( context, { limit: 25, json: false, full: false, period: parsePeriod("7d") }, @@ -478,7 +477,7 @@ describe("eventsCommand.func()", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await eventsCommand.loader(); + const func = await loadCommand(eventsCommand); await func.call( context, { limit: 25, json: false, full: false, period: parsePeriod("7d") }, @@ -501,7 +500,7 @@ describe("eventsCommand.func()", () => { hasPreviousPageSpy.mockReturnValue(true); const { context, stdoutWrite } = createMockContext(); - const func = await eventsCommand.loader(); + const func = await loadCommand(eventsCommand); await func.call( context, { limit: 25, json: false, full: false, period: parsePeriod("7d") }, diff --git a/packages/cli/test/commands/issue/explain.func.test.ts b/packages/cli/test/commands/issue/explain.func.test.ts index 20a4ad0fc0..bd20670874 100644 --- a/packages/cli/test/commands/issue/explain.func.test.ts +++ b/packages/cli/test/commands/issue/explain.func.test.ts @@ -9,12 +9,8 @@ vi.mock("../../../src/commands/issue/utils.js", async (importOriginal) => { await importOriginal< typeof import("../../../src/commands/issue/utils.js") >(); - return Object.fromEntries( - Object.entries(actual).map(([key, value]) => [ - key, - typeof value === "function" ? vi.fn(value) : value, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); import { explainCommand } from "../../../src/commands/issue/explain.js"; @@ -23,6 +19,8 @@ import * as issueUtils from "../../../src/commands/issue/utils.js"; import { ApiError, ContextError, EXIT } from "../../../src/lib/errors.js"; import type { IssueArgument } from "../../../src/lib/issue-arguments.js"; import type { AutofixState, RootCause } from "../../../src/types/seer.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; const EXPLAIN_FLAGS = { json: true, @@ -54,7 +52,7 @@ function createMockContext() { return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, stdoutWrite, @@ -80,7 +78,7 @@ describe("issue explain multiple IDs", () => { analyzeSpy.mockResolvedValue(sampleState(sampleCause("Single cause"))); const { context, stdoutWrite } = createMockContext(); - const func = await explainCommand.loader(); + const func = await loadCommand(explainCommand); await func.call(context, EXPLAIN_FLAGS, "IOS-1"); expect(JSON.parse(stdoutWrite.mock.calls[0]?.[0] ?? "")).toEqual([ @@ -100,7 +98,7 @@ describe("issue explain multiple IDs", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await explainCommand.loader(); + const func = await loadCommand(explainCommand); await func.call(context, EXPLAIN_FLAGS, "IOS-1", "IOS-2"); expect(JSON.parse(stdoutWrite.mock.calls[0]?.[0] ?? "")).toEqual([ @@ -128,7 +126,7 @@ describe("issue explain multiple IDs", () => { ); analyzeSpy.mockResolvedValue(sampleState(sampleCause("Cause"))); - const func = await explainCommand.loader(); + const func = await loadCommand(explainCommand); await func.call( createMockContext().context, { json: false, force: false, fresh: false }, @@ -154,7 +152,7 @@ describe("issue explain multiple IDs", () => { analyzeSpy.mockResolvedValue(sampleState(sampleCause("Cause"))); const { context, stdoutWrite } = createMockContext(); - const func = await explainCommand.loader(); + const func = await loadCommand(explainCommand); await func.call(context, EXPLAIN_FLAGS, "IOS-1", "MISSING"); const output = JSON.parse(stdoutWrite.mock.calls[0]?.[0] ?? ""); @@ -166,7 +164,7 @@ describe("issue explain multiple IDs", () => { const error = new Error("analysis failed"); resolveSpy.mockRejectedValue(error); - const func = await explainCommand.loader(); + const func = await loadCommand(explainCommand); await expect( func.call(createMockContext().context, EXPLAIN_FLAGS, "IOS-1", "IOS-2"), ).rejects.toBe(error); @@ -184,7 +182,7 @@ describe("issue explain multiple IDs", () => { ), ); - const func = await explainCommand.loader(); + const func = await loadCommand(explainCommand); await expect( func.call(createMockContext().context, EXPLAIN_FLAGS, "IOS-1"), ).rejects.toMatchObject({ reason: "out_of_credits", orgSlug: "test-org" }); @@ -223,7 +221,7 @@ describe("issue explain multiple IDs", () => { ), ); - const func = await explainCommand.loader(); + const func = await loadCommand(explainCommand); await expect( func.call(createMockContext().context, EXPLAIN_FLAGS, "IOS-1"), ).rejects.toMatchObject({ @@ -234,7 +232,7 @@ describe("issue explain multiple IDs", () => { }); test("fails to parse when no issue ID is provided", async () => { - const func = await explainCommand.loader(); + const func = await loadCommand(explainCommand); await expect( func.call(createMockContext().context, EXPLAIN_FLAGS), ).rejects.toMatchObject({ exception: expect.any(ContextError) }); diff --git a/packages/cli/test/commands/issue/link.func.test.ts b/packages/cli/test/commands/issue/link.func.test.ts index 9960f11441..2546ff4c8b 100644 --- a/packages/cli/test/commands/issue/link.func.test.ts +++ b/packages/cli/test/commands/issue/link.func.test.ts @@ -8,6 +8,7 @@ import { type ExternalIssueLinkResult, linkExternalIssue, } from "../../../src/lib/issue-links.js"; +import { loadCommand } from "../../helpers.js"; vi.mock("../../../src/commands/issue/utils.js", async (importOriginal) => ({ ...(await importOriginal< @@ -65,7 +66,7 @@ describe("issue link", () => { test("forwards resolved organization, issue and project with the integration selector", async () => { const { context, output } = createMockContext(); - const func = await linkCommand.loader(); + const func = await loadCommand(linkCommand); await func.call( context, { ...defaultFlags, integration: "99" }, @@ -103,7 +104,7 @@ describe("issue link", () => { test("forwards an App selector and parses repeatable fields without losing values", async () => { const { context } = createMockContext(); - const func = await linkCommand.loader(); + const func = await loadCommand(linkCommand); await func.call( context, { @@ -138,7 +139,7 @@ describe("issue link", () => { "rejects malformed or ambiguous --field input %j before resolving or writing", async (...fields) => { const { context, output } = createMockContext(); - const func = await linkCommand.loader(); + const func = await loadCommand(linkCommand); await expect( func.call( @@ -163,7 +164,7 @@ describe("issue link", () => { dryRun: true, }); const { context, output } = createMockContext(); - const func = await linkCommand.loader(); + const func = await loadCommand(linkCommand); await func.call( context, { ...defaultFlags, "dry-run": true }, @@ -180,7 +181,7 @@ describe("issue link", () => { test("emits the link result unchanged in JSON", async () => { const { context, output } = createMockContext(); - const func = await linkCommand.loader(); + const func = await loadCommand(linkCommand); await func.call( context, { ...defaultFlags, json: true }, diff --git a/packages/cli/test/commands/issue/list.property.test.ts b/packages/cli/test/commands/issue/list.property.test.ts index 12467987eb..38869503f5 100644 --- a/packages/cli/test/commands/issue/list.property.test.ts +++ b/packages/cli/test/commands/issue/list.property.test.ts @@ -23,10 +23,10 @@ import { import { describe, expect, test } from "vitest"; import { __testing, - type IssueListResult, - type IssueWithOptions, + type IssueListFetchResult, type SortValue, } from "../../../src/commands/issue/list.js"; +import type { IssueTableRow } from "../../../src/lib/formatters/human.js"; import type { SentryIssue } from "../../../src/types/index.js"; import { DEFAULT_NUM_RUNS } from "../../model-based/helpers.js"; @@ -50,9 +50,9 @@ const slugArb = array( { minLength: 1, maxLength: 12 }, ).map((chars) => chars.join("")); -/** Generates an IssueWithOptions for testing trimWithProjectGuarantee */ +/** Generates an IssueTableRow for testing trimWithProjectGuarantee */ const issueWithOptionsArb = tuple(slugArb, slugArb).map( - ([org, proj]): IssueWithOptions => ({ + ([org, proj]): IssueTableRow => ({ issue: { id: `${Math.random()}`, shortId: `${proj.toUpperCase()}-1`, @@ -80,9 +80,7 @@ const cursorValueArb = oneof( ); /** Sort value arbitrary */ -const sortValueArb = constantFrom(...VALID_SORT_VALUES) as ReturnType< - typeof constantFrom ->; +const sortValueArb = constantFrom(...VALID_SORT_VALUES); /** ISO date string arbitrary */ const isoDateArb = integer({ @@ -451,7 +449,7 @@ describe("property: parseSort", () => { // --- buildProjectAliasMap --- describe("property: buildProjectAliasMap", () => { - function makeResult(org: string, project: string): IssueListResult { + function makeResult(org: string, project: string): IssueListFetchResult { return { target: { org, project, orgDisplay: org, projectDisplay: project }, issues: [], diff --git a/packages/cli/test/commands/issue/list.test.ts b/packages/cli/test/commands/issue/list.test.ts index f7c0fc8629..cbbd5282cc 100644 --- a/packages/cli/test/commands/issue/list.test.ts +++ b/packages/cli/test/commands/issue/list.test.ts @@ -65,7 +65,12 @@ import { } from "../../../src/lib/errors.js"; import type { TimeRange } from "../../../src/lib/time-range.js"; import { parsePeriod } from "../../../src/lib/time-range.js"; -import { mockFetch, useTestConfigDir } from "../../helpers.js"; +import { + mockFetch, + useTestConfigDir, + at, + issueProject, +} from "../../helpers.js"; type ListFlags = { readonly query?: string; @@ -144,7 +149,7 @@ function mockDefaultProject(url: string): Response | null { } /** Build a mock issue response */ -function mockIssue(overrides?: Record) { +function mockIssue(overrides: Partial = {}): SentryIssue { return { id: "123", shortId: "TEST-PROJECT-1", @@ -499,7 +504,6 @@ describe("issue list: org-as-project detection", () => { test("lists the organization when no project has that slug", async () => { listIssuesAllPagesMock.mockResolvedValue({ issues: [], - nextCursor: undefined, }); // Two orgs returned from /organizations/, but getProject returns 404 for both. @@ -569,7 +573,6 @@ describe("issue list: org-as-project detection", () => { }); listIssuesAllPagesMock.mockResolvedValue({ issues: [], - nextCursor: undefined, }); resolveCursorMock.mockReturnValue({ cursor: undefined, @@ -971,8 +974,8 @@ const advancePaginationStateMock = vi.mocked( describe("issue list: org-all mode (cursor pagination)", () => { function createOrgAllContext() { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -984,7 +987,7 @@ describe("issue list: org-all mode (cursor pagination)", () => { }; } - const sampleIssue = { + const sampleIssue: SentryIssue = { id: "1", shortId: "PROJ-1", title: "Test Error", @@ -996,7 +999,7 @@ describe("issue list: org-all mode (cursor pagination)", () => { lastSeen: "2025-01-01T00:00:00Z", firstSeen: "2025-01-01T00:00:00Z", level: "error", - project: { slug: "test-proj" }, + project: issueProject("test-proj"), }; beforeEach(async () => { @@ -1024,7 +1027,6 @@ describe("issue list: org-all mode (cursor pagination)", () => { listIssuesAllPagesMock.mockResolvedValue({ issues: [], - nextCursor: undefined, }); // Raw cursor passthrough: resolveCursor returns the cursor string as-is @@ -1140,7 +1142,6 @@ describe("issue list: org-all mode (cursor pagination)", () => { test("human output 'No issues found' when empty org-all", async () => { listIssuesAllPagesMock.mockResolvedValue({ issues: [], - nextCursor: undefined, }); const orgAllFunc = (await listCommand.loader()) as unknown as ( @@ -1273,7 +1274,7 @@ describe("issue list: cursor flag parse validation", () => { // Access the parse function directly from the command's flag definition. // This tests the validation without needing a full command invocation. const parseCursor = ( - listCommand.parameters.flags!.cursor as { parse: (v: string) => string } + listCommand.parameters.flags!["cursor"] as { parse: (v: string) => string } ).parse; test('accepts "last" keyword', () => { @@ -1298,7 +1299,7 @@ describe("issue list: cursor flag parse validation", () => { describe("issue list: query flag parse", () => { const parseQuery = ( - listCommand.parameters.flags!.query as { parse: (v: string) => string } + listCommand.parameters.flags!["query"] as { parse: (v: string) => string } ).parse; test("rewrites is: OR into a status in-list for the issues endpoint", () => { @@ -1341,7 +1342,7 @@ describe("issue list: Phase 2 budget redistribution", () => { firstSeen: "2025-01-01T00:00:00Z", level: "error", platform: "javascript", - project: { slug: "myproj" }, + project: issueProject("myproj"), }); globalThis.fetch = mockFetch(async (input, init) => { @@ -1530,7 +1531,7 @@ describe("issue list: compound cursor resume", () => { // --------------------------------------------------------------------------- describe("issue list: collapse parameter optimization", () => { - const sampleIssue = { + const sampleIssue: SentryIssue = { id: "1", shortId: "PROJ-1", title: "Test Error", @@ -1542,12 +1543,12 @@ describe("issue list: collapse parameter optimization", () => { lastSeen: "2025-01-01T00:00:00Z", firstSeen: "2025-01-01T00:00:00Z", level: "error", - project: { slug: "test-proj" }, + project: issueProject("test-proj"), }; function createOrgAllContext() { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -1596,20 +1597,20 @@ describe("issue list: collapse parameter optimization", () => { let savedHost: string | undefined; beforeEach(() => { - savedUrl = process.env.SENTRY_URL; - savedHost = process.env.SENTRY_HOST; + savedUrl = process.env["SENTRY_URL"]; + savedHost = process.env["SENTRY_HOST"]; }); afterEach(() => { if (savedUrl === undefined) { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; } else { - process.env.SENTRY_URL = savedUrl; + process.env["SENTRY_URL"] = savedUrl; } if (savedHost === undefined) { - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_HOST"]; } else { - process.env.SENTRY_HOST = savedHost; + process.env["SENTRY_HOST"] = savedHost; } }); @@ -1634,20 +1635,20 @@ describe("issue list: collapse parameter optimization", () => { } test("uses recommended on Sentry SaaS", async () => { - delete process.env.SENTRY_URL; - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_URL"]; + delete process.env["SENTRY_HOST"]; const options = await runOrgAllWithoutSort(); expect(listIssuesAllPagesMock).toHaveBeenCalled(); - expect(options.sort).toBe("recommended"); + expect(options["sort"]).toBe("recommended"); }); test("uses date on a self-hosted instance", async () => { - delete process.env.SENTRY_HOST; - process.env.SENTRY_URL = "https://sentry.example.com"; + delete process.env["SENTRY_HOST"]; + process.env["SENTRY_URL"] = "https://sentry.example.com"; setOrgRegion("my-org", "https://sentry.example.com"); const options = await runOrgAllWithoutSort(); expect(listIssuesAllPagesMock).toHaveBeenCalled(); - expect(options.sort).toBe("date"); + expect(options["sort"]).toBe("date"); }); }); @@ -1658,7 +1659,7 @@ describe("issue list: collapse parameter optimization", () => { period: parsePeriod("90d"), json: false, }); - const collapse = options.collapse as string[]; + const collapse = options["collapse"] as string[]; expect(collapse).toContain("filtered"); expect(collapse).toContain("unhandled"); }); @@ -1670,7 +1671,7 @@ describe("issue list: collapse parameter optimization", () => { period: parsePeriod("90d"), json: false, }); - const collapse = options.collapse as string[]; + const collapse = options["collapse"] as string[]; expect(collapse).not.toContain("lifetime"); }); @@ -1681,7 +1682,7 @@ describe("issue list: collapse parameter optimization", () => { period: parsePeriod("90d"), json: true, }); - const collapse = options.collapse as string[]; + const collapse = options["collapse"] as string[]; expect(collapse).not.toContain("lifetime"); }); @@ -1693,7 +1694,7 @@ describe("issue list: collapse parameter optimization", () => { json: true, fields: ["shortId", "title", "count"], }); - const collapse = options.collapse as string[]; + const collapse = options["collapse"] as string[]; expect(collapse).not.toContain("lifetime"); }); @@ -1705,7 +1706,7 @@ describe("issue list: collapse parameter optimization", () => { json: true, fields: ["shortId", "title"], }); - const collapse = options.collapse as string[]; + const collapse = options["collapse"] as string[]; expect(collapse).toContain("lifetime"); }); @@ -1723,9 +1724,9 @@ describe("issue list: collapse parameter optimization", () => { period: parsePeriod("90d"), json: false, }); - const collapse = options.collapse as string[]; + const collapse = options["collapse"] as string[]; expect(collapse).not.toContain("stats"); - expect(options.groupStatsPeriod).toBe("auto"); + expect(options["groupStatsPeriod"]).toBe("auto"); } finally { Object.defineProperty(process.stdout, "columns", { value: savedColumns, @@ -1741,9 +1742,9 @@ describe("issue list: collapse parameter optimization", () => { period: parsePeriod("90d"), json: true, }); - const collapse = options.collapse as string[]; + const collapse = options["collapse"] as string[]; expect(collapse).not.toContain("stats"); - expect(options.groupStatsPeriod).toBe("auto"); + expect(options["groupStatsPeriod"]).toBe("auto"); }); test("collapses stats in JSON mode when --fields omits seen-stats fields", async () => { @@ -1754,7 +1755,7 @@ describe("issue list: collapse parameter optimization", () => { json: true, fields: ["shortId", "title"], }); - const collapse = options.collapse as string[]; + const collapse = options["collapse"] as string[]; expect(collapse).toContain("stats"); }); @@ -1766,7 +1767,7 @@ describe("issue list: collapse parameter optimization", () => { json: true, fields: ["shortId", "title"], }); - expect(options.groupStatsPeriod).toBeUndefined(); + expect(options["groupStatsPeriod"]).toBeUndefined(); }); }); @@ -1793,7 +1794,7 @@ describe("issue list: multi-target cursor-safe budget", () => { return mockIssue({ id: `${org}-${index}`, shortId: `${org.toUpperCase()}-${index}`, - project: { slug: "myproj" }, + project: issueProject("myproj"), }); } @@ -1880,7 +1881,7 @@ describe("issue list: multi-target cursor-safe budget", () => { mockIssue({ id, shortId: id.toUpperCase(), - project: { slug: "myproj" }, + project: issueProject("myproj"), count: String(count), userCount: count, filtered: { @@ -1939,6 +1940,7 @@ const { } = __testing; import type { SentryIssue } from "../../../src/types/index.js"; +import type { Writer } from "../../../src/types/index.js"; function makeIssue(overrides: Partial = {}): SentryIssue { return { @@ -2015,40 +2017,40 @@ describe("defaultIssueSort", () => { let savedHost: string | undefined; beforeEach(() => { - savedUrl = process.env.SENTRY_URL; - savedHost = process.env.SENTRY_HOST; + savedUrl = process.env["SENTRY_URL"]; + savedHost = process.env["SENTRY_HOST"]; }); afterEach(() => { if (savedUrl === undefined) { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; } else { - process.env.SENTRY_URL = savedUrl; + process.env["SENTRY_URL"] = savedUrl; } if (savedHost === undefined) { - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_HOST"]; } else { - process.env.SENTRY_HOST = savedHost; + process.env["SENTRY_HOST"] = savedHost; } }); test("defaults to recommended on Sentry SaaS", () => { - delete process.env.SENTRY_URL; - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_URL"]; + delete process.env["SENTRY_HOST"]; expect(defaultIssueSort()).toBe("recommended"); }); test("defaults to recommended for an explicit sentry.io URL", () => { // Clear SENTRY_HOST too: getConfiguredSentryUrl prefers SENTRY_HOST, so an // ambient value would mask SENTRY_URL and make this test non-hermetic. - delete process.env.SENTRY_HOST; - process.env.SENTRY_URL = DEFAULT_SENTRY_URL; + delete process.env["SENTRY_HOST"]; + process.env["SENTRY_URL"] = DEFAULT_SENTRY_URL; expect(defaultIssueSort()).toBe("recommended"); }); test("defaults to date on a self-hosted instance", () => { - process.env.SENTRY_URL = "https://sentry.example.com"; - delete process.env.SENTRY_HOST; + process.env["SENTRY_URL"] = "https://sentry.example.com"; + delete process.env["SENTRY_HOST"]; expect(defaultIssueSort()).toBe("date"); }); }); @@ -2073,7 +2075,6 @@ describe("parseSort", () => { describe("build400Detail", () => { const flags = { - query: undefined, period: parsePeriod("90d"), sort: "recommended" as const, }; @@ -2108,14 +2109,14 @@ describe("appendIssueFlags", () => { let savedUrl: string | undefined; beforeEach(() => { - savedUrl = process.env.SENTRY_URL; + savedUrl = process.env["SENTRY_URL"]; }); afterEach(() => { if (savedUrl === undefined) { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; } else { - process.env.SENTRY_URL = savedUrl; + process.env["SENTRY_URL"] = savedUrl; } }); @@ -2137,7 +2138,7 @@ describe("appendIssueFlags", () => { }); test("on SaaS, recommended (the default) is omitted but date is shown", () => { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; expect( appendIssueFlags("sentry issue list org/", { ...baseFlags, @@ -2153,7 +2154,7 @@ describe("appendIssueFlags", () => { }); test("on self-hosted, date (the default) is omitted but recommended is shown", () => { - process.env.SENTRY_URL = "https://sentry.example.com"; + process.env["SENTRY_URL"] = "https://sentry.example.com"; expect( appendIssueFlags("sentry issue list org/", { ...baseFlags, @@ -2209,8 +2210,16 @@ describe("issue list: comma-separated project slugs", () => { test("looks up each slug and selects all IDs in one SDK request", async () => { listIssuesAllPagesMock.mockResolvedValue({ issues: [ - mockIssue({ id: "web", shortId: "WEB-1", project: { slug: "web" } }), - mockIssue({ id: "api", shortId: "API-1", project: { slug: "api" } }), + mockIssue({ + id: "web", + shortId: "WEB-1", + project: issueProject("web"), + }), + mockIssue({ + id: "api", + shortId: "API-1", + project: issueProject("api"), + }), ], nextCursor: undefined, }); @@ -2233,8 +2242,8 @@ describe("issue list: comma-separated project slugs", () => { test("registers aliases that resolve from any directory", async () => { listIssuesAllPagesMock.mockResolvedValue({ issues: [ - mockIssue({ id: "1", shortId: "WEB-1", project: { slug: "web" } }), - mockIssue({ id: "2", shortId: "API-1", project: { slug: "api" } }), + mockIssue({ id: "1", shortId: "WEB-1", project: issueProject("web") }), + mockIssue({ id: "2", shortId: "API-1", project: issueProject("api") }), ], nextCursor: undefined, }); @@ -2261,7 +2270,6 @@ describe("issue list: comma-separated project slugs", () => { setProjectAliases({ stale: { orgSlug: "old-org", projectSlug: "old" } }); listIssuesAllPagesMock.mockResolvedValue({ issues: [], - nextCursor: undefined, }); const { context, stdout } = createContext(); @@ -2278,7 +2286,7 @@ describe("issue list: comma-separated project slugs", () => { test("resumes the cursor when the slugs are retyped in another order", async () => { listIssuesAllPagesMock.mockResolvedValue({ issues: [ - mockIssue({ id: "1", shortId: "WEB-1", project: { slug: "web" } }), + mockIssue({ id: "1", shortId: "WEB-1", project: issueProject("web") }), ], nextCursor: "1735689600:0:1", }); @@ -2336,7 +2344,7 @@ describe("issue list: comma-separated project slugs", () => { if (slug === "api") { throw new ApiError("Forbidden", 403); } - return catalog[0]; + return at(catalog, 0); }); const error = await func diff --git a/packages/cli/test/commands/issue/merge.func.test.ts b/packages/cli/test/commands/issue/merge.func.test.ts index c39f665279..afb7eb8f95 100644 --- a/packages/cli/test/commands/issue/merge.func.test.ts +++ b/packages/cli/test/commands/issue/merge.func.test.ts @@ -6,7 +6,15 @@ */ import { ArgumentParseError } from "@stricli/core"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { mergeCommand } from "../../../src/commands/issue/merge.js"; vi.mock("../../../src/commands/issue/utils.js", async (importOriginal) => { @@ -14,12 +22,8 @@ vi.mock("../../../src/commands/issue/utils.js", async (importOriginal) => { await importOriginal< typeof import("../../../src/commands/issue/utils.js") >(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -28,12 +32,8 @@ import * as issueUtils from "../../../src/commands/issue/utils.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -45,6 +45,8 @@ import { } from "../../../src/lib/errors.js"; import type { IssueArgument } from "../../../src/lib/issue-arguments.js"; import type { SentryIssue } from "../../../src/types/sentry.js"; +import { loadCommand, rejection } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; function makeMockIssue(overrides?: Partial): SentryIssue { return { @@ -79,11 +81,11 @@ function byText( } function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, stdoutWrite, @@ -91,8 +93,8 @@ function createMockContext() { } describe("mergeCommand.func()", () => { - let resolveIssueSpy: ReturnType; - let mergeSpy: ReturnType; + let resolveIssueSpy: MockInstance<(typeof issueUtils)["resolveIssue"]>; + let mergeSpy: MockInstance<(typeof apiClient)["mergeIssues"]>; beforeEach(() => { resolveIssueSpy = vi.spyOn(issueUtils, "resolveIssue"); @@ -106,10 +108,8 @@ describe("mergeCommand.func()", () => { test("rejects when fewer than 2 issues are provided (0 positionals, no --into)", async () => { const { context } = createMockContext(); - const func = await mergeCommand.loader(); - const err = await func - .call(context, { json: false }) - .catch((e: Error) => e); + const func = await loadCommand(mergeCommand); + const err = await rejection(func.call(context, { json: false })); expect(err).toBeInstanceOf(Error); expect(err.message).toContain("needs at least 2 issue IDs"); @@ -118,10 +118,8 @@ describe("mergeCommand.func()", () => { test("rejects when 1 positional is given without --into (shows --into hint)", async () => { const { context } = createMockContext(); - const func = await mergeCommand.loader(); - const err = await func - .call(context, { json: false }, "CLI-A") - .catch((e: Error) => e); + const func = await loadCommand(mergeCommand); + const err = await rejection(func.call(context, { json: false }, "CLI-A")); expect(err).toBeInstanceOf(Error); expect(err.message).toContain("needs at least 2 issue IDs"); @@ -131,10 +129,10 @@ describe("mergeCommand.func()", () => { test("a malformed issue fails to parse, before any issue is resolved", async () => { const { context } = createMockContext(); - const func = await mergeCommand.loader(); - const err = await func - .call(context, { json: false }, "CLI-A", "my-org/") - .catch((e: Error) => e); + const func = await loadCommand(mergeCommand); + const err = await rejection( + func.call(context, { json: false }, "CLI-A", "my-org/"), + ); expect(err).toBeInstanceOf(ArgumentParseError); expect(resolveIssueSpy).not.toHaveBeenCalled(); @@ -156,7 +154,7 @@ describe("mergeCommand.func()", () => { mergeSpy.mockResolvedValue({ parent: "10A", children: ["10B"] }); const { context } = createMockContext(); - const func = await mergeCommand.loader(); + const func = await loadCommand(mergeCommand); await func.call(context, { json: true }, "CLI-A\nCLI-B"); expect(mergeSpy).toHaveBeenCalledWith("my-org", ["10A", "10B"]); @@ -164,10 +162,10 @@ describe("mergeCommand.func()", () => { test("rejects when 0 positionals + --into (still needs at least 1 positional)", async () => { const { context } = createMockContext(); - const func = await mergeCommand.loader(); - const err = await func - .call(context, { json: false, into: "CLI-B" }) - .catch((e: Error) => e); + const func = await loadCommand(mergeCommand); + const err = await rejection( + func.call(context, { json: false, into: "CLI-B" }), + ); expect(err).toBeInstanceOf(Error); expect(err.message).toContain("needs at least 2 issue IDs"); @@ -190,7 +188,7 @@ describe("mergeCommand.func()", () => { mergeSpy.mockResolvedValue({ parent: "10B", children: ["10A"] }); const { context } = createMockContext(); - const func = await mergeCommand.loader(); + const func = await loadCommand(mergeCommand); // The user's actual pattern that triggered CLI-1AE: // sentry issue merge CLI-A --into CLI-B await func.call(context, { json: false, into: "CLI-B" }, "CLI-A"); @@ -213,10 +211,10 @@ describe("mergeCommand.func()", () => { ); const { context } = createMockContext(); - const func = await mergeCommand.loader(); - const err = await func - .call(context, { json: false, into: "CLI-A" }, "CLI-A") - .catch((e: Error) => e); + const func = await loadCommand(mergeCommand); + const err = await rejection( + func.call(context, { json: false, into: "CLI-A" }, "CLI-A"), + ); expect(err.message).toContain("at least 2 distinct issues"); expect(mergeSpy).not.toHaveBeenCalled(); @@ -233,10 +231,10 @@ describe("mergeCommand.func()", () => { ); const { context } = createMockContext(); - const func = await mergeCommand.loader(); - const err = await func - .call(context, { json: false }, "CLI-A", "CLI-B") - .catch((e: Error) => e); + const func = await loadCommand(mergeCommand); + const err = await rejection( + func.call(context, { json: false }, "CLI-A", "CLI-B"), + ); expect(err.message).toContain("Cannot merge issues across organizations"); expect(mergeSpy).not.toHaveBeenCalled(); @@ -257,7 +255,7 @@ describe("mergeCommand.func()", () => { mergeSpy.mockResolvedValue({ parent: "10A", children: ["10B", "10C"] }); const { context } = createMockContext(); - const func = await mergeCommand.loader(); + const func = await loadCommand(mergeCommand); await func.call(context, { json: false }, "CLI-A", "CLI-B", "CLI-C"); expect(mergeSpy).toHaveBeenCalledWith("test-org", ["10A", "10B", "10C"]); @@ -278,7 +276,7 @@ describe("mergeCommand.func()", () => { mergeSpy.mockResolvedValue({ parent: "10B", children: ["10A", "10C"] }); const { context } = createMockContext(); - const func = await mergeCommand.loader(); + const func = await loadCommand(mergeCommand); // Pass A, B, C but pin B as parent — ordered list sent to API starts with B await func.call( context, @@ -325,7 +323,7 @@ describe("mergeCommand.func()", () => { mergeSpy.mockResolvedValue({ parent: "10B", children: ["10A"] }); const { context } = createMockContext(); - const func = await mergeCommand.loader(); + const func = await loadCommand(mergeCommand); await func.call(context, { json: false, into: "f-g" }, "CLI-A", "CLI-B"); const callArgs = mergeSpy.mock.calls[0] as [string, string[]]; @@ -351,7 +349,7 @@ describe("mergeCommand.func()", () => { mergeSpy.mockResolvedValue({ parent: "10B", children: ["10A", "10C"] }); const { context } = createMockContext(); - const func = await mergeCommand.loader(); + const func = await loadCommand(mergeCommand); // User passes org-qualified form to --into; should still match. await func.call( context, @@ -383,7 +381,7 @@ describe("mergeCommand.func()", () => { mergeSpy.mockResolvedValue({ parent: "10C", children: ["10A", "10B"] }); const { context } = createMockContext(); - const func = await mergeCommand.loader(); + const func = await loadCommand(mergeCommand); await func.call(context, { json: false, into: "CLI-C" }, "CLI-A", "CLI-B"); expect(mergeSpy).toHaveBeenCalledTimes(1); @@ -409,7 +407,7 @@ describe("mergeCommand.func()", () => { mergeSpy.mockResolvedValue({ parent: "10A", children: ["10B"] }); const { context, stdoutWrite } = createMockContext(); - const func = await mergeCommand.loader(); + const func = await loadCommand(mergeCommand); await func.call(context, { json: true }, "CLI-A", "CLI-B"); const output = stdoutWrite.mock.calls.map((c) => String(c[0])).join(""); @@ -447,7 +445,7 @@ describe("mergeCommand.func()", () => { const stderrSpy = vi.spyOn(process.stderr, "write"); try { const { context } = createMockContext(); - const func = await mergeCommand.loader(); + const func = await loadCommand(mergeCommand); await func.call( context, { json: false, into: "CLI-B" }, @@ -481,7 +479,7 @@ describe("mergeCommand.func()", () => { const stderrSpy = vi.spyOn(process.stderr, "write"); try { const { context } = createMockContext(); - const func = await mergeCommand.loader(); + const func = await loadCommand(mergeCommand); await func.call( context, { json: false, into: "CLI-B" }, @@ -508,10 +506,10 @@ describe("mergeCommand.func()", () => { ); const { context } = createMockContext(); - const func = await mergeCommand.loader(); - const err = await func - .call(context, { json: false }, "CLI-A", "100") - .catch((e: Error) => e); + const func = await loadCommand(mergeCommand); + const err = await rejection( + func.call(context, { json: false }, "CLI-A", "100"), + ); expect(err.message).toContain("at least 2 distinct issues"); expect(err.message).toContain("CLI-A"); @@ -543,10 +541,10 @@ describe("mergeCommand.func()", () => { ); const { context } = createMockContext(); - const func = await mergeCommand.loader(); - const err = await func - .call(context, { json: false, into: "CLI-XYZ" }, "CLI-A", "CLI-B") - .catch((e: Error) => e); + const func = await loadCommand(mergeCommand); + const err = await rejection( + func.call(context, { json: false, into: "CLI-XYZ" }, "CLI-A", "CLI-B"), + ); // AuthError bubbles up (not masked as a not-found error) expect(err).toBeInstanceOf(AuthError); @@ -572,10 +570,10 @@ describe("mergeCommand.func()", () => { ); const { context } = createMockContext(); - const func = await mergeCommand.loader(); - const err = await func - .call(context, { json: false, into: "CLI-XYZ" }, "CLI-A", "CLI-B") - .catch((e: Error) => e); + const func = await loadCommand(mergeCommand); + const err = await rejection( + func.call(context, { json: false, into: "CLI-XYZ" }, "CLI-A", "CLI-B"), + ); expect(err).toBeInstanceOf(ApiError); expect((err as ApiError).status).toBe(500); @@ -607,10 +605,10 @@ describe("mergeCommand.func()", () => { ); const { context } = createMockContext(); - const func = await mergeCommand.loader(); - const err = await func - .call(context, { json: false, into: "XYZ" }, "CLI-A", "CLI-B") - .catch((e: Error) => e); + const func = await loadCommand(mergeCommand); + const err = await rejection( + func.call(context, { json: false, into: "XYZ" }, "CLI-A", "CLI-B"), + ); expect(err).toBeInstanceOf(ResolutionError); expect(err.message).toContain("Issue 'XYZ'"); @@ -636,7 +634,7 @@ describe("mergeCommand.func()", () => { mergeSpy.mockResolvedValue({ parent: "10B", children: ["10A"] }); const { context } = createMockContext(); - const func = await mergeCommand.loader(); + const func = await loadCommand(mergeCommand); await func.call(context, { json: false, into: "cli-b" }, "CLI-A", "CLI-B"); expect(mergeSpy).toHaveBeenCalledTimes(1); diff --git a/packages/cli/test/commands/issue/plan.func.test.ts b/packages/cli/test/commands/issue/plan.func.test.ts index 1d09ca49f0..1045829b6a 100644 --- a/packages/cli/test/commands/issue/plan.func.test.ts +++ b/packages/cli/test/commands/issue/plan.func.test.ts @@ -10,12 +10,8 @@ vi.mock("../../../src/commands/issue/utils.js", async (importOriginal) => { await importOriginal< typeof import("../../../src/commands/issue/utils.js") >(); - return Object.fromEntries( - Object.entries(actual).map(([key, value]) => [ - key, - typeof value === "function" ? vi.fn(value) : value, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); import { isatty } from "node:tty"; @@ -27,6 +23,8 @@ import { ApiError, CliError } from "../../../src/lib/errors.js"; import { logger } from "../../../src/lib/logger.js"; import { prompt } from "../../../src/lib/prompt.js"; import type { AutofixState, RootCause } from "../../../src/types/seer.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; vi.mock("node:tty", () => ({ isatty: vi.fn() })); vi.mock("../../../src/lib/prompt.js", () => ({ prompt: vi.fn() })); @@ -59,14 +57,14 @@ function waitingState(causes: RootCause[]): AutofixState { function createMockContext() { return { - stdout: { write: vi.fn(() => true) }, - stderr: { write: vi.fn(() => true) }, + stdout: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }; } async function runPlan(context: ReturnType) { - const func = await planCommand.loader(); + const func = await loadCommand(planCommand); await func.call(context, PLAN_FLAGS, "IOS-1"); } diff --git a/packages/cli/test/commands/issue/resolve-commit-spec.test.ts b/packages/cli/test/commands/issue/resolve-commit-spec.test.ts index 9e4f713720..de1050af8d 100644 --- a/packages/cli/test/commands/issue/resolve-commit-spec.test.ts +++ b/packages/cli/test/commands/issue/resolve-commit-spec.test.ts @@ -13,6 +13,7 @@ import { ValidationError } from "../../../src/lib/errors.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as gitLib from "../../../src/lib/git.js"; import type { SentryRepository } from "../../../src/types/sentry.js"; +import { rejection } from "../../helpers.js"; function makeRepo(overrides: Partial): SentryRepository { return { @@ -173,11 +174,13 @@ describe("resolveCommitSpec — error messages are actionable", () => { makeRepo({ name: "getsentry/sentry" }), ]); try { - const err = await resolveCommitSpec( - { kind: "explicit", repository: "typo/repo", commit: "abc" }, - "sentry", - "/tmp", - ).catch((e: Error) => e); + const err = await rejection( + resolveCommitSpec( + { kind: "explicit", repository: "typo/repo", commit: "abc" }, + "sentry", + "/tmp", + ), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("getsentry/cli"); expect(err.message).toContain("getsentry/sentry"); diff --git a/packages/cli/test/commands/issue/resolve.func.test.ts b/packages/cli/test/commands/issue/resolve.func.test.ts index 831497fab0..e305c43510 100644 --- a/packages/cli/test/commands/issue/resolve.func.test.ts +++ b/packages/cli/test/commands/issue/resolve.func.test.ts @@ -4,7 +4,15 @@ * Tests for `sentry issue resolve` and `sentry issue unresolve` func() bodies. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { resolveCommand } from "../../../src/commands/issue/resolve.js"; vi.mock( @@ -14,12 +22,8 @@ vi.mock( await importOriginal< typeof import("../../../src/commands/issue/resolve-commit-spec.js") >(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }, ); @@ -32,12 +36,8 @@ vi.mock("../../../src/commands/issue/utils.js", async (importOriginal) => { await importOriginal< typeof import("../../../src/commands/issue/utils.js") >(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -46,17 +46,15 @@ import * as issueUtils from "../../../src/commands/issue/utils.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as apiClient from "../../../src/lib/api-client.js"; import type { SentryIssue } from "../../../src/types/sentry.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; function makeMockIssue(overrides?: Partial): SentryIssue { return { @@ -77,11 +75,11 @@ function makeMockIssue(overrides?: Partial): SentryIssue { } function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, stdoutWrite, @@ -89,8 +87,8 @@ function createMockContext() { } describe("resolveCommand.func()", () => { - let resolveIssueSpy: ReturnType; - let updateSpy: ReturnType; + let resolveIssueSpy: MockInstance<(typeof issueUtils)["resolveIssue"]>; + let updateSpy: MockInstance<(typeof apiClient)["updateIssueStatus"]>; beforeEach(() => { resolveIssueSpy = vi.spyOn(issueUtils, "resolveIssue"); @@ -110,7 +108,7 @@ describe("resolveCommand.func()", () => { updateSpy.mockResolvedValue(makeMockIssue({ status: "resolved" })); const { context } = createMockContext(); - const func = await resolveCommand.loader(); + const func = await loadCommand(resolveCommand); await func.call(context, { json: false }, "CLI-G5"); expect(updateSpy).toHaveBeenCalledWith("123456789", "resolved", { @@ -127,7 +125,7 @@ describe("resolveCommand.func()", () => { updateSpy.mockResolvedValue(makeMockIssue()); const { context } = createMockContext(); - const func = await resolveCommand.loader(); + const func = await loadCommand(resolveCommand); await func.call(context, { json: false, in: "0.26.1" }, "CLI-G5"); expect(updateSpy).toHaveBeenCalledWith("123456789", "resolved", { @@ -144,7 +142,7 @@ describe("resolveCommand.func()", () => { updateSpy.mockResolvedValue(makeMockIssue()); const { context } = createMockContext(); - const func = await resolveCommand.loader(); + const func = await loadCommand(resolveCommand); await func.call(context, { json: false, in: "@next" }, "CLI-G5"); expect(updateSpy).toHaveBeenCalledWith("123456789", "resolved", { @@ -168,7 +166,7 @@ describe("resolveCommand.func()", () => { try { const { context } = createMockContext(); - const func = await resolveCommand.loader(); + const func = await loadCommand(resolveCommand); await func.call(context, { json: false, in: "@commit" }, "CLI-G5"); expect(commitSpy).toHaveBeenCalledWith( @@ -202,7 +200,7 @@ describe("resolveCommand.func()", () => { try { const { context } = createMockContext(); - const func = await resolveCommand.loader(); + const func = await loadCommand(resolveCommand); await func.call( context, { json: false, in: "@commit:getsentry/cli@abc123" }, @@ -233,14 +231,14 @@ describe("resolveCommand.func()", () => { updateSpy.mockResolvedValue(makeMockIssue()); const { context, stdoutWrite } = createMockContext(); - const func = await resolveCommand.loader(); + const func = await loadCommand(resolveCommand); await func.call(context, { json: true, in: "0.26.1" }, "CLI-G5"); const output = stdoutWrite.mock.calls.map((c) => String(c[0])).join(""); const parsed = JSON.parse(output) as Record; - expect(parsed.resolved_in).toEqual({ inRelease: "0.26.1" }); - expect(parsed.status).toBe("resolved"); - expect(parsed.shortId).toBe("CLI-G5"); + expect(parsed["resolved_in"]).toEqual({ inRelease: "0.26.1" }); + expect(parsed["status"]).toBe("resolved"); + expect(parsed["shortId"]).toBe("CLI-G5"); }); test("JSON output omits resolved_in when immediate", async () => { @@ -251,19 +249,19 @@ describe("resolveCommand.func()", () => { updateSpy.mockResolvedValue(makeMockIssue()); const { context, stdoutWrite } = createMockContext(); - const func = await resolveCommand.loader(); + const func = await loadCommand(resolveCommand); await func.call(context, { json: true }, "CLI-G5"); const output = stdoutWrite.mock.calls.map((c) => String(c[0])).join(""); const parsed = JSON.parse(output) as Record; - expect(parsed.resolved_in).toBeUndefined(); - expect(parsed.status).toBe("resolved"); + expect(parsed["resolved_in"]).toBeUndefined(); + expect(parsed["status"]).toBe("resolved"); }); }); describe("unresolveCommand.func()", () => { - let resolveIssueSpy: ReturnType; - let updateSpy: ReturnType; + let resolveIssueSpy: MockInstance<(typeof issueUtils)["resolveIssue"]>; + let updateSpy: MockInstance<(typeof apiClient)["updateIssueStatus"]>; beforeEach(() => { resolveIssueSpy = vi.spyOn(issueUtils, "resolveIssue"); @@ -283,7 +281,7 @@ describe("unresolveCommand.func()", () => { updateSpy.mockResolvedValue(makeMockIssue({ status: "unresolved" })); const { context } = createMockContext(); - const func = await unresolveCommand.loader(); + const func = await loadCommand(unresolveCommand); await func.call(context, { json: false }, "CLI-G5"); expect(updateSpy).toHaveBeenCalledWith("123456789", "unresolved", { diff --git a/packages/cli/test/commands/issue/short-id-resolution.test.ts b/packages/cli/test/commands/issue/short-id-resolution.test.ts index 15f88bbd45..926e95efb5 100644 --- a/packages/cli/test/commands/issue/short-id-resolution.test.ts +++ b/packages/cli/test/commands/issue/short-id-resolution.test.ts @@ -129,7 +129,7 @@ describe("short IDs with configured organization context", () => { `[defaults]\norg = ${targetOrg.slug}\n`, ); if (envOrg) { - process.env.SENTRY_ORG = envOrg; + process.env["SENTRY_ORG"] = envOrg; } for (const org of [cachedOrg, targetOrg, secondOrg]) { addIssue(org.slug); diff --git a/packages/cli/test/commands/issue/tags.test.ts b/packages/cli/test/commands/issue/tags.test.ts index 3c8b0ba957..be7d6a7c58 100644 --- a/packages/cli/test/commands/issue/tags.test.ts +++ b/packages/cli/test/commands/issue/tags.test.ts @@ -14,7 +14,14 @@ import type { SentryContext } from "../../../src/context.js"; import { setAuthToken } from "../../../src/lib/db/auth.js"; import { setOrgRegion } from "../../../src/lib/db/regions.js"; import { ApiError } from "../../../src/lib/errors.js"; -import { mockFetch, useEnvSandbox, useTestConfigDir } from "../../helpers.js"; +import { + mockFetch, + useEnvSandbox, + useTestConfigDir, + loadCommand, + at, + must, +} from "../../helpers.js"; const getConfigDir = useTestConfigDir("issue-tags-", { isolateProjectRoot: true, @@ -205,12 +212,12 @@ describe("sentry issue tags", () => { }); test("removes terminal controls from human output while preserving JSON values", async () => { - process.env.SENTRY_PLAIN_OUTPUT = "0"; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; const value = "\u001b]52;c;dGVzdA==\u0007\u001b[2J1.2.3\u0008\u202e"; tagResponse = { ...TAG, key: "\u001b[2Jrelease\u202e", - topValues: [{ ...TAG.topValues![0], value }], + topValues: [{ ...at(must(TAG.topValues), 0), value }], }; const args = ["issue", "tags", "test-org/12345", "release"]; const human = await runCli(args); @@ -246,7 +253,7 @@ describe("sentry issue tags", () => { test("propagates API failures instead of returning an empty distribution", async () => { tagStatus = 403; const { context, stdout } = captureContext(); - const func = await tagsCommand.loader(); + const func = await loadCommand(tagsCommand); await expect( func.call( diff --git a/packages/cli/test/commands/issue/unlink.func.test.ts b/packages/cli/test/commands/issue/unlink.func.test.ts index b0e488aef6..0750c1211e 100644 --- a/packages/cli/test/commands/issue/unlink.func.test.ts +++ b/packages/cli/test/commands/issue/unlink.func.test.ts @@ -8,6 +8,7 @@ import { unlinkExternalIssue, } from "../../../src/lib/issue-links.js"; import { confirmByTyping } from "../../../src/lib/mutate-command.js"; +import { loadCommand, at } from "../../helpers.js"; const { mockIsatty } = vi.hoisted(() => ({ mockIsatty: vi.fn(() => false) })); @@ -97,7 +98,7 @@ describe("issue unlink", () => { "forwards resolved issue context and selector $selector", async ({ selector, expected }) => { const { context, output } = createMockContext(); - const func = await unlinkCommand.loader(); + const func = await loadCommand(unlinkCommand); await func.call( context, { ...defaultFlags, ...selector, yes: true }, @@ -133,7 +134,7 @@ describe("issue unlink", () => { test("refuses non-interactive mutation without explicit confirmation before resolving", async () => { const { context, output } = createMockContext(); - const func = await unlinkCommand.loader(); + const func = await loadCommand(unlinkCommand); await expect( func.call(context, defaultFlags, "APP-42", externalUrl), @@ -149,7 +150,7 @@ describe("issue unlink", () => { "allows non-interactive --%s without prompting", async (flag) => { const { context } = createMockContext(); - const func = await unlinkCommand.loader(); + const func = await loadCommand(unlinkCommand); await func.call( context, { ...defaultFlags, [flag]: true }, @@ -172,7 +173,7 @@ describe("issue unlink", () => { test("confirms the selected issue and external URL before unlinking interactively", async () => { mockIsatty.mockReturnValue(true); const { context } = createMockContext(); - const func = await unlinkCommand.loader(); + const func = await loadCommand(unlinkCommand); await func.call(context, defaultFlags, "test-org/APP-42", externalUrl); expect(confirmByTyping).toHaveBeenCalledExactlyOnceWith( @@ -181,7 +182,7 @@ describe("issue unlink", () => { ); expect(unlinkExternalIssue).toHaveBeenCalledOnce(); expect(vi.mocked(confirmByTyping).mock.invocationCallOrder[0]).toBeLessThan( - vi.mocked(unlinkExternalIssue).mock.invocationCallOrder[0], + at(vi.mocked(unlinkExternalIssue).mock.invocationCallOrder, 0), ); }); @@ -189,7 +190,7 @@ describe("issue unlink", () => { mockIsatty.mockReturnValue(true); vi.mocked(confirmByTyping).mockResolvedValue(false); const { context, output } = createMockContext(); - const func = await unlinkCommand.loader(); + const func = await loadCommand(unlinkCommand); await func.call(context, defaultFlags, "APP-42", externalUrl); expect(confirmByTyping).toHaveBeenCalledOnce(); @@ -206,7 +207,7 @@ describe("issue unlink", () => { }; vi.mocked(unlinkExternalIssue).mockResolvedValue(result); const { context, output } = createMockContext(); - const func = await unlinkCommand.loader(); + const func = await loadCommand(unlinkCommand); await func.call( context, { ...defaultFlags, "dry-run": true, json: true }, diff --git a/packages/cli/test/commands/issue/utils.test.ts b/packages/cli/test/commands/issue/utils.test.ts index 5ca388fcb9..cce70a051a 100644 --- a/packages/cli/test/commands/issue/utils.test.ts +++ b/packages/cli/test/commands/issue/utils.test.ts @@ -14,6 +14,7 @@ import { resolveOrgAndIssueId, } from "../../../src/commands/issue/utils.js"; import { DEFAULT_SENTRY_URL } from "../../../src/lib/constants.js"; +import { parseIssueArgument } from "../../../src/lib/issue-arguments.js"; import { setAuthToken } from "../../../src/lib/db/auth.js"; import { setCachedProject } from "../../../src/lib/db/project-cache.js"; import { setOrgRegion } from "../../../src/lib/db/regions.js"; @@ -33,21 +34,22 @@ describe("mapIssueArgsConcurrently", () => { test("reports only partial failures", async () => { const failure = new Error("missing"); const onError = vi.fn(); + const missing = parseIssueArgument("missing"); const result = await mapIssueArgsConcurrently( - ["missing", "found"], + [missing, parseIssueArgument("found")], async (issueArg) => { - if (issueArg === "missing") { + if (issueArg.text === "missing") { throw failure; } - return issueArg; + return issueArg.text; }, onError, ); expect(result).toEqual(["found"]); expect(onError).toHaveBeenCalledOnce(); - expect(onError).toHaveBeenCalledWith("missing", failure); + expect(onError).toHaveBeenCalledWith(missing, failure); }); test("rethrows total failure without emitting warnings", async () => { @@ -57,9 +59,9 @@ describe("mapIssueArgsConcurrently", () => { await expect( mapIssueArgsConcurrently( - ["first", "second"], + [parseIssueArgument("first"), parseIssueArgument("second")], async (issueArg) => { - throw issueArg === "first" ? primary : secondary; + throw issueArg.text === "first" ? primary : secondary; }, onError, ), @@ -227,7 +229,6 @@ describe("resolveOrgAndIssueId", () => { test("finds a numeric ID by searching the user's orgs", async () => { const calls: string[] = []; - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); calls.push(req.url); @@ -257,7 +258,6 @@ describe("resolveOrgAndIssueId", () => { }); test("throws a not-found error when no org has the numeric ID", async () => { - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const { pathname } = new URL(new Request(input, init).url); if (pathname === "/api/0/organizations/") { @@ -278,7 +278,6 @@ describe("resolveOrgAndIssueId", () => { }); test("resolves explicit org prefix (org/ISSUE-ID)", async () => { - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -334,7 +333,6 @@ describe("resolveOrgAndIssueId", () => { "", ); - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -379,7 +377,6 @@ describe("resolveOrgAndIssueId", () => { }); test("resolves explicit org prefix with project-suffix (e.g., 'org1/dashboard-4y')", async () => { - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -430,7 +427,6 @@ describe("resolveOrgAndIssueId", () => { setDefaultOrganization("my-org"); setDefaultProject("my-project"); - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -493,7 +489,6 @@ describe("resolveOrgAndIssueId", () => { await import("../../../src/lib/db/project-aliases.js"); clearProjectAliases(); - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -574,7 +569,6 @@ describe("resolveOrgAndIssueId", () => { await import("../../../src/lib/db/project-aliases.js"); clearProjectAliases(); - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -643,7 +637,6 @@ describe("resolveOrgAndIssueId", () => { setOrgRegion("org2", DEFAULT_SENTRY_URL); - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -719,7 +712,6 @@ describe("resolveOrgAndIssueId", () => { setDefaultOrganization("my-org"); setDefaultProject("my-project"); - // @ts-expect-error - partial mock globalThis.fetch = async () => new Response(JSON.stringify({ detail: "Unauthorized" }), { status: 401, @@ -741,7 +733,6 @@ describe("resolveOrgAndIssueId", () => { setDefaultOrganization("my-org"); setDefaultProject("my-project"); - // @ts-expect-error - partial mock globalThis.fetch = async () => new Response(JSON.stringify({ detail: "Internal Server Error" }), { status: 500, @@ -787,7 +778,6 @@ describe("resolveOrgAndIssueId", () => { }, ); - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -837,7 +827,6 @@ describe("resolveOrgAndIssueId", () => { await import("../../../src/lib/db/project-aliases.js"); clearProjectAliases(); - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -885,7 +874,6 @@ describe("resolveOrgAndIssueId", () => { await import("../../../src/lib/db/project-aliases.js"); clearProjectAliases(); - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -937,7 +925,6 @@ describe("resolveOrgAndIssueId: issue-id → org cache (Pattern D)", () => { // Track which endpoint is hit — must be org-scoped, not legacy unscoped. const calls: string[] = []; - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); calls.push(req.url); @@ -986,7 +973,6 @@ describe("resolveOrgAndIssueId: issue-id → org cache (Pattern D)", () => { setOrgRegion("stale-org", DEFAULT_SENTRY_URL); const calls: string[] = []; - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); calls.push(req.url); @@ -1025,7 +1011,6 @@ describe("resolveOrgAndIssueId: issue-id → org cache (Pattern D)", () => { const { getCachedIssueOrg } = await import("../../../src/lib/db/issue-org-cache.js"); - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const { pathname } = new URL(new Request(input, init).url); if (pathname === "/api/0/organizations/") { @@ -1062,7 +1047,6 @@ describe("resolveOrgAndIssueId: issue-id → org cache (Pattern D)", () => { setOrgRegion("still-valid-org", DEFAULT_SENTRY_URL); let orgSearchStarted = false; - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -1103,7 +1087,6 @@ describe("pollAutofixState", () => { test("returns immediately when state is COMPLETED", async () => { let fetchCount = 0; - // @ts-expect-error - partial mock globalThis.fetch = async () => { fetchCount += 1; return new Response( @@ -1133,7 +1116,6 @@ describe("pollAutofixState", () => { }); test("returns immediately when state is ERROR", async () => { - // @ts-expect-error - partial mock globalThis.fetch = async () => new Response( JSON.stringify({ @@ -1160,7 +1142,6 @@ describe("pollAutofixState", () => { }); test("stops at WAITING_FOR_USER_RESPONSE when stopOnWaitingForUser is true", async () => { - // @ts-expect-error - partial mock globalThis.fetch = async () => new Response( JSON.stringify({ @@ -1190,7 +1171,6 @@ describe("pollAutofixState", () => { test("continues polling when PROCESSING", async () => { let fetchCount = 0; - // @ts-expect-error - partial mock globalThis.fetch = async () => { fetchCount += 1; @@ -1243,8 +1223,8 @@ describe("pollAutofixState", () => { let fetchCount = 0; // Force rich output so the spinner isn't suppressed in non-TTY test env - const origPlain = process.env.SENTRY_PLAIN_OUTPUT; - process.env.SENTRY_PLAIN_OUTPUT = "0"; + const origPlain = process.env["SENTRY_PLAIN_OUTPUT"]; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; // Spy on process.stdout.write to capture spinner output const origWrite = process.stdout.write.bind(process.stdout); @@ -1256,7 +1236,6 @@ describe("pollAutofixState", () => { try { // Return PROCESSING first to allow animation interval to fire, // then COMPLETED on second call - // @ts-expect-error - partial mock globalThis.fetch = async () => { fetchCount += 1; @@ -1315,15 +1294,14 @@ describe("pollAutofixState", () => { } finally { process.stdout.write = origWrite; if (origPlain === undefined) { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } else { - process.env.SENTRY_PLAIN_OUTPUT = origPlain; + process.env["SENTRY_PLAIN_OUTPUT"] = origPlain; } } }); test("throws timeout error when exceeding timeoutMs", async () => { - // @ts-expect-error - partial mock globalThis.fetch = async () => new Response( JSON.stringify({ @@ -1355,7 +1333,6 @@ describe("pollAutofixState", () => { test("continues polling when autofix is null", async () => { let fetchCount = 0; - // @ts-expect-error - partial mock globalThis.fetch = async () => { fetchCount += 1; @@ -1399,7 +1376,6 @@ describe("ensureRootCauseAnalysis", () => { test("returns immediately when state is COMPLETED", async () => { let fetchCount = 0; - // @ts-expect-error - partial mock globalThis.fetch = async () => { fetchCount += 1; return new Response( @@ -1431,7 +1407,6 @@ describe("ensureRootCauseAnalysis", () => { test("returns immediately when state is WAITING_FOR_USER_RESPONSE", async () => { let fetchCount = 0; - // @ts-expect-error - partial mock globalThis.fetch = async () => { fetchCount += 1; return new Response( @@ -1463,7 +1438,6 @@ describe("ensureRootCauseAnalysis", () => { test("triggers new analysis when no state exists", async () => { let triggerCalled = false; - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -1521,7 +1495,6 @@ describe("ensureRootCauseAnalysis", () => { test("retries when existing analysis has ERROR status", async () => { let triggerCalled = false; - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -1585,7 +1558,6 @@ describe("ensureRootCauseAnalysis", () => { }); test("throws out_of_credits when the run stopped for credits", async () => { - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const body = @@ -1617,7 +1589,6 @@ describe("ensureRootCauseAnalysis", () => { test("polls until complete when state is PROCESSING", async () => { let fetchCount = 0; - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); @@ -1675,7 +1646,6 @@ describe("ensureRootCauseAnalysis", () => { test("forces new analysis when force flag is true", async () => { let triggerCalled = false; - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -1729,8 +1699,8 @@ describe("ensureRootCauseAnalysis", () => { let triggerCalled = false; // Force rich output so the spinner isn't suppressed in non-TTY test env - const origPlain = process.env.SENTRY_PLAIN_OUTPUT; - process.env.SENTRY_PLAIN_OUTPUT = "0"; + const origPlain = process.env["SENTRY_PLAIN_OUTPUT"]; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; // Spy on process.stdout.write to capture spinner output const origWrite = process.stdout.write.bind(process.stdout); @@ -1740,7 +1710,6 @@ describe("ensureRootCauseAnalysis", () => { }; try { - // @ts-expect-error - partial mock globalThis.fetch = async ( input: RequestInfo | URL, init?: RequestInit, @@ -1794,9 +1763,9 @@ describe("ensureRootCauseAnalysis", () => { } finally { process.stdout.write = origWrite; if (origPlain === undefined) { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } else { - process.env.SENTRY_PLAIN_OUTPUT = origPlain; + process.env["SENTRY_PLAIN_OUTPUT"] = origPlain; } } }); @@ -1808,7 +1777,6 @@ describe("resolveOrgAndIssueId: magic @ selectors", () => { await import("../../../src/lib/db/defaults.js"); setDefaultOrganization("test-org"); - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -1858,7 +1826,6 @@ describe("resolveOrgAndIssueId: magic @ selectors", () => { await import("../../../src/lib/db/defaults.js"); setDefaultOrganization("test-org"); - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -1904,7 +1871,6 @@ describe("resolveOrgAndIssueId: magic @ selectors", () => { }); test("resolves org/@latest with explicit org prefix", async () => { - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -1953,7 +1919,6 @@ describe("resolveOrgAndIssueId: magic @ selectors", () => { await import("../../../src/lib/db/defaults.js"); setDefaultOrganization("test-org"); - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -2028,7 +1993,6 @@ describe("resolveIssue: numeric 404 error handling", () => { }); test("numeric 404 throws ResolutionError with ID and short-ID hint", async () => { - // @ts-expect-error - partial mock globalThis.fetch = async () => new Response(JSON.stringify({ detail: "Issue not found" }), { status: 404, @@ -2051,7 +2015,6 @@ describe("resolveIssue: numeric 404 error handling", () => { }); test("numeric non-404 error propagates unchanged", async () => { - // @ts-expect-error - partial mock globalThis.fetch = async () => new Response(JSON.stringify({ detail: "Internal Server Error" }), { status: 500, @@ -2068,7 +2031,6 @@ describe("resolveIssue: numeric 404 error handling", () => { }); test("explicit-org-numeric 404 throws ResolutionError with org and ID", async () => { - // @ts-expect-error - partial mock globalThis.fetch = async () => new Response(JSON.stringify({ detail: "Issue not found" }), { status: 404, @@ -2093,7 +2055,6 @@ describe("resolveIssue: numeric 404 error handling", () => { }); test("explicit-org-numeric non-404 error propagates unchanged", async () => { - // @ts-expect-error - partial mock globalThis.fetch = async () => new Response(JSON.stringify({ detail: "Unauthorized" }), { status: 401, @@ -2149,7 +2110,6 @@ describe("resolveIssue: project-search DSN shortcut", () => { const requests: string[] = []; - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -2371,7 +2331,7 @@ describe("resolveIssue with search text", () => { } function resolve(issueArg: string) { - process.env.SENTRY_ORG = "my-org"; + process.env["SENTRY_ORG"] = "my-org"; return resolveIssue({ issueArg, cwd: getConfigDir(), command: "view" }); } diff --git a/packages/cli/test/commands/issue/view.func.test.ts b/packages/cli/test/commands/issue/view.func.test.ts index 23811aae25..39cbd7055d 100644 --- a/packages/cli/test/commands/issue/view.func.test.ts +++ b/packages/cli/test/commands/issue/view.func.test.ts @@ -9,12 +9,8 @@ vi.mock("../../../src/commands/issue/utils.js", async (importOriginal) => { await importOriginal< typeof import("../../../src/commands/issue/utils.js") >(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -28,12 +24,8 @@ import { vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -42,12 +34,8 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/browser.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -56,12 +44,8 @@ import * as browser from "../../../src/lib/browser.js"; vi.mock("../../../src/lib/region.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -72,6 +56,8 @@ import { parseIssueArgument, } from "../../../src/lib/issue-arguments.js"; import type { SentryEvent, SentryIssue } from "../../../src/types/index.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; const REPLAY_ID = "346789a703f6454384f1de473b8b9fcc"; const SECOND_REPLAY_ID = "aaaaaaaa03f6454384f1de473b8b9fcc"; @@ -97,11 +83,11 @@ function sampleEvent(overrides: Partial = {}): SentryEvent { } function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, stdoutWrite, @@ -145,7 +131,7 @@ describe("issue view replay integration", () => { ]); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, VIEW_FLAGS, "CLI-123"); const output = stdoutWrite.mock.calls.map((call) => call[0]).join(""); @@ -164,7 +150,7 @@ describe("issue view replay integration", () => { listReplayIdsForIssueSpy.mockResolvedValue([REPLAY_ID, SECOND_REPLAY_ID]); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, web: false, force: false, spans: 0, fresh: false }, @@ -217,7 +203,7 @@ describe("issue view multiple IDs", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, VIEW_FLAGS, "IOS-1", "IOS-2"); expect(resolveIssueSpy).toHaveBeenCalledTimes(2); @@ -242,7 +228,7 @@ describe("issue view multiple IDs", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, VIEW_FLAGS, "IOS-1\nIOS-2\nIOS-3"); expect(resolveIssueSpy).toHaveBeenCalledTimes(3); @@ -263,7 +249,7 @@ describe("issue view multiple IDs", () => { }); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, VIEW_FLAGS, "IOS-1,IOS-2"); expect(resolveIssueSpy).toHaveBeenCalledTimes(1); @@ -288,7 +274,7 @@ describe("issue view multiple IDs", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, VIEW_FLAGS, "IOS-1", "MISSING"); const parsed = JSON.parse( @@ -304,7 +290,7 @@ describe("issue view multiple IDs", () => { resolveIssueSpy.mockRejectedValue(error); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect(func.call(context, VIEW_FLAGS, "IOS-1", "IOS-2")).rejects.toBe( error, ); @@ -312,7 +298,7 @@ describe("issue view multiple IDs", () => { test("fails to parse when no issue ID is provided", async () => { const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect(func.call(context, VIEW_FLAGS)).rejects.toMatchObject({ exception: expect.any(ContextError), }); @@ -331,7 +317,7 @@ describe("issue view multiple IDs", () => { ); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, web: true, force: false, spans: 0, fresh: false }, @@ -364,7 +350,7 @@ describe("issue view multiple IDs", () => { (_, index) => `IOS-${index + 1}`, ); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( createMockContext().context, { json: false, web: true, force: false, spans: 0, fresh: false }, diff --git a/packages/cli/test/commands/local/control-plane.test.ts b/packages/cli/test/commands/local/control-plane.test.ts index e169b06c09..0cc8451434 100644 --- a/packages/cli/test/commands/local/control-plane.test.ts +++ b/packages/cli/test/commands/local/control-plane.test.ts @@ -6,6 +6,7 @@ import { createLocalSessionStore, SESSION_RETENTION_MS, } from "../../../src/commands/local/session-store.js"; +import { at } from "../../helpers.js"; const CONTROL_TOKEN = "control-token"; @@ -89,7 +90,7 @@ describe("Local control plane", () => { try { const chunk = new TextDecoder().decode((await reader.read()).value); expect(chunk).toContain("event: sentry.local.directory"); - const data = JSON.parse(chunk.match(/data: (.+)/)![1]); + const data = JSON.parse(at(chunk.match(/data: (.+)/)!, 1)); expect(new URL(data.directoryUrl).pathname).toBe( "/_local/v1/ui/sessions", ); @@ -455,7 +456,7 @@ describe("Local control plane", () => { ["GET", "/envelopes/id"], ["POST", "/close"], ["POST", "/reset"], - ]) { + ] as const) { const response = await plane.app.request( `/_local/v1/sessions/My%20App${suffix}`, { method, headers: controlHeaders() }, diff --git a/packages/cli/test/commands/local/daemon-lifecycle.test.ts b/packages/cli/test/commands/local/daemon-lifecycle.test.ts index f979dc38ee..7bea5589a7 100644 --- a/packages/cli/test/commands/local/daemon-lifecycle.test.ts +++ b/packages/cli/test/commands/local/daemon-lifecycle.test.ts @@ -4,7 +4,7 @@ import { mkdir, readFile, rename, utimes, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { createServer } from "node:http"; import { afterEach, describe, expect, test, vi } from "vitest"; -import { useTestConfigDir } from "../../helpers.js"; +import { useTestConfigDir, originalFetch } from "../../helpers.js"; import { LOCAL_DAEMON_STATE_FILENAME, readLocalDaemonState, @@ -30,10 +30,7 @@ afterEach(() => { describe("Local daemon discovery", () => { test("rejects stale state when another service answers the public health endpoint", async () => { - vi.stubGlobal( - "fetch", - (globalThis as { __originalFetch: typeof fetch }).__originalFetch, - ); + vi.stubGlobal("fetch", originalFetch()); vi.spyOn(process, "kill").mockImplementation(() => { throw Object.assign(new Error("owner exited"), { code: "ESRCH" }); }); @@ -58,7 +55,7 @@ describe("Local daemon discovery", () => { await expect(getRunningLocalDaemon()).resolves.toBeUndefined(); } finally { await new Promise((resolve) => { - server.close(resolve); + server.close(() => resolve()); server.closeAllConnections(); }); } @@ -398,10 +395,7 @@ async function eventually( } test("mirrors its sessions to the completion snapshot and removes it on shutdown", async () => { - vi.stubGlobal( - "fetch", - (globalThis as { __originalFetch: typeof fetch }).__originalFetch, - ); + vi.stubGlobal("fetch", originalFetch()); const running = runLocalDaemonForeground({ host: "127.0.0.1", port: await freePort(), diff --git a/packages/cli/test/commands/local/daemon-startup.test.ts b/packages/cli/test/commands/local/daemon-startup.test.ts index 5673bd406a..92d82e79a3 100644 --- a/packages/cli/test/commands/local/daemon-startup.test.ts +++ b/packages/cli/test/commands/local/daemon-startup.test.ts @@ -10,7 +10,7 @@ import { createServer } from "node:http"; import { join } from "node:path"; import { setTimeout as sleep } from "node:timers/promises"; import { afterEach, expect, test, vi } from "vitest"; -import { useTestConfigDir } from "../../helpers.js"; +import { useTestConfigDir, originalFetch } from "../../helpers.js"; import { ensureLocalDaemon, runLocalDaemonForeground, @@ -36,10 +36,7 @@ afterEach(() => { test.each(["before startup", "after spawn"])( "joins live foreground ownership appearing %s without surfacing the losing child's exit", async (stage) => { - vi.stubGlobal( - "fetch", - (globalThis as { __originalFetch: typeof fetch }).__originalFetch, - ); + vi.stubGlobal("fetch", originalFetch()); const server = createServer((request, response) => { // Like a real daemon, the foreground owner identifies itself on /health. response.setHeader("X-Sentry-Local-Mode", "daemon"); diff --git a/packages/cli/test/commands/local/envelope.test.ts b/packages/cli/test/commands/local/envelope.test.ts index f8afcbc755..523d101d0e 100644 --- a/packages/cli/test/commands/local/envelope.test.ts +++ b/packages/cli/test/commands/local/envelope.test.ts @@ -32,7 +32,9 @@ describe("receiver envelope codec", () => { ], [{ type: "log" }, { items: [], type: "log" }], ]); - expect(parsed?.envelope[0].__spotlight_sender_user_agent).toBe("test-sdk"); + expect(parsed?.envelope[0]["__spotlight_sender_user_agent"]).toBe( + "test-sdk", + ); expect(container.getParsedEnvelope()).toBe(parsed); expect(container.getEventTypes()).toEqual(["attachment", "event", "log"]); }); diff --git a/packages/cli/test/commands/local/receiver-ingest.test.ts b/packages/cli/test/commands/local/receiver-ingest.test.ts index e0b6dce2ea..3de65bb393 100644 --- a/packages/cli/test/commands/local/receiver-ingest.test.ts +++ b/packages/cli/test/commands/local/receiver-ingest.test.ts @@ -10,6 +10,7 @@ import { drainReceiver, createReceiverEnvelope, } from "../../../src/commands/local/receiver-ingest.js"; +import { at } from "../../helpers.js"; const envelope = '{}\n{"type":"event"}\n{"message":"received"}'; @@ -22,7 +23,7 @@ test.each([1, 2])( ); expect( await ingestReceiverEnvelope(retention.buffer, { - body: Buffer.from(bodies[0]), + body: Buffer.from(at(bodies, 0)), }), ).toBe(204); const frames: { id?: string; data: string }[] = []; @@ -68,7 +69,7 @@ test("raw delivery IDs stay stable across streaming and filename lookup", () => ), }), ); - const container = buffer.read({ all: true })[0]; + const container = at(buffer.read({ all: true }), 0); const originalId = container .getParsedEnvelope()! .envelope[0].__spotlight_envelope_id.toString(); @@ -85,7 +86,7 @@ test("raw delivery IDs stay stable across streaming and filename lookup", () => .getParsedEnvelope()! .envelope[0].__spotlight_envelope_id.toString(), ).toBe(originalId); - expect(frames[0].id).toBe(originalId); + expect(at(frames, 0).id).toBe(originalId); expect(buffer.read({ filename: "app.ts" })).toEqual([container]); expect(buffer.read({ envelopeId: originalId })).toEqual([container]); }); @@ -99,7 +100,7 @@ test("raw ingress assigns identity independently of an untrusted envelope header expect(await ingestReceiverEnvelope(retention.buffer, { body: raw })).toBe( 204, ); - const container = retention.buffer.read({ all: true })[0]; + const container = at(retention.buffer.read({ all: true }), 0); const id = receiverEnvelopeId(container); expect(id).not.toBe(forgedId); expect( @@ -164,7 +165,7 @@ describe.each([false, true])("bounded receiver (scoped: %s)", (scoped) => { }); expect(response.status).toBe(204); expect(fixture.buffer.read({ all: true })).toHaveLength(1); - expect(fixture.buffer.read({ all: true })[0].getContentType()).toBe( + expect(at(fixture.buffer.read({ all: true }), 0).getContentType()).toBe( "application/x-sentry-envelope", ); }, @@ -451,9 +452,9 @@ test.each([ envelopes: { id: string }[]; }; expect(envelopes).toHaveLength(1); - expect(envelopes[0].id).toMatch(/^[a-f\d-]{36}$/); + expect(at(envelopes, 0).id).toMatch(/^[a-f\d-]{36}$/); const raw = await plane.app.request( - `${base}/envelopes/${envelopes[0].id}`, + `${base}/envelopes/${at(envelopes, 0).id}`, { headers }, ); expect(raw.status).toBe(200); @@ -544,7 +545,7 @@ test("retention changes include preceding compressed admissions and preserve cur await expect(retention.resize(1)).rejects.toThrow(/2 retained envelopes/); expect(await Promise.all(writes)).toEqual([204, 204]); const history = retention.buffer.read({ all: true }); - const cursor = receiverEnvelopeId(history[1]); + const cursor = receiverEnvelopeId(at(history, 1)); const seen: string[] = []; const reader = retention.buffer.subscribe( (item) => seen.push(item.getData().toString()), @@ -591,12 +592,12 @@ test("raw attachments remain byte exact and malformed SSE remains inspectable wi attachment, ]); expect(await ingestReceiverEnvelope(retention.buffer, { body })).toBe(204); - expect(retention.buffer.read({ all: true })[0].getData()).toEqual(body); + expect(at(retention.buffer.read({ all: true }), 0).getData()).toEqual(body); const malformed = Buffer.from("not-an-envelope"); expect( await ingestReceiverEnvelope(retention.buffer, { body: malformed }), ).toBe(204); - const latest = retention.buffer.read({ all: true })[0]; + const latest = at(retention.buffer.read({ all: true }), 0); const frames: { id?: string; data: string }[] = []; const handler = buildSSEHandler({ writeSSE: async (frame) => { @@ -624,7 +625,7 @@ test("malformed exception metadata cannot break raw filename queries", async () ); expect(await ingestReceiverEnvelope(retention.buffer, { body })).toBe(204); expect(retention.buffer.read({ filename: "app.ts" })).toEqual([]); - expect(retention.buffer.read({ all: true })[0].getData()).toEqual(body); + expect(at(retention.buffer.read({ all: true }), 0).getData()).toEqual(body); }); test("SSE falls back to raw data if deeply nested decoded JSON cannot serialize", async () => { @@ -643,7 +644,7 @@ test("SSE falls back to raw data if deeply nested decoded JSON cannot serialize" writeSSE: async (frame) => { frames.push(frame); }, - })(retention.buffer.read({ all: true })[0]); + })(at(retention.buffer.read({ all: true }), 0)); expect(frames).toHaveLength(1); - expect(frames[0].data).toBe(raw); + expect(at(frames, 0).data).toBe(raw); }); diff --git a/packages/cli/test/commands/local/run.test.ts b/packages/cli/test/commands/local/run.test.ts index 47b2b32be4..cdd60fc861 100644 --- a/packages/cli/test/commands/local/run.test.ts +++ b/packages/cli/test/commands/local/run.test.ts @@ -52,6 +52,7 @@ import { } from "../../../src/lib/wrangler.js"; import { TEST_TMP_DIR } from "../../constants.js"; import { useTestConfigDir } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; /** * Records the env passed to the most recent `spawn` call so tests can assert @@ -76,10 +77,15 @@ vi.mock("node:child_process", async (importOriginal) => { options?: Parameters[2], ) => { spawnCapture.args = args; - spawnCapture.env = options?.env; + if (options?.env === undefined) { + delete spawnCapture.env; + } else { + spawnCapture.env = options.env; + } spawnCapture.stdio = options?.stdio; - spawnCapture.child = actual.spawn(cmd, args as string[], options); - return spawnCapture.child; + const child = actual.spawn(cmd, [...args], options); + spawnCapture.child = child; + return child; }, }; }); @@ -120,16 +126,16 @@ afterEach(async () => { function makeContext(cwd?: string) { return { - stdout: { write: vi.fn(() => true) }, - stderr: { write: vi.fn(() => true) }, + stdout: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: cwd ?? tmpDir, }; } describe("sentry local run", () => { beforeEach(() => { - spawnCapture.args = undefined; - spawnCapture.env = undefined; + delete spawnCapture.args; + delete spawnCapture.env; spawnCapture.stdio = undefined; spawnCapture.child = undefined; }); @@ -432,8 +438,8 @@ describe("sentry local run", () => { }); test("preserves existing SENTRY_TRACES_SAMPLE_RATE", async () => { - const originalRate = process.env.SENTRY_TRACES_SAMPLE_RATE; - process.env.SENTRY_TRACES_SAMPLE_RATE = "0.5"; + const originalRate = process.env["SENTRY_TRACES_SAMPLE_RATE"]; + process.env["SENTRY_TRACES_SAMPLE_RATE"] = "0.5"; try { const func = (await runCommand.loader()) as unknown as RunFunc; const ctx = makeContext(); @@ -447,9 +453,9 @@ describe("sentry local run", () => { ); } finally { if (originalRate === undefined) { - delete process.env.SENTRY_TRACES_SAMPLE_RATE; + delete process.env["SENTRY_TRACES_SAMPLE_RATE"]; } else { - process.env.SENTRY_TRACES_SAMPLE_RATE = originalRate; + process.env["SENTRY_TRACES_SAMPLE_RATE"] = originalRate; } } }); @@ -973,7 +979,7 @@ setInterval(() => {}, 1000); const capturedEnv = spawnCapture.env; expect(capturedEnv).toBeDefined(); // Base name read by server-side SDKs. - expect(capturedEnv?.SENTRY_SPOTLIGHT).toBe(expectedUrl); + expect(capturedEnv?.["SENTRY_SPOTLIGHT"]).toBe(expectedUrl); // Every framework client variant points at the same URL. for (const prefix of CLIENT_SPOTLIGHT_PREFIXES) { expect(capturedEnv?.[`${prefix}SENTRY_SPOTLIGHT`]).toBe(expectedUrl); diff --git a/packages/cli/test/commands/local/server.test.ts b/packages/cli/test/commands/local/server.test.ts index efa2326dfc..02bf04fca9 100644 --- a/packages/cli/test/commands/local/server.test.ts +++ b/packages/cli/test/commands/local/server.test.ts @@ -9,7 +9,15 @@ import { createLocalControlPlane } from "../../../src/commands/local/control-pla import { createLocalRetentionBuffer } from "../../../src/commands/local/retention-buffer.js"; import { logger } from "../../../src/lib/logger.js"; import { Hono } from "hono"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + type MockInstance, + test, + vi, +} from "vitest"; import { buildApp, consumeSSE, @@ -28,6 +36,7 @@ import { ValidationError, } from "../../../src/lib/errors.js"; import { SENTRY_CONTENT_TYPE } from "../../../src/lib/formatters/local.js"; +import { at } from "../../helpers.js"; vi.mock("../../../src/lib/browser.js", () => ({ openBrowser: vi.fn().mockResolvedValue(true), @@ -296,7 +305,7 @@ describe("parsePort", () => { }); describe("sentry local serve --open", () => { - let info: ReturnType; + let info: MockInstance<(typeof logger)["info"]>; beforeEach(() => { info = vi.spyOn(logger, "info").mockImplementation(() => {}); }); @@ -356,7 +365,7 @@ describe("sentry local serve --open", () => { signal.trigger(); await command; expectViewerHint(); - const url = new URL(opener.mock.calls[0][0]); + const url = new URL(at(opener.mock.calls, 0)[0]); expect(new URLSearchParams(url.hash.slice(1)).get("directory")).toBe( directoryUrl, ); diff --git a/packages/cli/test/commands/log/list.test.ts b/packages/cli/test/commands/log/list.test.ts index 7cdc01e23e..824c03415b 100644 --- a/packages/cli/test/commands/log/list.test.ts +++ b/packages/cli/test/commands/log/list.test.ts @@ -19,18 +19,22 @@ */ import { setTimeout as sleep } from "node:timers/promises"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { listCommand } from "../../../src/commands/log/list.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -39,12 +43,8 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/db/auth.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -61,12 +61,8 @@ vi.mock("../../../src/lib/formatters/index.js", async (importOriginal) => { await importOriginal< typeof import("../../../src/lib/formatters/index.js") >(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -75,12 +71,8 @@ import * as formatters from "../../../src/lib/formatters/index.js"; vi.mock("../../../src/lib/polling.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -89,12 +81,8 @@ import * as polling from "../../../src/lib/polling.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -104,12 +92,8 @@ import { parsePeriod } from "../../../src/lib/time-range.js"; vi.mock("../../../src/lib/trace-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -118,17 +102,20 @@ import * as traceTarget from "../../../src/lib/trace-target.js"; vi.mock("../../../src/lib/version-check.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as versionCheck from "../../../src/lib/version-check.js"; import type { SentryLog, TraceLog } from "../../../src/types/sentry.js"; +import { + loadCommand, + at, + must, + passthroughWithProgress, +} from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; // ============================================================================ // Helpers @@ -192,8 +179,8 @@ function interceptSigint() { } function createMockContext() { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -206,19 +193,6 @@ function createMockContext() { }; } -/** No-op setMessage callback for withProgress mock */ -function noop() { - // no-op for test -} - -/** Passthrough mock for `withProgress` — bypasses spinner, calls fn directly */ -function mockWithProgress( - _opts: unknown, - fn: (setMessage: () => void) => unknown, -) { - return fn(noop); -} - /** Standard flags for non-follow batch mode (period omitted = use mode default) */ const BATCH_FLAGS = { json: true, @@ -325,7 +299,7 @@ const newerLogs: SentryLog[] = [ // Auth setup — mock getAuthConfig for all tests (auth guard added in #611) // ============================================================================ -let getAuthConfigSpy: ReturnType; +let getAuthConfigSpy: MockInstance<(typeof dbAuth)["getAuthConfig"]>; beforeEach(() => { getAuthConfigSpy = vi.spyOn(dbAuth, "getAuthConfig").mockReturnValue({ @@ -343,9 +317,11 @@ afterEach(() => { // ============================================================================ describe("listCommand.func — standard mode", () => { - let listLogsSpy: ReturnType; - let resolveOrgProjectSpy: ReturnType; - let withProgressSpy: ReturnType; + let listLogsSpy: MockInstance<(typeof apiClient)["listLogs"]>; + let resolveOrgProjectSpy: MockInstance< + (typeof resolveTarget)["resolveProjectBoundTarget"] + >; + let withProgressSpy: MockInstance<(typeof polling)["withProgress"]>; beforeEach(() => { listLogsSpy = vi.spyOn(apiClient, "listLogs"); @@ -353,7 +329,7 @@ describe("listCommand.func — standard mode", () => { vi.spyOn(resolveTarget, "resolveLogProjectId").mockResolvedValue(undefined); withProgressSpy = vi .spyOn(polling, "withProgress") - .mockImplementation(mockWithProgress); + .mockImplementation(passthroughWithProgress); }); afterEach(() => { @@ -367,7 +343,7 @@ describe("listCommand.func — standard mode", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, BATCH_FLAGS, `${ORG}/${PROJECT}`); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -385,7 +361,7 @@ describe("listCommand.func — standard mode", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, BATCH_FLAGS, `${ORG}/${PROJECT}`); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -400,7 +376,7 @@ describe("listCommand.func — standard mode", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { ...BATCH_FLAGS, sort: "oldest" }, @@ -420,7 +396,7 @@ describe("listCommand.func — standard mode", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, HUMAN_FLAGS, `${ORG}/${PROJECT}`); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -432,7 +408,7 @@ describe("listCommand.func — standard mode", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, HUMAN_FLAGS, `${ORG}/${PROJECT}`); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -446,7 +422,7 @@ describe("listCommand.func — standard mode", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, HUMAN_FLAGS, `${ORG}/${PROJECT}`); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -458,7 +434,7 @@ describe("listCommand.func — standard mode", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); // limit equals number of returned logs → hasMore = true await func.call(context, { json: false, limit: 3 }, `${ORG}/${PROJECT}`); @@ -471,7 +447,7 @@ describe("listCommand.func — standard mode", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, HUMAN_FLAGS, `${ORG}/${PROJECT}`); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -483,7 +459,7 @@ describe("listCommand.func — standard mode", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { json: false, limit: 50, query: "severity:error", sort: "newest" }, @@ -505,7 +481,7 @@ describe("listCommand.func — standard mode", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call( context, @@ -522,7 +498,7 @@ describe("listCommand.func — standard mode", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call( context, @@ -537,7 +513,7 @@ describe("listCommand.func — standard mode", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: true, limit: 3 }, `${ORG}/${PROJECT}`); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -550,7 +526,7 @@ describe("listCommand.func — standard mode", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, BATCH_FLAGS, `${ORG}/${PROJECT}`); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -564,10 +540,12 @@ describe("listCommand.func — standard mode", () => { // ============================================================================ describe("listCommand.func — trace mode", () => { - let listTraceLogsSpy: ReturnType; - let resolveTraceOrgSpy: ReturnType; - let warnIfNormalizedSpy: ReturnType; - let withProgressSpy: ReturnType; + let listTraceLogsSpy: MockInstance<(typeof apiClient)["listTraceLogs"]>; + let resolveTraceOrgSpy: MockInstance<(typeof traceTarget)["resolveTraceOrg"]>; + let warnIfNormalizedSpy: MockInstance< + (typeof traceTarget)["warnIfNormalized"] + >; + let withProgressSpy: MockInstance<(typeof polling)["withProgress"]>; beforeEach(() => { listTraceLogsSpy = vi.spyOn(apiClient, "listTraceLogs"); @@ -577,7 +555,7 @@ describe("listCommand.func — trace mode", () => { .mockReturnValue(undefined); withProgressSpy = vi .spyOn(polling, "withProgress") - .mockImplementation(mockWithProgress); + .mockImplementation(passthroughWithProgress); }); afterEach(() => { @@ -592,7 +570,7 @@ describe("listCommand.func — trace mode", () => { resolveTraceOrgSpy.mockResolvedValue({ traceId: TRACE_ID, org: ORG }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, BATCH_FLAGS, TRACE_ID); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -612,7 +590,7 @@ describe("listCommand.func — trace mode", () => { resolveTraceOrgSpy.mockResolvedValue({ traceId: TRACE_ID, org: ORG }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call(context, { ...BATCH_FLAGS, query: "bad:::query" }, TRACE_ID), ).rejects.toBeInstanceOf(ValidationError); @@ -625,7 +603,7 @@ describe("listCommand.func — trace mode", () => { resolveTraceOrgSpy.mockResolvedValue({ traceId: TRACE_ID, org: ORG }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call(context, BATCH_FLAGS, TRACE_ID), ).rejects.toBeInstanceOf(ApiError); @@ -637,7 +615,7 @@ describe("listCommand.func — trace mode", () => { resolveTraceOrgSpy.mockResolvedValue({ traceId: TRACE_ID, org: ORG }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, BATCH_FLAGS, TRACE_ID); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -652,7 +630,7 @@ describe("listCommand.func — trace mode", () => { resolveTraceOrgSpy.mockResolvedValue({ traceId: TRACE_ID, org: ORG }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, HUMAN_FLAGS, TRACE_ID); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -665,7 +643,7 @@ describe("listCommand.func — trace mode", () => { resolveTraceOrgSpy.mockResolvedValue({ traceId: TRACE_ID, org: ORG }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, HUMAN_FLAGS, TRACE_ID); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -679,7 +657,7 @@ describe("listCommand.func — trace mode", () => { resolveTraceOrgSpy.mockResolvedValue({ traceId: TRACE_ID, org: ORG }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, HUMAN_FLAGS, TRACE_ID); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -692,7 +670,7 @@ describe("listCommand.func — trace mode", () => { resolveTraceOrgSpy.mockResolvedValue({ traceId: TRACE_ID, org: ORG }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: false, limit: 3 }, TRACE_ID); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -704,7 +682,7 @@ describe("listCommand.func — trace mode", () => { resolveTraceOrgSpy.mockResolvedValue({ traceId: TRACE_ID, org: ORG }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { json: false, limit: 50, query: "severity:error", sort: "newest" }, @@ -724,7 +702,7 @@ describe("listCommand.func — trace mode", () => { resolveTraceOrgSpy.mockResolvedValue({ traceId: TRACE_ID, org: "my-org" }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, BATCH_FLAGS, `my-org/${TRACE_ID}`); // resolveTraceOrg receives the parsed ParsedTraceTarget @@ -746,12 +724,16 @@ describe("listCommand.func — trace mode", () => { // ============================================================================ describe("listCommand.func — positional disambiguation", () => { - let listLogsSpy: ReturnType; - let listTraceLogsSpy: ReturnType; - let resolveOrgProjectSpy: ReturnType; - let resolveTraceOrgSpy: ReturnType; - let warnIfNormalizedSpy: ReturnType; - let withProgressSpy: ReturnType; + let listLogsSpy: MockInstance<(typeof apiClient)["listLogs"]>; + let listTraceLogsSpy: MockInstance<(typeof apiClient)["listTraceLogs"]>; + let resolveOrgProjectSpy: MockInstance< + (typeof resolveTarget)["resolveProjectBoundTarget"] + >; + let resolveTraceOrgSpy: MockInstance<(typeof traceTarget)["resolveTraceOrg"]>; + let warnIfNormalizedSpy: MockInstance< + (typeof traceTarget)["warnIfNormalized"] + >; + let withProgressSpy: MockInstance<(typeof polling)["withProgress"]>; beforeEach(() => { listLogsSpy = vi.spyOn(apiClient, "listLogs").mockResolvedValue([]); @@ -772,7 +754,7 @@ describe("listCommand.func — positional disambiguation", () => { .mockReturnValue(undefined); withProgressSpy = vi .spyOn(polling, "withProgress") - .mockImplementation(mockWithProgress); + .mockImplementation(passthroughWithProgress); }); afterEach(() => { @@ -786,7 +768,7 @@ describe("listCommand.func — positional disambiguation", () => { test("32-char hex string triggers trace mode", async () => { const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, BATCH_FLAGS, TRACE_ID); expect(listTraceLogsSpy).toHaveBeenCalled(); @@ -795,7 +777,7 @@ describe("listCommand.func — positional disambiguation", () => { test("non-hex string triggers project mode", async () => { const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, BATCH_FLAGS, `${ORG}/${PROJECT}`); expect(listLogsSpy).toHaveBeenCalled(); @@ -804,7 +786,7 @@ describe("listCommand.func — positional disambiguation", () => { test("org/trace-id triggers trace mode", async () => { const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, BATCH_FLAGS, `${ORG}/${TRACE_ID}`); expect(listTraceLogsSpy).toHaveBeenCalled(); @@ -813,7 +795,7 @@ describe("listCommand.func — positional disambiguation", () => { test("org/project (non-hex) triggers project mode", async () => { const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, BATCH_FLAGS, "my-org/my-project"); expect(listLogsSpy).toHaveBeenCalled(); @@ -826,10 +808,12 @@ describe("listCommand.func — positional disambiguation", () => { // ============================================================================ describe("listCommand.func — period flag", () => { - let listTraceLogsSpy: ReturnType; - let resolveTraceOrgSpy: ReturnType; - let warnIfNormalizedSpy: ReturnType; - let withProgressSpy: ReturnType; + let listTraceLogsSpy: MockInstance<(typeof apiClient)["listTraceLogs"]>; + let resolveTraceOrgSpy: MockInstance<(typeof traceTarget)["resolveTraceOrg"]>; + let warnIfNormalizedSpy: MockInstance< + (typeof traceTarget)["warnIfNormalized"] + >; + let withProgressSpy: MockInstance<(typeof polling)["withProgress"]>; beforeEach(() => { listTraceLogsSpy = vi @@ -846,7 +830,7 @@ describe("listCommand.func — period flag", () => { .mockReturnValue(undefined); withProgressSpy = vi .spyOn(polling, "withProgress") - .mockImplementation(mockWithProgress); + .mockImplementation(passthroughWithProgress); }); afterEach(() => { @@ -858,7 +842,7 @@ describe("listCommand.func — period flag", () => { test("trace mode uses 14d default when period is omitted", async () => { const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { json: true, limit: 100, sort: "newest" }, @@ -875,7 +859,7 @@ describe("listCommand.func — period flag", () => { test("trace mode uses explicit period when set to non-default", async () => { const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { json: true, limit: 100, period: parsePeriod("30d"), sort: "newest" }, @@ -896,9 +880,11 @@ describe("listCommand.func — period flag", () => { // ============================================================================ describe("listCommand.func — trace mode org resolution failure", () => { - let resolveTraceOrgSpy: ReturnType; - let warnIfNormalizedSpy: ReturnType; - let withProgressSpy: ReturnType; + let resolveTraceOrgSpy: MockInstance<(typeof traceTarget)["resolveTraceOrg"]>; + let warnIfNormalizedSpy: MockInstance< + (typeof traceTarget)["warnIfNormalized"] + >; + let withProgressSpy: MockInstance<(typeof polling)["withProgress"]>; beforeEach(() => { resolveTraceOrgSpy = vi.spyOn(traceTarget, "resolveTraceOrg"); @@ -907,7 +893,7 @@ describe("listCommand.func — trace mode org resolution failure", () => { .mockReturnValue(undefined); withProgressSpy = vi .spyOn(polling, "withProgress") - .mockImplementation(mockWithProgress); + .mockImplementation(passthroughWithProgress); }); afterEach(() => { @@ -922,7 +908,7 @@ describe("listCommand.func — trace mode org resolution failure", () => { ); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect(func.call(context, HUMAN_FLAGS, TRACE_ID)).rejects.toThrow( ContextError, @@ -935,7 +921,7 @@ describe("listCommand.func — trace mode org resolution failure", () => { ); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); try { await func.call(context, HUMAN_FLAGS, TRACE_ID); @@ -964,7 +950,7 @@ describe("listCommand.func — trace mode org resolution failure", () => { * Handles both string and Buffer arguments from the logger. */ function collectProcessStderr( - spy: ReturnType>, + spy: MockInstance<(typeof process.stderr)["write"]>, ): string { return spy.mock.calls .map((c) => { @@ -987,7 +973,7 @@ function collectProcessStderr( describe("listCommand.func — flag validation", () => { test("rejects --sort oldest with --follow", async () => { const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call( context, @@ -1007,7 +993,7 @@ describe("listCommand.func — flag validation", () => { new ContextError("Organization", "sentry log list"), ); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call( context, @@ -1024,12 +1010,16 @@ describe("listCommand.func — flag validation", () => { // ============================================================================ describe("listCommand.func — follow mode (standard)", () => { - let listLogsSpy: ReturnType; - let resolveOrgProjectSpy: ReturnType; - let isPlainSpy: ReturnType; - let updateNotifSpy: ReturnType; + let listLogsSpy: MockInstance<(typeof apiClient)["listLogs"]>; + let resolveOrgProjectSpy: MockInstance< + (typeof resolveTarget)["resolveProjectBoundTarget"] + >; + let isPlainSpy: MockInstance<(typeof formatters)["isPlainOutput"]>; + let updateNotifSpy: MockInstance< + (typeof versionCheck)["getUpdateNotification"] + >; let sigint: ReturnType; - let stderrSpy: ReturnType>; + let stderrSpy: MockInstance<(typeof process.stderr)["write"]>; beforeEach(() => { sigint = interceptSigint(); @@ -1067,7 +1057,7 @@ describe("listCommand.func — follow mode (standard)", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const promise = func.call(context, followFlags, `${ORG}/${PROJECT}`); await sleep(50); @@ -1088,7 +1078,7 @@ describe("listCommand.func — follow mode (standard)", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call( @@ -1110,7 +1100,7 @@ describe("listCommand.func — follow mode (standard)", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const promise = func.call(context, followFlags, `${ORG}/${PROJECT}`); await sleep(10); @@ -1135,7 +1125,7 @@ describe("listCommand.func — follow mode (standard)", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const promise = func.call(context, followFlags, `${ORG}/${PROJECT}`); await sleep(50); @@ -1153,7 +1143,7 @@ describe("listCommand.func — follow mode (standard)", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const promise = func.call( context, @@ -1177,7 +1167,7 @@ describe("listCommand.func — follow mode (standard)", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const promise = func.call(context, followFlags, `${ORG}/${PROJECT}`); // Wait for initial fetch + poll timer (1s) + poll execution @@ -1196,7 +1186,7 @@ describe("listCommand.func — follow mode (standard)", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const promise = func.call( context, @@ -1208,7 +1198,7 @@ describe("listCommand.func — follow mode (standard)", () => { await promise; // Each log should be written as a separate JSON object (streaming NDJSON) - const calls = stdoutWrite.mock.calls.map((c) => c[0]); + const calls = stdoutWrite.mock.calls.map((c) => String(c[0])); const jsonObjects = calls.filter((s: string) => { try { JSON.parse(s); @@ -1225,7 +1215,7 @@ describe("listCommand.func — follow mode (standard)", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call(context, followFlags, `${ORG}/${PROJECT}`), @@ -1239,7 +1229,7 @@ describe("listCommand.func — follow mode (standard)", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call(context, followFlags, `${ORG}/${PROJECT}`), @@ -1254,7 +1244,7 @@ describe("listCommand.func — follow mode (standard)", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const promise = func.call(context, followFlags, `${ORG}/${PROJECT}`); // Wait for initial fetch + poll timer (1s) + poll execution @@ -1273,7 +1263,7 @@ describe("listCommand.func — follow mode (standard)", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const promise = func.call(context, followFlags, `${ORG}/${PROJECT}`); await sleep(50); @@ -1295,7 +1285,7 @@ describe("listCommand.func — follow mode (standard)", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const promise = func.call(context, followFlags, `${ORG}/${PROJECT}`); // Wait for initial fetch + poll timer (1s) + poll execution @@ -1304,10 +1294,10 @@ describe("listCommand.func — follow mode (standard)", () => { await promise; // Poll call (index 1) should include afterTimestamp from max in batch - const pollCall = listLogsSpy.mock.calls[1]; + const pollCall = at(listLogsSpy.mock.calls, 1); expect(pollCall).toBeDefined(); - expect(pollCall[2].afterTimestamp).toBe(maxTs); - expect(pollCall[2].statsPeriod).toBe("10m"); + expect(must(pollCall[2]).afterTimestamp).toBe(maxTs); + expect(must(pollCall[2]).statsPeriod).toBe("10m"); }); test("shows update notification when available", async () => { @@ -1316,7 +1306,7 @@ describe("listCommand.func — follow mode (standard)", () => { resolveOrgProjectSpy.mockResolvedValue({ org: ORG, project: PROJECT }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const promise = func.call(context, followFlags, `${ORG}/${PROJECT}`); await sleep(50); @@ -1334,13 +1324,17 @@ describe("listCommand.func — follow mode (standard)", () => { // ============================================================================ describe("listCommand.func — follow mode (trace)", () => { - let listTraceLogsSpy: ReturnType; - let resolveTraceOrgSpy: ReturnType; - let warnIfNormalizedSpy: ReturnType; - let isPlainSpy: ReturnType; - let updateNotifSpy: ReturnType; + let listTraceLogsSpy: MockInstance<(typeof apiClient)["listTraceLogs"]>; + let resolveTraceOrgSpy: MockInstance<(typeof traceTarget)["resolveTraceOrg"]>; + let warnIfNormalizedSpy: MockInstance< + (typeof traceTarget)["warnIfNormalized"] + >; + let isPlainSpy: MockInstance<(typeof formatters)["isPlainOutput"]>; + let updateNotifSpy: MockInstance< + (typeof versionCheck)["getUpdateNotification"] + >; let sigint: ReturnType; - let stderrSpy: ReturnType>; + let stderrSpy: MockInstance<(typeof process.stderr)["write"]>; beforeEach(() => { sigint = interceptSigint(); @@ -1380,7 +1374,7 @@ describe("listCommand.func — follow mode (trace)", () => { resolveTraceOrgSpy.mockResolvedValue({ traceId: TRACE_ID, org: ORG }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const promise = func.call(context, traceFollowFlags, TRACE_ID); await sleep(50); @@ -1396,7 +1390,7 @@ describe("listCommand.func — follow mode (trace)", () => { resolveTraceOrgSpy.mockResolvedValue({ traceId: TRACE_ID, org: ORG }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const promise = func.call(context, traceFollowFlags, TRACE_ID); await sleep(50); @@ -1422,7 +1416,7 @@ describe("listCommand.func — follow mode (trace)", () => { resolveTraceOrgSpy.mockResolvedValue({ traceId: TRACE_ID, org: ORG }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const promise = func.call(context, traceFollowFlags, TRACE_ID); // Wait for initial fetch + poll timer (1s) + poll execution @@ -1444,7 +1438,7 @@ describe("listCommand.func — follow mode (trace)", () => { resolveTraceOrgSpy.mockResolvedValue({ traceId: TRACE_ID, org: ORG }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const promise = func.call( context, @@ -1456,7 +1450,7 @@ describe("listCommand.func — follow mode (trace)", () => { sigint.trigger(); await promise; - const calls = stdoutWrite.mock.calls.map((c) => c[0]); + const calls = stdoutWrite.mock.calls.map((c) => String(c[0])); const jsonLines = calls.filter((s: string) => { try { JSON.parse(s); @@ -1469,12 +1463,12 @@ describe("listCommand.func — follow mode (trace)", () => { // Poll batch: 1 JSON line per item (bare JSONL) expect(jsonLines.length).toBe(2); // First line is an envelope with data array (the initial trace batch) - const firstBatch = JSON.parse(jsonLines[0]); + const firstBatch = JSON.parse(at(jsonLines, 0)); expect(firstBatch).toHaveProperty("data"); expect(Array.isArray(firstBatch.data)).toBe(true); expect(firstBatch.data).toHaveLength(3); // Second line is a bare object (polled item) - const pollItem = JSON.parse(jsonLines[1]); + const pollItem = JSON.parse(at(jsonLines, 1)); expect(pollItem.message).toBe("New poll result"); }); @@ -1485,7 +1479,7 @@ describe("listCommand.func — follow mode (trace)", () => { resolveTraceOrgSpy.mockResolvedValue({ traceId: TRACE_ID, org: ORG }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call(context, traceFollowFlags, TRACE_ID), @@ -1499,7 +1493,7 @@ describe("listCommand.func — follow mode (trace)", () => { resolveTraceOrgSpy.mockResolvedValue({ traceId: TRACE_ID, org: ORG }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const promise = func.call(context, traceFollowFlags, TRACE_ID); // Wait for initial fetch + poll timer (1s) + poll execution @@ -1518,7 +1512,7 @@ describe("listCommand.func — follow mode (trace)", () => { resolveTraceOrgSpy.mockResolvedValue({ traceId: TRACE_ID, org: ORG }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const promise = func.call(context, traceFollowFlags, TRACE_ID); await sleep(50); @@ -1539,7 +1533,7 @@ describe("listCommand.func — follow mode (trace)", () => { resolveTraceOrgSpy.mockResolvedValue({ traceId: TRACE_ID, org: ORG }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const promise = func.call(context, traceFollowFlags, TRACE_ID); // Wait for initial fetch + poll timer (1s) + poll execution @@ -1549,10 +1543,10 @@ describe("listCommand.func — follow mode (trace)", () => { // Poll call (index 1) should NOT have afterTimestamp // (trace-logs endpoint doesn't support it) - const pollCall = listTraceLogsSpy.mock.calls[1]; + const pollCall = at(listTraceLogsSpy.mock.calls, 1); expect(pollCall).toBeDefined(); - expect(pollCall[2].afterTimestamp).toBeUndefined(); - expect(pollCall[2].statsPeriod).toBe("10m"); + expect(Reflect.get(must(pollCall[2]), "afterTimestamp")).toBeUndefined(); + expect(must(pollCall[2]).statsPeriod).toBe("10m"); }); test("handles empty initial fetch then new logs in poll", async () => { @@ -1563,7 +1557,7 @@ describe("listCommand.func — follow mode (trace)", () => { resolveTraceOrgSpy.mockResolvedValue({ traceId: TRACE_ID, org: ORG }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const promise = func.call(context, traceFollowFlags, TRACE_ID); // Wait for initial fetch + poll timer (1s) + poll execution diff --git a/packages/cli/test/commands/log/view.func.test.ts b/packages/cli/test/commands/log/view.func.test.ts index a804ff3a02..e02a5fc4d1 100644 --- a/packages/cli/test/commands/log/view.func.test.ts +++ b/packages/cli/test/commands/log/view.func.test.ts @@ -6,18 +6,22 @@ * the func() body without real HTTP calls or database access. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { viewCommand } from "../../../src/commands/log/view.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -26,12 +30,8 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/browser.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -41,17 +41,15 @@ import { ContextError, ResolutionError } from "../../../src/lib/errors.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; import type { DetailedSentryLog } from "../../../src/types/sentry.js"; +import { loadCommand, at } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; const ID1 = "aaaa1111bbbb2222cccc3333dddd4444"; const ID2 = "1111222233334444555566667777aaaa"; @@ -81,11 +79,11 @@ function makeSampleLog(id: string, message = "Test log"): DetailedSentryLog { } function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, stdoutWrite, @@ -93,11 +91,15 @@ function createMockContext() { } describe("viewCommand.func", () => { - let getLogsSpy: ReturnType; - let getLogItemDetailSpy: ReturnType; - let resolveOrgAndProjectSpy: ReturnType; - let resolveProjectBoundSlugSpy: ReturnType; - let openInBrowserSpy: ReturnType; + let getLogsSpy: MockInstance<(typeof apiClient)["getLogs"]>; + let getLogItemDetailSpy: MockInstance<(typeof apiClient)["getLogItemDetail"]>; + let resolveOrgAndProjectSpy: MockInstance< + (typeof resolveTarget)["resolveOrgAndProject"] + >; + let resolveProjectBoundSlugSpy: MockInstance< + (typeof resolveTarget)["resolveProjectBoundSlug"] + >; + let openInBrowserSpy: MockInstance<(typeof browser)["openInBrowser"]>; beforeEach(() => { getLogsSpy = vi.spyOn(apiClient, "getLogs"); @@ -130,7 +132,7 @@ describe("viewCommand.func", () => { getLogsSpy.mockResolvedValue([log]); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { json: true, web: false }, "my-org/proj", ID1); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -144,7 +146,7 @@ describe("viewCommand.func", () => { getLogsSpy.mockResolvedValue([log]); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { json: false, web: false }, "my-org/proj", ID1); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -155,7 +157,7 @@ describe("viewCommand.func", () => { getLogsSpy.mockResolvedValue([]); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); try { await func.call( @@ -181,7 +183,7 @@ describe("viewCommand.func", () => { getLogsSpy.mockResolvedValue(logs); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false }, @@ -203,7 +205,7 @@ describe("viewCommand.func", () => { getLogsSpy.mockResolvedValue(logs); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, web: false }, @@ -224,7 +226,7 @@ describe("viewCommand.func", () => { const combined = `${ID1}\n${ID2}`; const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false }, @@ -248,7 +250,7 @@ describe("viewCommand.func", () => { getLogsSpy.mockResolvedValue([makeSampleLog(ID1)]); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false }, @@ -270,7 +272,7 @@ describe("viewCommand.func", () => { getLogsSpy.mockResolvedValue([]); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); try { await func.call( @@ -297,11 +299,11 @@ describe("viewCommand.func", () => { openInBrowserSpy.mockResolvedValue(undefined); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { json: false, web: true }, "my-org/proj", ID1); expect(openInBrowserSpy).toHaveBeenCalled(); - const url = openInBrowserSpy.mock.calls[0][0] as string; + const url = at(openInBrowserSpy.mock.calls, 0)[0] as string; expect(url).toContain(ID1); // Should NOT fetch logs when using --web expect(getLogsSpy).not.toHaveBeenCalled(); @@ -311,7 +313,7 @@ describe("viewCommand.func", () => { openInBrowserSpy.mockResolvedValue(undefined); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, web: true }, @@ -330,11 +332,12 @@ describe("viewCommand.func", () => { resolveProjectBoundSlugSpy.mockResolvedValue({ org: "resolved-org", project: "resolved-proj", + projectData: { id: "1", slug: "resolved-proj", name: "Resolved Proj" }, }); getLogsSpy.mockResolvedValue([makeSampleLog(ID1)]); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { json: true, web: false }, "my-project", ID1); expect(resolveProjectBoundSlugSpy).toHaveBeenCalled(); @@ -348,7 +351,7 @@ describe("viewCommand.func", () => { test("org/ target (org-all) throws ContextError", async () => { const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); try { await func.call(context, { json: false, web: false }, "my-org/", ID1); @@ -361,6 +364,8 @@ describe("viewCommand.func", () => { test("auto-detect resolves org/project and fetches logs", async () => { resolveOrgAndProjectSpy.mockResolvedValue({ + orgDisplay: "detected-org", + projectDisplay: "detected-proj", org: "detected-org", project: "detected-proj", detectedFrom: ".env file", @@ -368,7 +373,7 @@ describe("viewCommand.func", () => { getLogsSpy.mockResolvedValue([makeSampleLog(ID1)]); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); // No target arg — triggers auto-detect await func.call(context, { json: false, web: false }, ID1); @@ -389,7 +394,7 @@ describe("viewCommand.func", () => { resolveOrgAndProjectSpy.mockResolvedValue(null); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); try { await func.call(context, { json: false, web: false }, ID1); @@ -409,7 +414,7 @@ describe("viewCommand.func", () => { getLogsSpy.mockResolvedValue([log]); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { json: false, web: false }, "my-org/proj", ID1); expect(getLogItemDetailSpy).toHaveBeenCalledWith( @@ -426,7 +431,7 @@ describe("viewCommand.func", () => { getLogsSpy.mockResolvedValue([log]); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { json: false, web: false }, "my-org/proj", ID1); expect(getLogItemDetailSpy).not.toHaveBeenCalled(); @@ -438,7 +443,7 @@ describe("viewCommand.func", () => { getLogItemDetailSpy.mockRejectedValue(new Error("network error")); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { json: false, web: false }, "my-org/proj", ID1); // Should still render the log with standard fields despite detail failure @@ -451,7 +456,7 @@ describe("viewCommand.func", () => { getLogsSpy.mockResolvedValue([log]); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { json: true, web: false }, "my-org/proj", ID1); expect(getLogItemDetailSpy).not.toHaveBeenCalled(); @@ -470,7 +475,7 @@ describe("viewCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { json: false, web: false }, "my-org/proj", ID1); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); diff --git a/packages/cli/test/commands/log/view.test.ts b/packages/cli/test/commands/log/view.test.ts index f3b334b4fd..34e34de6f2 100644 --- a/packages/cli/test/commands/log/view.test.ts +++ b/packages/cli/test/commands/log/view.test.ts @@ -5,7 +5,15 @@ * and viewCommand func() body in src/commands/log/view.ts */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; // Mock isatty to simulate an interactive terminal for the --web prompt path. // Bun's ESM wrapper for CJS built-ins exposes a `default` re-export plus @@ -83,12 +91,8 @@ import type { ProjectWithOrg } from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -97,12 +101,8 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/browser.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -118,6 +118,8 @@ import { import * as resolveTarget from "../../../src/lib/resolve-target.js"; import { resolveProjectBoundSlug } from "../../../src/lib/resolve-target.js"; import type { DetailedSentryLog } from "../../../src/types/index.js"; +import { loadCommand, at } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; /** A valid 32-char hex log ID for tests */ const ID1 = "968c763c740cfda8b6728f27fb9e9b01"; @@ -352,7 +354,9 @@ describe("parsePositionalArgs", () => { describe("resolveProjectBoundSlug", () => { const HINT = "sentry log view / [...]"; - let findProjectsBySlugSpy: ReturnType; + let findProjectsBySlugSpy: MockInstance< + (typeof apiClient)["findProjectsBySlug"] + >; beforeEach(() => { findProjectsBySlugSpy = vi.spyOn(apiClient, "findProjectsBySlug"); @@ -518,9 +522,11 @@ describe("resolveProjectBoundSlug", () => { // ============================================================================ describe("viewCommand.func", () => { - let getLogsSpy: ReturnType; - let findProjectsBySlugSpy: ReturnType; - let openInBrowserSpy: ReturnType; + let getLogsSpy: MockInstance<(typeof apiClient)["getLogs"]>; + let findProjectsBySlugSpy: MockInstance< + (typeof apiClient)["findProjectsBySlug"] + >; + let openInBrowserSpy: MockInstance<(typeof browser)["openInBrowser"]>; const sampleLog: DetailedSentryLog = { id: "968c763c740cfda8b6728f27fb9e9b01", @@ -534,11 +540,11 @@ describe("viewCommand.func", () => { } as unknown as DetailedSentryLog; function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, stdoutWrite, @@ -567,7 +573,7 @@ describe("viewCommand.func", () => { setOrgRegion("test-org", DEFAULT_SENTRY_URL); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false }, @@ -590,7 +596,7 @@ describe("viewCommand.func", () => { setOrgRegion("acme", DEFAULT_SENTRY_URL); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); // "frontend" (no slash) → project-search → resolveProjectBoundSlug await func.call( context, @@ -614,7 +620,7 @@ describe("viewCommand.func", () => { setOrgRegion("cam-org", DEFAULT_SENTRY_URL); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false }, @@ -637,7 +643,7 @@ describe("viewCommand.func", () => { setOrgRegion("test-org", DEFAULT_SENTRY_URL); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); try { await func.call( context, @@ -666,14 +672,14 @@ describe("viewCommand.func", () => { describe("log view --web interactive prompt", () => { const PROMPT_ID1 = "aaaa1111bbbb2222cccc3333dddd4444"; const PROMPT_ID2 = "1111222233334444555566667777aaaa"; - let openInBrowserSpy: ReturnType; + let openInBrowserSpy: MockInstance<(typeof browser)["openInBrowser"]>; function createPromptMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, stdoutWrite, @@ -696,7 +702,7 @@ describe("log view --web interactive prompt", () => { openInBrowserSpy.mockResolvedValue(undefined); const { context } = createPromptMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, web: true }, @@ -707,8 +713,8 @@ describe("log view --web interactive prompt", () => { expect(mockPrompt).toHaveBeenCalled(); expect(openInBrowserSpy).toHaveBeenCalledTimes(2); - const url1 = openInBrowserSpy.mock.calls[0][0] as string; - const url2 = openInBrowserSpy.mock.calls[1][0] as string; + const url1 = at(openInBrowserSpy.mock.calls, 0)[0] as string; + const url2 = at(openInBrowserSpy.mock.calls, 1)[0] as string; expect(url1).toContain(PROMPT_ID1); expect(url2).toContain(PROMPT_ID2); }); @@ -718,7 +724,7 @@ describe("log view --web interactive prompt", () => { openInBrowserSpy.mockResolvedValue(undefined); const { context } = createPromptMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, web: true }, @@ -739,7 +745,7 @@ describe("log view --web interactive prompt", () => { openInBrowserSpy.mockResolvedValue(undefined); const { context } = createPromptMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, web: true }, diff --git a/packages/cli/test/commands/monitor/run.test.ts b/packages/cli/test/commands/monitor/run.test.ts index 6f8dab1580..e44c1dc59b 100644 --- a/packages/cli/test/commands/monitor/run.test.ts +++ b/packages/cli/test/commands/monitor/run.test.ts @@ -6,17 +6,24 @@ * abort the wrapped command. The envelope transport is mocked. */ +import type { SentryContext } from "../../../src/context.js"; import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; import { runCommand } from "../../../src/commands/monitor/run.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn import * as transport from "../../../src/lib/envelope/transport.js"; import { COMMAND_NOT_FOUND_FIELD, + CliError, ValidationError, } from "../../../src/lib/errors.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn import * as windowsSpawn from "../../../src/lib/windows-spawn.js"; -import { useTestConfigDir } from "../../helpers.js"; +import { + useTestConfigDir, + loadCommand, + type TestCommandFunction, +} from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; useTestConfigDir("monitor-run-"); @@ -27,19 +34,19 @@ const NODE = process.execPath; function makeContext() { return { ctx: { - stdout: { write: vi.fn(() => true) }, - stderr: { write: vi.fn(() => true) }, + stdout: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, }; } describe("monitor runCommand.func()", () => { - let func: Awaited>; + let func: TestCommandFunction; let sendSpy: ReturnType; beforeEach(async () => { - func = await runCommand.loader(); + func = await loadCommand(runCommand); sendSpy = vi .spyOn(transport, "sendEnvelopeRequest") .mockResolvedValue(undefined); diff --git a/packages/cli/test/commands/org/list.test.ts b/packages/cli/test/commands/org/list.test.ts index 17bfbc176e..51a436d5bd 100644 --- a/packages/cli/test/commands/org/list.test.ts +++ b/packages/cli/test/commands/org/list.test.ts @@ -29,6 +29,7 @@ import { useEnvSandbox, useTestConfigDir, } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; type ListFunc = ( this: unknown, @@ -123,7 +124,7 @@ function createContext() { return { context: { stdout: { write: vi.fn((s: string) => chunks.push(s)) }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, getOutput: () => chunks.join(""), @@ -158,8 +159,8 @@ async function runListHuman(filter?: string): Promise { function slugsWithAccount(entries: Record[]): string[][] { return entries.map((e) => [ - e.slug as string, - (e.account as { email?: string } | undefined)?.email ?? "", + e["slug"] as string, + (e["account"] as { email?: string } | undefined)?.email ?? "", ]); } @@ -170,8 +171,8 @@ describe("org list with one stored account", () => { const entries = await runList(); - expect(entries.map((e) => e.slug)).toEqual(["alpha", "beta"]); - expect(entries.every((e) => e.account === undefined)).toBe(true); + expect(entries.map((e) => e["slug"])).toEqual(["alpha", "beta"]); + expect(entries.every((e) => e["account"] === undefined)).toBe(true); expect(requests).toEqual([`${SAAS} saas-token`]); }); }); @@ -189,7 +190,7 @@ describe("org list across stored accounts", () => { ["alpha", "jane@example.com"], ["acme-internal", "jane@acme.com"], ]); - expect(entries[1]?.account).toEqual({ + expect(entries[1]?.["account"]).toEqual({ name: "jane@acme.com:sentry.acme.com", id: expect.any(String), email: "jane@acme.com", @@ -299,11 +300,11 @@ describe("org list across stored accounts", () => { addAccount("saas-token", SAAS, "jane@example.com"); orgsByToken["saas-token"] = [org("alpha")]; orgsByToken["acme-token"] = [org("acme-internal", ACME)]; - process.env.SENTRY_URL = ACME; + process.env["SENTRY_URL"] = ACME; const entries = await runList(); - expect(entries.map((e) => e.slug)).toEqual(["acme-internal"]); + expect(entries.map((e) => e["slug"])).toEqual(["acme-internal"]); expect(requests).toEqual([`${ACME} acme-token`]); }); @@ -317,7 +318,7 @@ describe("org list across stored accounts", () => { const entries = await runList(); - expect(entries.map((e) => e.slug)).toEqual(["alpha"]); + expect(entries.map((e) => e["slug"])).toEqual(["alpha"]); expect(requests).toEqual([`${SAAS} saas-token`]); }); @@ -331,7 +332,7 @@ describe("org list across stored accounts", () => { const entries = await runList(); - expect(entries.map((e) => e.slug)).toEqual(["acme-internal"]); + expect(entries.map((e) => e["slug"])).toEqual(["acme-internal"]); expect(requests).toEqual([`${ACME} acme-token`]); expect(getActiveAccountId()).toBe(saas); }); @@ -344,7 +345,7 @@ describe("org list across stored accounts", () => { const entries = await runList({ limit: 2 }); - expect(entries.map((e) => e.slug)).toEqual(["alpha", "beta"]); + expect(entries.map((e) => e["slug"])).toEqual(["alpha", "beta"]); }); test("human output adds an ACCOUNT column", async () => { @@ -377,7 +378,7 @@ describe("org list filter", () => { filter: string, flags: { limit?: number } = {}, ): Promise { - return (await runList(flags, filter)).map((e) => e.slug as string); + return (await runList(flags, filter)).map((e) => e["slug"] as string); } test("matches the slug or name, ignoring case", async () => { @@ -436,22 +437,22 @@ describe("org list --account", () => { const entries = await runList({ account: "jane@acme.com" }); - expect(entries.map((e) => e.slug)).toEqual(["acme-internal"]); - expect(entries[0]?.account).toBeUndefined(); + expect(entries.map((e) => e["slug"])).toEqual(["acme-internal"]); + expect(entries[0]?.["account"]).toBeUndefined(); expect(requests).toEqual([`${ACME} acme-token`]); }); test("uses the account's own token even when an env token is forced", async () => { addAccount("acme-token", ACME, "jane@acme.com"); addAccount("saas-token", SAAS, "jane@example.com"); - process.env.SENTRY_AUTH_TOKEN = "env-token"; - process.env.SENTRY_FORCE_ENV_TOKEN = "1"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; + process.env["SENTRY_FORCE_ENV_TOKEN"] = "1"; orgsByToken["acme-token"] = [org("acme-internal", ACME)]; orgsByToken["env-token"] = [org("env-org")]; const entries = await runList({ account: "jane@acme.com" }); - expect(entries.map((e) => e.slug)).toEqual(["acme-internal"]); + expect(entries.map((e) => e["slug"])).toEqual(["acme-internal"]); expect(requests).toEqual([`${ACME} acme-token`]); }); @@ -468,7 +469,7 @@ describe("org list --account", () => { account: "jane@example.com:sentry.acme.com", }); - expect(entries.map((e) => e.slug)).toEqual(["acme-internal"]); + expect(entries.map((e) => e["slug"])).toEqual(["acme-internal"]); expect(requests).toEqual([`${ACME} acme-token`]); }); @@ -523,7 +524,7 @@ describe("org list --account", () => { describe("org list with an env token", () => { test("lists it as one more account, first, fetched only on its own server", async () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; addAccount("acme-token", ACME, "jane@acme.com"); addAccount("saas-token", SAAS, "jane@example.com"); orgsByToken["env-token"] = [org("ci-org")]; @@ -537,12 +538,12 @@ describe("org list with an env token", () => { const entries = await runList(); - expect(entries.map((e) => e.slug)).toEqual([ + expect(entries.map((e) => e["slug"])).toEqual([ "ci-org", "alpha", "acme-internal", ]); - expect(entries[0]?.account).toEqual({ + expect(entries[0]?.["account"]).toEqual({ name: "env:SENTRY_AUTH_TOKEN", id: "env:SENTRY_AUTH_TOKEN", email: "ci@example.com", @@ -560,7 +561,7 @@ describe("org list with an env token", () => { }); test("an org it shares with a login is listed under it, and commands then use it", async () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; addAccount("saas-token", SAAS, "jane@example.com"); orgsByToken["env-token"] = [org("shared")]; orgsByToken["saas-token"] = [org("shared"), org("alpha")]; @@ -573,14 +574,14 @@ describe("org list with an env token", () => { ["shared", ""], ["alpha", "jane@example.com"], ]); - expect(entries[0]?.account).toMatchObject({ + expect(entries[0]?.["account"]).toMatchObject({ name: "env:SENTRY_AUTH_TOKEN", }); expect(getAuthToken()).toBe("env-token"); }); test("is labeled by its variable when the server doesn't say whose it is", async () => { - process.env.SENTRY_TOKEN = "env-token"; + process.env["SENTRY_TOKEN"] = "env-token"; addAccount("saas-token", SAAS, "jane@example.com"); orgsByToken["env-token"] = [org("ci-org")]; orgsByToken["saas-token"] = [org("alpha")]; @@ -592,85 +593,85 @@ describe("org list with an env token", () => { test("uses its org auth token's server", async () => { const token = mintSntrysToken({ iat: 1, url: ACME, org: "ci-org" }); - process.env.SENTRY_AUTH_TOKEN = token; - process.env.SENTRY_URL = ACME; + process.env["SENTRY_AUTH_TOKEN"] = token; + process.env["SENTRY_URL"] = ACME; addAccount("acme-token", ACME, "jane@acme.com"); orgsByToken[token] = [org("ci-org", ACME)]; orgsByToken["acme-token"] = [org("acme-internal", ACME)]; const entries = await runList(); - expect(entries.map((e) => e.slug)).toEqual(["ci-org", "acme-internal"]); + expect(entries.map((e) => e["slug"])).toEqual(["ci-org", "acme-internal"]); expect(requests).toContain(`${ACME} ${token}`); expect(requests.some((r) => r.startsWith(`${SAAS} `))).toBe(false); }); test("leaves out a token on a self-hosted server only the env names", async () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; - process.env.SENTRY_URL = ACME; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; + process.env["SENTRY_URL"] = ACME; addAccount("acme-token", ACME, "jane@acme.com"); orgsByToken["env-token"] = [org("ci-org", ACME)]; orgsByToken["acme-token"] = [org("acme-internal", ACME)]; const entries = await runList(); - expect(entries.map((e) => e.slug)).toEqual(["acme-internal"]); + expect(entries.map((e) => e["slug"])).toEqual(["acme-internal"]); expect(requests.some((r) => r.includes("env-token"))).toBe(false); }); test("an explicit server set after boot on another server leaves it out", async () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; getEnvTokenHost(); addAccount("acme-token", ACME, "jane@acme.com"); addAccount("saas-token", SAAS, "jane@example.com"); - process.env.SENTRY_URL = ACME; + process.env["SENTRY_URL"] = ACME; orgsByToken["env-token"] = [org("ci-org")]; orgsByToken["acme-token"] = [org("acme-internal", ACME)]; const entries = await runList(); - expect(entries.map((e) => e.slug)).toEqual(["acme-internal"]); + expect(entries.map((e) => e["slug"])).toEqual(["acme-internal"]); expect(requests.some((r) => r.includes("env-token"))).toBe(false); }); test("alone, keeps the single-account output", async () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; orgsByToken["env-token"] = [org("ci-org")]; const entries = await runList(); - expect(entries.map((e) => e.slug)).toEqual(["ci-org"]); - expect(entries[0]?.account).toBeUndefined(); + expect(entries.map((e) => e["slug"])).toEqual(["ci-org"]); + expect(entries[0]?.["account"]).toBeUndefined(); }); test("forced, it is the only account listed", async () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; - process.env.SENTRY_FORCE_ENV_TOKEN = "1"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; + process.env["SENTRY_FORCE_ENV_TOKEN"] = "1"; addAccount("saas-token", SAAS, "jane@example.com"); orgsByToken["env-token"] = [org("ci-org")]; orgsByToken["saas-token"] = [org("alpha")]; const entries = await runList(); - expect(entries.map((e) => e.slug)).toEqual(["ci-org"]); + expect(entries.map((e) => e["slug"])).toEqual(["ci-org"]); expect(requests).toEqual([`${SAAS} env-token`]); }); test("--account env:SENTRY_AUTH_TOKEN lists only its orgs", async () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; addAccount("saas-token", SAAS, "jane@example.com"); orgsByToken["env-token"] = [org("ci-org")]; orgsByToken["saas-token"] = [org("alpha")]; const entries = await runList({ account: "env:SENTRY_AUTH_TOKEN" }); - expect(entries.map((e) => e.slug)).toEqual(["ci-org"]); + expect(entries.map((e) => e["slug"])).toEqual(["ci-org"]); expect(requests.some((r) => r.includes("saas-token"))).toBe(false); }); test("is not an account when it came from .sentryclirc after boot", async () => { getEnvTokenHost(); - process.env.SENTRY_AUTH_TOKEN = "rc-token"; + process.env["SENTRY_AUTH_TOKEN"] = "rc-token"; addAccount("acme-token", ACME, "jane@acme.com"); addAccount("saas-token", SAAS, "jane@example.com"); orgsByToken["rc-token"] = [org("rc-org")]; @@ -679,7 +680,7 @@ describe("org list with an env token", () => { const entries = await runList(); - expect(entries.map((e) => e.slug)).toEqual(["alpha", "acme-internal"]); + expect(entries.map((e) => e["slug"])).toEqual(["alpha", "acme-internal"]); expect(requests.some((r) => r.includes("rc-token"))).toBe(false); }); }); diff --git a/packages/cli/test/commands/platform/list.test.ts b/packages/cli/test/commands/platform/list.test.ts index 108e29253f..bd4315be50 100644 --- a/packages/cli/test/commands/platform/list.test.ts +++ b/packages/cli/test/commands/platform/list.test.ts @@ -11,18 +11,20 @@ import { listCommand } from "../../../src/commands/platform/list.js"; import type { SentryContext } from "../../../src/context.js"; import { EXIT, OutputError } from "../../../src/lib/errors.js"; import { VALID_PLATFORMS } from "../../../src/lib/platforms.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; function createMockContext(): { context: SentryContext; stdoutWrite: ReturnType; } { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { process, env: process.env, stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, stdin: process.stdin, cwd: "/tmp", homeDir: "/tmp", @@ -35,7 +37,7 @@ function createMockContext(): { describe("platform list", () => { test("lists all valid platforms by default", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: false }); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -47,7 +49,7 @@ describe("platform list", () => { test("--json outputs the full platform list as a JSON array", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: true }); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -58,7 +60,7 @@ describe("platform list", () => { test("--search filters to matching platforms only", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: false, search: "node" }); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -69,7 +71,7 @@ describe("platform list", () => { test("--search --json filters the JSON array too", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: true, search: "go-" }); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -80,7 +82,7 @@ describe("platform list", () => { test("--search with no matches exits non-zero with empty results, not a broken table", async () => { const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const err = await func .call(context, { json: false, search: "nonexistent-xyz-platform" }) diff --git a/packages/cli/test/commands/proguard/upload.test.ts b/packages/cli/test/commands/proguard/upload.test.ts index 54eba9c631..e94fb67836 100644 --- a/packages/cli/test/commands/proguard/upload.test.ts +++ b/packages/cli/test/commands/proguard/upload.test.ts @@ -15,6 +15,7 @@ import { uploadCommand } from "../../../src/commands/proguard/upload.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as proguardApi from "../../../src/lib/api/proguard.js"; import { ContextError, ValidationError } from "../../../src/lib/errors.js"; +import type { Writer } from "../../../src/types/index.js"; type UploadFuncFlags = { uuid?: string; @@ -31,8 +32,8 @@ type CmdFunc = ( function makeContext() { return { - stdout: { write: vi.fn(() => true) }, - stderr: { write: vi.fn(() => true) }, + stdout: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }; } @@ -45,11 +46,11 @@ describe("sentry proguard upload", () => { beforeEach(async () => { dir = mkdtempSync(join(tmpdir(), "sentry-proguard-upload-")); savedEnv = { - SENTRY_ORG: process.env.SENTRY_ORG, - SENTRY_PROJECT: process.env.SENTRY_PROJECT, + SENTRY_ORG: process.env["SENTRY_ORG"], + SENTRY_PROJECT: process.env["SENTRY_PROJECT"], }; - process.env.SENTRY_ORG = "test-org"; - process.env.SENTRY_PROJECT = "test-project"; + process.env["SENTRY_ORG"] = "test-org"; + process.env["SENTRY_PROJECT"] = "test-project"; func = (await uploadCommand.loader()) as unknown as CmdFunc; }); @@ -159,8 +160,8 @@ describe("sentry proguard upload", () => { }); test("--no-upload: does not require credentials", async () => { - delete process.env.SENTRY_ORG; - delete process.env.SENTRY_PROJECT; + delete process.env["SENTRY_ORG"]; + delete process.env["SENTRY_PROJECT"]; const f = join(dir, "mapping.txt"); writeFileSync(f, "void\n"); diff --git a/packages/cli/test/commands/project/create.test.ts b/packages/cli/test/commands/project/create.test.ts index eaa4973289..54a126637b 100644 --- a/packages/cli/test/commands/project/create.test.ts +++ b/packages/cli/test/commands/project/create.test.ts @@ -42,7 +42,13 @@ import type { ProjectCreatedResult } from "../../../src/lib/formatters/human.js" import * as resolveTarget from "../../../src/lib/resolve-target.js"; import { slugify } from "../../../src/lib/utils.js"; import type { SentryProject, SentryTeam } from "../../../src/types/index.js"; -import { parseFailure, useTestConfigDir } from "../../helpers.js"; +import { + parseFailure, + useTestConfigDir, + loadCommand, + rejection, +} from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; const sampleTeam: SentryTeam = { id: "1", @@ -86,13 +92,13 @@ function createMockContext(): { context: SentryContext; stdoutWrite: ReturnType; } { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { process, env: process.env, stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, stdin: process.stdin, cwd: "/tmp", homeDir: "/tmp", @@ -144,8 +150,8 @@ describe("project create", () => { "https://abc@o123.ingest.us.sentry.io/999", ); listOrgsSpy.mockResolvedValue([ - { slug: "acme-corp", name: "Acme Corp" }, - { slug: "other-org", name: "Other Org" }, + { id: "1", slug: "acme-corp", name: "Acme Corp" }, + { id: "2", slug: "other-org", name: "Other Org" }, ]); }); @@ -161,7 +167,7 @@ describe("project create", () => { test("creates project with auto-detected org and single team", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "my-app:node"); expect(createProjectWithDsnSpy).toHaveBeenCalledWith( @@ -182,7 +188,7 @@ describe("project create", () => { test("parses org/name positional syntax", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "my-org/my-app:python"); // resolveOrg should receive the explicit org @@ -196,7 +202,7 @@ describe("project create", () => { "passes the paired platform %s to createProject", async (platform) => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, `my-app:${platform}`); expect(createProjectWithDsnSpy).toHaveBeenCalledWith( @@ -217,11 +223,11 @@ describe("project create", () => { "rejects the space-separated form %s — platform must use :", async (_label, args) => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); - const err = await func - .call(context, { json: false }, ...args) - .catch(parseFailure); + const err = parseFailure( + await rejection(func.call(context, { json: false }, ...args)), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("must use : syntax"); @@ -262,7 +268,7 @@ describe("project create", () => { test("splits historical colon-containing names on the final colon instead", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "my-org/api:europe:node"); expect(resolveOrgSpy).toHaveBeenCalledWith({ @@ -283,7 +289,7 @@ describe("project create", () => { listTeamsSpy.mockResolvedValue([sampleTeam, sampleTeam2]); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { team: "mobile", json: false }, "my-app:go"); // listTeams should NOT be called when --team is explicit @@ -303,7 +309,7 @@ describe("project create", () => { listTeamsSpy.mockResolvedValue([nonMemberTeam, sampleTeam]); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "my-app:node"); // Should auto-select the one team the user is a member of @@ -324,7 +330,7 @@ describe("project create", () => { ]); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "my-app:node"); expect(createProjectWithDsnSpy).toHaveBeenCalledWith( @@ -347,7 +353,7 @@ describe("project create", () => { ]); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "my-app:node"); // infra is older and admin, but the user is not a member of it @@ -365,7 +371,7 @@ describe("project create", () => { ]); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "my-app:node"); expect(createProjectWithDsnSpy).toHaveBeenCalledWith("acme-corp", "alpha", { @@ -383,7 +389,7 @@ describe("project create", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "my-app:node"); expect(createTeamSpy).toHaveBeenCalledWith("acme-corp", "my-app"); @@ -405,7 +411,7 @@ describe("project create", () => { resolveOrgSpy.mockResolvedValue(null); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await expect( func.call(context, { json: false }, "my-app:node"), @@ -422,11 +428,11 @@ describe("project create", () => { ); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); - const err = await func - .call(context, { json: false }, "my-app:node") - .catch((e: Error) => e); + const err = await rejection( + func.call(context, { json: false }, "my-app:node"), + ); expect(err).toBeInstanceOf(CliError); expect(err.message).toContain("already exists"); expect(err.message).toContain("sentry project view"); @@ -438,12 +444,12 @@ describe("project create", () => { ); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); // Use --team with a slug that doesn't match any team in the org - const err = await func - .call(context, { team: "nonexistent", json: false }, "my-app:node") - .catch((e: Error) => e); + const err = await rejection( + func.call(context, { team: "nonexistent", json: false }, "my-app:node"), + ); expect(err).toBeInstanceOf(CliError); expect(err.message).toContain("Team 'nonexistent' not found"); expect(err.message).toContain("Available teams:"); @@ -463,11 +469,11 @@ describe("project create", () => { // calls listTeams again and finds "engineering" in the list. const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); - const err = await func - .call(context, { json: false }, "my-app:node") - .catch((e: Error) => e); + const err = await rejection( + func.call(context, { json: false }, "my-app:node"), + ); expect(err).toBeInstanceOf(CliError); expect(err.message).toContain("exists but the request was rejected"); expect(err.message).toContain("permission"); @@ -485,11 +491,11 @@ describe("project create", () => { ); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); - const err = await func - .call(context, { json: false, team: "backend" }, "my-app:node") - .catch((e: Error) => e); + const err = await rejection( + func.call(context, { json: false, team: "backend" }, "my-app:node"), + ); expect(err).toBeInstanceOf(CliError); expect(err.message).toContain("Organization 'acme-corp' not found"); expect(err.message).toContain("Your organizations"); @@ -506,11 +512,11 @@ describe("project create", () => { ); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); - const err = await func - .call(context, { json: false, team: "backend" }, "my-app:node") - .catch((e: Error) => e); + const err = await rejection( + func.call(context, { json: false, team: "backend" }, "my-app:node"), + ); expect(err).toBeInstanceOf(CliError); expect(err.message).toContain("could not be created"); expect(err.message).toContain("may not exist, or you may lack access"); @@ -518,11 +524,13 @@ describe("project create", () => { test("rejects invalid platform client-side without API call", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); - const err = await func - .call(context, { json: false }, "my-app:javascript-node") - .catch(parseFailure); + const err = parseFailure( + await rejection( + func.call(context, { json: false }, "my-app:javascript-node"), + ), + ); expect(err).toBeInstanceOf(ValidationError); expect((err as ValidationError).exitCode).toBe(EXIT.VALIDATION); expect(err.message).toContain("Invalid platform 'javascript-node'"); @@ -544,12 +552,12 @@ describe("project create", () => { ); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); // Use a valid platform so client-side check passes, but API rejects - const err = await func - .call(context, { json: false }, "my-app:node") - .catch((e: Error) => e); + const err = await rejection( + func.call(context, { json: false }, "my-app:node"), + ); expect(err).toBeInstanceOf(CliError); expect(err.message).toContain("Invalid platform 'node'"); expect(err.message).toContain("Common platforms:"); @@ -563,11 +571,11 @@ describe("project create", () => { ); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); - const err = (await func - .call(context, { json: false }, "my-app:node") - .catch((e: Error) => e)) as ApiError; + const err = (await rejection( + func.call(context, { json: false }, "my-app:node"), + )) as ApiError; // Stays ApiError (not a plain CliError wrapper) so 5xx errors are // captured for error reporting. expect(err).toBeInstanceOf(ApiError); @@ -591,7 +599,7 @@ describe("project create", () => { }); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "my-app:node"); expect(createProjectWithAutoTeamSpy).toHaveBeenCalledWith("acme-corp", { @@ -609,10 +617,10 @@ describe("project create", () => { ), ); const { context } = createMockContext(); - const func = await createCommand.loader(); - const err = (await func - .call(context, { json: false }, "my-cool-app:node") - .catch((e: Error) => e)) as ApiError; + const func = await loadCommand(createCommand); + const err = (await rejection( + func.call(context, { json: false }, "my-cool-app:node"), + )) as ApiError; expect(err).toBeInstanceOf(ApiError); expect(err.status).toBe(400); expect(err.detail).toContain("no more than 50 characters"); @@ -631,10 +639,10 @@ describe("project create", () => { ), ); const { context } = createMockContext(); - const func = await createCommand.loader(); - const err = (await func - .call(context, { json: false }, "my-cool-app:node") - .catch((e: Error) => e)) as ApiError; + const func = await loadCommand(createCommand); + const err = (await rejection( + func.call(context, { json: false }, "my-cool-app:node"), + )) as ApiError; expect(err).toBeInstanceOf(ApiError); expect(err.status).toBe(400); expect(err.message).toContain("Failed to create project 'my-cool-app'"); @@ -654,10 +662,10 @@ describe("project create", () => { ), ); const { context } = createMockContext(); - const func = await createCommand.loader(); - const err = await func - .call(context, { json: false }, "my-app:node") - .catch((error: Error) => error); + const func = await loadCommand(createCommand); + const err = await rejection( + func.call(context, { json: false }, "my-app:node"), + ); expect(err).toBeInstanceOf(CliError); expect(err.message).toContain("Invalid platform 'node'"); @@ -673,11 +681,11 @@ describe("project create", () => { // createProjectWithAutoTeamSpy already defaults to "disabled this feature" 403 const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); - const err = (await func - .call(context, { json: false }, "my-app:node") - .catch((e: Error) => e)) as ApiError; + const err = (await rejection( + func.call(context, { json: false }, "my-app:node"), + )) as ApiError; expect(err).toBeInstanceOf(ApiError); expect(err.status).toBe(403); expect(err.message).toContain("disabled project creation for members"); @@ -685,7 +693,7 @@ describe("project create", () => { test("outputs JSON when --json flag is set", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: true }, "my-app:node"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -704,7 +712,7 @@ describe("project create", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "my-app:node"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -715,18 +723,18 @@ describe("project create", () => { test("errors on invalid org/name syntax", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); // Missing name after slash - const err = await func - .call(context, { json: false }, "acme-corp/:node") - .catch(parseFailure); + const err = parseFailure( + await rejection(func.call(context, { json: false }, "acme-corp/:node")), + ); expect(err).toBeInstanceOf(ContextError); }); test("shows platform in human output", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "my-app:python-django"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -735,7 +743,7 @@ describe("project create", () => { test("shows project URL in human output", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "my-app:node"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -753,7 +761,7 @@ describe("project create", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "my-app:node"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -764,7 +772,7 @@ describe("project create", () => { test("does not show slug note when slug matches name", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "my-app:node"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -773,9 +781,11 @@ describe("project create", () => { test("shows helpful error when name is missing", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); - const err = await func.call(context, { json: false }).catch(parseFailure); + const err = parseFailure( + await rejection(func.call(context, { json: false })), + ); expect(err).toBeInstanceOf(ContextError); expect(err.message).toContain("Project specification is required"); expect(err.message).toContain( @@ -787,11 +797,11 @@ describe("project create", () => { "rejects an empty project name argument (%j)", async (name) => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); - const err = await func - .call(context, { json: false }, `${name}:node`) - .catch(parseFailure); + const err = parseFailure( + await rejection(func.call(context, { json: false }, `${name}:node`)), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("Project name cannot be empty"); }, @@ -801,11 +811,11 @@ describe("project create", () => { "shows a helpful error when platform is missing from %s", async (projectArg) => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); - const err = await func - .call(context, { json: false }, projectArg) - .catch(parseFailure); + const err = parseFailure( + await rejection(func.call(context, { json: false }, projectArg)), + ); expect(err).toBeInstanceOf(ValidationError); expect((err as ValidationError).exitCode).toBe(EXIT.VALIDATION); expect(err.message).toContain("Platform is required"); @@ -820,11 +830,13 @@ describe("project create", () => { test("rejects trailing-platform batches that were never supported", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); - const err = await func - .call(context, { json: false }, "web", "api", "node") - .catch(parseFailure); + const err = parseFailure( + await rejection( + func.call(context, { json: false }, "web", "api", "node"), + ), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("must use : syntax"); expect(createProjectWithDsnSpy).not.toHaveBeenCalled(); @@ -836,11 +848,11 @@ describe("project create", () => { ); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); - const err = await func - .call(context, { json: false }, "my-app:node") - .catch((e: Error) => e); + const err = await rejection( + func.call(context, { json: false }, "my-app:node"), + ); expect(err).toBeInstanceOf(ResolutionError); expect(err.message).toContain("acme-corp"); expect(err.message).toContain("not found"); @@ -859,11 +871,11 @@ describe("project create", () => { ); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); - const err = await func - .call(context, { json: false }, "my-app:node") - .catch((e: Error) => e); + const err = await rejection( + func.call(context, { json: false }, "my-app:node"), + ); expect(err).toBeInstanceOf(ResolutionError); expect(err.message).toContain("auto-detected from test/mocks/routes.ts"); expect(err.message).toContain("123"); @@ -880,11 +892,11 @@ describe("project create", () => { ); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); - const err = (await func - .call(context, { json: false }, "my-app:node") - .catch((e: Error) => e)) as ApiError; + const err = (await rejection( + func.call(context, { json: false }, "my-app:node"), + )) as ApiError; expect(err).toBeInstanceOf(ApiError); expect(err.status).toBe(403); expect(err.message).toContain("disabled project creation for members"); @@ -892,7 +904,7 @@ describe("project create", () => { test("auto-corrects dot-separated platform to hyphen-separated", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "my-app:javascript.nextjs"); // Should send corrected platform to API @@ -908,7 +920,7 @@ describe("project create", () => { test("does not correct platform without dots", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "my-app:javascript-nextjs"); // Should send platform as-is to API (no correction needed) @@ -924,19 +936,21 @@ describe("project create", () => { test("auto-corrects multiple dots in platform then validates", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); // python.django.rest → python-django-rest (not a valid platform) - const err = await func - .call(context, { json: false }, "my-app:python.django.rest") - .catch(parseFailure); + const err = parseFailure( + await rejection( + func.call(context, { json: false }, "my-app:python.django.rest"), + ), + ); expect(err).toBeInstanceOf(CliError); expect(err.message).toContain("Invalid platform 'python-django-rest'"); }); test("creates multiple projects with independent platforms", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call( context, { json: false }, @@ -967,7 +981,7 @@ describe("project create", () => { (_, index) => `project-${index}:node`, ); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, ...specs); @@ -984,7 +998,7 @@ describe("project create", () => { .mockResolvedValueOnce(createdProjectDetails("web")) .mockResolvedValueOnce(createdProjectDetails("api")); const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: true }, "web:node", "api:node"); const output = stdoutWrite.mock.calls.map((call) => call[0]).join(""); @@ -1005,10 +1019,10 @@ describe("project create", () => { .mockResolvedValueOnce(createdProjectDetails("web")) .mockRejectedValueOnce(new ApiError("Server Error", 500)); const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); - const error = await func - .call(context, { json: false }, "web:node", "api:node") - .catch((caught: Error) => caught); + const func = await loadCommand(createCommand); + const error = await rejection( + func.call(context, { json: false }, "web:node", "api:node"), + ); expect(error).toBeInstanceOf(ApiError); const output = stdoutWrite.mock.calls.map((call) => call[0]).join(""); @@ -1021,10 +1035,10 @@ describe("project create", () => { .mockResolvedValueOnce(createdProjectDetails("web")) .mockRejectedValueOnce(new ApiError("Server Error", 500)); const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); - const error = await func - .call(context, { json: true }, "web:node", "api:node") - .catch((caught: Error) => caught); + const func = await loadCommand(createCommand); + const error = await rejection( + func.call(context, { json: true }, "web:node", "api:node"), + ); expect(error).toBeInstanceOf(ApiError); const output = stdoutWrite.mock.calls.map((call) => call[0]).join(""); @@ -1034,10 +1048,17 @@ describe("project create", () => { test("invalid platform identifies its project pair", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); - const err = await func - .call(context, { json: false }, "proj1:node", "proj2:not-a-platform") - .catch(parseFailure); + const func = await loadCommand(createCommand); + const err = parseFailure( + await rejection( + func.call( + context, + { json: false }, + "proj1:node", + "proj2:not-a-platform", + ), + ), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain("Invalid platform 'not-a-platform'"); expect(err.message).toContain("sentry project create proj2:"); @@ -1047,10 +1068,10 @@ describe("project create", () => { "rejects whitespace in a %s project name", async (_syntax, args) => { const { context } = createMockContext(); - const func = await createCommand.loader(); - const err = await func - .call(context, { json: false }, ...args) - .catch(parseFailure); + const func = await loadCommand(createCommand); + const err = parseFailure( + await rejection(func.call(context, { json: false }, ...args)), + ); expect(err).toBeInstanceOf(ValidationError); expect(err.message).toContain( @@ -1062,7 +1083,7 @@ describe("project create", () => { test("preserves commas inside a project name", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "payments,eu:node"); expect(createProjectWithDsnSpy).toHaveBeenCalledTimes(1); @@ -1075,7 +1096,7 @@ describe("project create", () => { test("preserves commas inside an organization-scoped project name", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "acme/web,api:node"); expect(resolveOrgSpy).toHaveBeenCalledWith( @@ -1090,7 +1111,7 @@ describe("project create", () => { test("splits a project specification on its final colon", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false }, "api:europe:node"); expect(createProjectWithDsnSpy).toHaveBeenCalledWith( @@ -1104,7 +1125,7 @@ describe("project create", () => { test("dry-run shows what would be created without API call", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false, "dry-run": true }, "my-app:node"); // Should NOT call createProject @@ -1123,7 +1144,7 @@ describe("project create", () => { test("dry-run: multi-project empty org previews one shared team", async () => { listTeamsSpy.mockResolvedValue([]); const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call( context, { json: false, "dry-run": true }, @@ -1146,22 +1167,24 @@ describe("project create", () => { test("dry-run still validates platform", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); - - const err = await func - .call( - context, - { json: false, "dry-run": true }, - "my-app:invalid-platform", - ) - .catch(parseFailure); + const func = await loadCommand(createCommand); + + const err = parseFailure( + await rejection( + func.call( + context, + { json: false, "dry-run": true }, + "my-app:invalid-platform", + ), + ), + ); expect(err).toBeInstanceOf(CliError); expect(err.message).toContain("Invalid platform"); }); test("dry-run still resolves org", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call( context, { json: false, "dry-run": true }, @@ -1176,7 +1199,7 @@ describe("project create", () => { test("dry-run outputs JSON when --json is set", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: true, "dry-run": true }, "my-app:node"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -1196,7 +1219,7 @@ describe("project create", () => { test("dry-run outputs one JSON array for multiple projects", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call( context, { json: true, "dry-run": true }, @@ -1214,7 +1237,7 @@ describe("project create", () => { test("dry-run shows team source for auto-selected teams", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false, "dry-run": true }, "my-app:node"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -1226,7 +1249,7 @@ describe("project create", () => { listTeamsSpy.mockResolvedValue([]); const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { json: false, "dry-run": true }, "my-app:node"); // Should NOT call createTeam @@ -1244,7 +1267,7 @@ describe("project create", () => { listTeamsSpy.mockResolvedValue([]); const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); // "!!!" has no characters slugify() keeps, so it alone can't name the // auto-created team — the batch should still share "my-app" instead of // rejecting every project with "No teams found". diff --git a/packages/cli/test/commands/project/delete.test.ts b/packages/cli/test/commands/project/delete.test.ts index 3013bd1631..de41ae9a3d 100644 --- a/packages/cli/test/commands/project/delete.test.ts +++ b/packages/cli/test/commands/project/delete.test.ts @@ -8,7 +8,15 @@ * to control the answer. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; // Mock isatty so deleteCommand's non-interactive guard passes. // Bun's ESM wrapper for CJS built-ins exposes `default` + `ReadStream` + @@ -87,12 +95,8 @@ const { deleteCommand } = vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -102,17 +106,15 @@ import { ApiError, ContextError } from "../../../src/lib/errors.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; import type { SentryProject } from "../../../src/types/index.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; const sampleProject: SentryProject = { id: "999", @@ -126,8 +128,8 @@ const sampleProject: SentryProject = { const defaultFlags = { yes: true, force: false, "dry-run": false }; function createMockContext() { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -141,10 +143,12 @@ function createMockContext() { } describe("project delete", () => { - let getProjectSpy: ReturnType; - let deleteProjectSpy: ReturnType; - let getOrganizationSpy: ReturnType; - let resolveProjectBoundTargetSpy: ReturnType; + let getProjectSpy: MockInstance<(typeof apiClient)["getProject"]>; + let deleteProjectSpy: MockInstance<(typeof apiClient)["deleteProject"]>; + let getOrganizationSpy: MockInstance<(typeof apiClient)["getOrganization"]>; + let resolveProjectBoundTargetSpy: MockInstance< + (typeof resolveTarget)["resolveProjectBoundTarget"] + >; beforeEach(() => { getProjectSpy = vi.spyOn(apiClient, "getProject"); @@ -178,7 +182,7 @@ describe("project delete", () => { test("deletes project with explicit org/project and --yes", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call(context, defaultFlags, "acme-corp/my-app"); expect(getProjectSpy).toHaveBeenCalledWith("acme-corp", "my-app"); @@ -192,7 +196,7 @@ describe("project delete", () => { test("delegates to resolveProjectBoundTarget for resolution", async () => { const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call(context, defaultFlags, "acme-corp/my-app"); expect(resolveProjectBoundTargetSpy).toHaveBeenCalledWith( @@ -208,7 +212,7 @@ describe("project delete", () => { test("resolves bare slug via resolveProjectBoundTarget", async () => { const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call(context, defaultFlags, "my-app"); expect(resolveProjectBoundTargetSpy).toHaveBeenCalledWith( @@ -224,7 +228,7 @@ describe("project delete", () => { test("errors in non-interactive mode without --yes", async () => { const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); // isatty(0) returns false in test environments (non-TTY) await expect( @@ -240,7 +244,7 @@ describe("project delete", () => { ); const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await expect( func.call(context, defaultFlags, "acme-corp/my-app"), @@ -261,7 +265,7 @@ describe("project delete", () => { }); const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); try { await func.call(context, defaultFlags, "acme-corp/my-app"); @@ -288,7 +292,7 @@ describe("project delete", () => { }); const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); try { await func.call(context, defaultFlags, "acme-corp/my-app"); @@ -310,7 +314,7 @@ describe("project delete", () => { getOrganizationSpy.mockRejectedValue(new Error("network error")); const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); try { await func.call(context, defaultFlags, "acme-corp/my-app"); @@ -327,7 +331,7 @@ describe("project delete", () => { test("verifies project exists before attempting delete", async () => { const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call(context, defaultFlags, "acme-corp/my-app"); // getProject must be called before deleteProject @@ -340,7 +344,7 @@ describe("project delete", () => { test("dry-run shows what would be deleted without calling deleteProject", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call( context, { ...defaultFlags, "dry-run": true }, @@ -358,7 +362,7 @@ describe("project delete", () => { test("dry-run outputs JSON when --json is also set", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call( context, { ...defaultFlags, "dry-run": true, json: true }, @@ -378,7 +382,7 @@ describe("project delete", () => { test("JSON output for actual deletion", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call( context, { ...defaultFlags, json: true }, @@ -396,7 +400,7 @@ describe("project delete", () => { test("--fields filters the JSON output", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call( context, { ...defaultFlags, json: true, fields: ["project"] }, @@ -409,7 +413,7 @@ describe("project delete", () => { test("rejects auto-detect target", async () => { const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); // Empty string triggers auto-detect in parseOrgProjectArg await expect(func.call(context, defaultFlags, "")).rejects.toThrow( @@ -428,16 +432,18 @@ describe("project delete", () => { * returns a controllable value). */ describe("project delete — interactive confirmation", () => { - let getProjectSpy: ReturnType; - let deleteProjectSpy: ReturnType; - let resolveProjectBoundTargetSpy: ReturnType; + let getProjectSpy: MockInstance<(typeof apiClient)["getProject"]>; + let deleteProjectSpy: MockInstance<(typeof apiClient)["deleteProject"]>; + let resolveProjectBoundTargetSpy: MockInstance< + (typeof resolveTarget)["resolveProjectBoundTarget"] + >; function createPromptMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", commandPrefix: ["sentry", "project", "delete"], }, @@ -476,7 +482,7 @@ describe("project delete — interactive confirmation", () => { mockPrompt.mockResolvedValue("acme-corp/my-app"); const { context, stdoutWrite } = createPromptMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call( context, { yes: false, "dry-run": false }, @@ -492,7 +498,7 @@ describe("project delete — interactive confirmation", () => { mockPrompt.mockResolvedValue("wrong-org/wrong-project"); const { context } = createPromptMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call( context, { yes: false, "dry-run": false }, @@ -508,7 +514,7 @@ describe("project delete — interactive confirmation", () => { mockPrompt.mockResolvedValue(Symbol("clack:cancel")); const { context } = createPromptMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call( context, { yes: false, "dry-run": false }, @@ -523,7 +529,7 @@ describe("project delete — interactive confirmation", () => { mockPrompt.mockResolvedValue(""); const { context } = createPromptMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call( context, { yes: false, "dry-run": false }, @@ -537,7 +543,7 @@ describe("project delete — interactive confirmation", () => { mockPrompt.mockResolvedValue("acme-corp/my-app"); const { context } = createPromptMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call( context, { yes: false, "dry-run": false }, diff --git a/packages/cli/test/commands/project/list.test.ts b/packages/cli/test/commands/project/list.test.ts index bda2dd28c5..4a3f745f07 100644 --- a/packages/cli/test/commands/project/list.test.ts +++ b/packages/cli/test/commands/project/list.test.ts @@ -14,6 +14,7 @@ import { property, tuple, } from "fast-check"; +import type { SentryContext } from "../../../src/context.js"; import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; import { buildContextKey, @@ -46,7 +47,12 @@ import { ValidationError, } from "../../../src/lib/errors.js"; import type { SentryProject } from "../../../src/types/index.js"; -import { useTestConfigDir } from "../../helpers.js"; +import { + useTestConfigDir, + loadCommand, + type TestCommandFunction, + at, +} from "../../helpers.js"; import { DEFAULT_NUM_RUNS } from "../../model-based/helpers.js"; const getConfigDir = useTestConfigDir("test-project-list-", { @@ -304,7 +310,6 @@ function mockProjectFetch( options: { hasMore?: boolean; nextCursor?: string } = {}, ): typeof globalThis.fetch { const { hasMore = false, nextCursor } = options; - // @ts-expect-error - partial mock return async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -568,11 +573,11 @@ describe("handleExplicit", () => { describe("project list: comma-separated project slugs", () => { const flags = { limit: 30, json: false, fresh: false }; - let func: Awaited>; + let func: TestCommandFunction; beforeEach(async () => { originalFetch = globalThis.fetch; - func = await listCommand.loader(); + func = await loadCommand(listCommand); setAuthToken("test-token"); setOrgRegion("test-org", DEFAULT_SENTRY_URL); }); @@ -935,7 +940,6 @@ describe("handleOrgAll", () => { ); const perPageValues: number[] = []; - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const parsed = new URL(req.url); @@ -1012,7 +1016,6 @@ describe("handleProjectSearch", () => { test("not found throws ResolutionError", async () => { // Mock returning orgs but 404 for project lookups - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -1044,7 +1047,6 @@ describe("handleProjectSearch", () => { }); test("not found with --json returns empty items", async () => { - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -1106,7 +1108,6 @@ describe("handleProjectSearch", () => { // listOrganizations returns two orgs; each has a 'frontend' project. The // bare-slug lookup fans out across both. With scopedOrg=org-a the result // must only contain org-a's project, never org-b's. - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -1171,7 +1172,6 @@ describe("handleProjectSearch", () => { }; // Mock that returns 2 orgs, each with the same project slug - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -1225,7 +1225,6 @@ describe("handleProjectSearch", () => { status: "active", }; - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -1328,8 +1327,8 @@ describe("fetchOrgProjects", () => { for (const p of result) { expect(p.orgSlug).toBe("myorg"); } - expect(result[0].slug).toBe("frontend"); - expect(result[1].slug).toBe("backend"); + expect(at(result, 0).slug).toBe("frontend"); + expect(at(result, 1).slug).toBe("backend"); }); test("returns empty array when org has no projects", async () => { @@ -1357,7 +1356,6 @@ describe("fetchOrgProjectsSafe", () => { }); test("returns empty array on non-auth error", async () => { - // @ts-expect-error - partial mock globalThis.fetch = async () => new Response(JSON.stringify({ detail: "Forbidden" }), { status: 403, @@ -1370,14 +1368,14 @@ describe("fetchOrgProjectsSafe", () => { // Clear auth token so the API client throws AuthError before making any request await clearAuth(); - const savedAuthToken = process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_AUTH_TOKEN; + const savedAuthToken = process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_AUTH_TOKEN"]; try { await expect(fetchOrgProjectsSafe("myorg")).rejects.toThrow(AuthError); } finally { if (savedAuthToken !== undefined) { - process.env.SENTRY_AUTH_TOKEN = savedAuthToken; + process.env["SENTRY_AUTH_TOKEN"] = savedAuthToken; } } }); @@ -1409,7 +1407,6 @@ describe("fetchAllOrgProjects", () => { test("skips orgs with access errors", async () => { let callCount = 0; - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -1525,7 +1522,7 @@ describe("handleAutoDetect", () => { expect(result.items).toHaveLength(2); expect(result.hasMore).toBe(true); expect(result.jsonExtra).toBeDefined(); - expect(result.jsonExtra?.hint).toBeString(); + expect(result.jsonExtra?.["hint"]).toBeString(); }); test("respects --platform flag", async () => { @@ -1609,7 +1606,7 @@ describe("handleAutoDetect", () => { expect(result.hasMore).toBe(true); expect(result.items).toHaveLength(2); expect(result.jsonExtra).toBeDefined(); - const jsonHint = result.jsonExtra?.hint; + const jsonHint = result.jsonExtra?.["hint"]; expect(jsonHint).toContain("test-org/"); expect(jsonHint).toContain("--json"); }); @@ -1629,7 +1626,7 @@ describe("handleAutoDetect", () => { }); expect(result.hasMore).toBe(true); - const jsonHint = result.jsonExtra?.hint; + const jsonHint = result.jsonExtra?.["hint"]; expect(jsonHint).toBe("sentry project list 'test-org/web-*' --json"); }); @@ -1656,7 +1653,6 @@ describe("handleAutoDetect", () => { test("fast path: non-auth API errors return empty results instead of throwing", async () => { setDefaultOrganization("test-org"); // Mock returns 403 for projects endpoint (stale org, no access) - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); if (req.url.includes("/projects/")) { @@ -1682,8 +1678,8 @@ describe("handleAutoDetect", () => { // Clear auth so getAuthToken() throws AuthError before any fetch await clearAuth(); - const savedAuthToken = process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_AUTH_TOKEN; + const savedAuthToken = process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_AUTH_TOKEN"]; try { await expect( @@ -1695,7 +1691,7 @@ describe("handleAutoDetect", () => { ).rejects.toThrow(AuthError); } finally { if (savedAuthToken !== undefined) { - process.env.SENTRY_AUTH_TOKEN = savedAuthToken; + process.env["SENTRY_AUTH_TOKEN"] = savedAuthToken; } } }); @@ -1731,11 +1727,11 @@ describe("project list: name filter", () => { status: "active", }, ]; - let func: Awaited>; + let func: TestCommandFunction; beforeEach(async () => { originalFetch = globalThis.fetch; - func = await listCommand.loader(); + func = await loadCommand(listCommand); setAuthToken("test-token"); setOrgRegion("test-org", DEFAULT_SENTRY_URL); }); diff --git a/packages/cli/test/commands/project/view.func.test.ts b/packages/cli/test/commands/project/view.func.test.ts index ed8b984802..573d987e13 100644 --- a/packages/cli/test/commands/project/view.func.test.ts +++ b/packages/cli/test/commands/project/view.func.test.ts @@ -12,12 +12,8 @@ import { viewCommand } from "../../../src/commands/project/view.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -26,12 +22,8 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/browser.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -41,17 +33,15 @@ import { AuthError, ContextError } from "../../../src/lib/errors.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; -import type { ProjectKey, SentryProject } from "../../../src/types/sentry.js"; +import type { SentryProject } from "../../../src/types/sentry.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; const sampleProject: SentryProject = { id: "42", @@ -62,21 +52,12 @@ const sampleProject: SentryProject = { status: "active", }; -const _sampleKeys: ProjectKey[] = [ - { - id: "key-1", - name: "Default", - dsn: { public: "https://abc123@o1.ingest.sentry.io/42" }, - isActive: true, - }, -]; - function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", commandPrefix: ["sentry", "project", "view"], }, @@ -111,7 +92,7 @@ describe("viewCommand.func", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { json: true, web: false }, "my-org/test-project"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -129,7 +110,7 @@ describe("viewCommand.func", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, web: false }, @@ -145,7 +126,7 @@ describe("viewCommand.func", () => { openInBrowserSpy.mockResolvedValue(undefined); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { json: false, web: true }, "my-org/test-project"); expect(openInBrowserSpy).toHaveBeenCalled(); @@ -172,7 +153,7 @@ describe("viewCommand.func", () => { }); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); try { // No target arg triggers AutoDetect @@ -188,14 +169,14 @@ describe("viewCommand.func", () => { resolveProjectBoundSlugSpy.mockResolvedValue({ org: "acme", project: "frontend", + projectData: { ...sampleProject, slug: "frontend" }, }); - getProjectSpy.mockResolvedValue({ ...sampleProject, slug: "frontend" }); tryGetPrimaryDsnSpy.mockResolvedValue( "https://abc123@o1.ingest.sentry.io/42", ); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { json: true, web: false }, "frontend"); expect(resolveProjectBoundSlugSpy).toHaveBeenCalledWith( @@ -212,7 +193,7 @@ describe("viewCommand.func", () => { test("org-only target (org/) throws ContextError", async () => { const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); try { await func.call(context, { json: false, web: false }, "my-org/"); @@ -245,7 +226,7 @@ describe("viewCommand.func", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); // No target arg triggers AutoDetect await func.call(context, { json: false, web: false }); @@ -259,7 +240,7 @@ describe("viewCommand.func", () => { resolveAllTargetsSpy.mockResolvedValue({ targets: [] }); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect( func.call(context, { json: false, web: false }), @@ -273,7 +254,7 @@ describe("viewCommand.func", () => { }); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); try { await func.call(context, { json: false, web: false }); @@ -299,7 +280,7 @@ describe("viewCommand.func", () => { ); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect( func.call(context, { json: false, web: false }, "my-org/bad-project"), @@ -312,15 +293,15 @@ describe("viewCommand.func", () => { resolveProjectBoundSlugSpy.mockResolvedValue({ org: "acme", project: "frontend", + projectData: { ...sampleProject, slug: "frontend" }, }); + // The search already returned the project, so the DSN lookup is the + // only API call left on this path. const apiErr = new Error("403 Forbidden"); - getProjectSpy.mockRejectedValue(apiErr); - tryGetPrimaryDsnSpy.mockResolvedValue( - "https://abc123@o1.ingest.sentry.io/42", - ); + tryGetPrimaryDsnSpy.mockRejectedValue(apiErr); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect( func.call(context, { json: false, web: false }, "frontend"), @@ -349,7 +330,7 @@ describe("viewCommand.func", () => { ); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect( func.call(context, { json: false, web: false }), @@ -363,7 +344,7 @@ describe("viewCommand.func", () => { ); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect( func.call(context, { json: false, web: false }, "my-org/test-project"), @@ -383,7 +364,7 @@ describe("viewCommand.func", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { json: true, web: false }, "my-org/test-project"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -405,7 +386,7 @@ describe("viewCommand.func", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { json: true, web: false }, "my-org/test-project"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -420,7 +401,7 @@ describe("viewCommand.func", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { json: true, web: false }, "my-org/test-project"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -438,7 +419,7 @@ describe("viewCommand.func", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); // `fields` is auto-injected by the buildCommand wrapper; pass through // the flag shape the wrapper would forward. await func.call( diff --git a/packages/cli/test/commands/react-native/gradle.test.ts b/packages/cli/test/commands/react-native/gradle.test.ts index 2635d085d7..a056d222cc 100644 --- a/packages/cli/test/commands/react-native/gradle.test.ts +++ b/packages/cli/test/commands/react-native/gradle.test.ts @@ -8,13 +8,22 @@ import { mkdtemp, readFile, rm, writeFile } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join } from "node:path"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + type MockInstance, + test, + vi, +} from "vitest"; import { gradleCommand } from "../../../src/commands/react-native/gradle.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as sourcemaps from "../../../src/lib/api/sourcemaps.js"; import { ValidationError } from "../../../src/lib/errors.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; +import { loadCommand, at } from "../../helpers.js"; let tmpDir: string; let bundle: string; @@ -42,7 +51,7 @@ function createContext() { } describe("react-native gradle", () => { - let uploadSpy: ReturnType; + let uploadSpy: MockInstance<(typeof sourcemaps)["uploadSourcemaps"]>; beforeEach(async () => { tmpDir = await mkdtemp(join(tmpdir(), "rn-gradle-")); @@ -60,6 +69,8 @@ describe("react-native gradle", () => { }), ); vi.spyOn(resolveTarget, "resolveOrgAndProject").mockResolvedValue({ + orgDisplay: "acme", + projectDisplay: "mobile", org: "acme", project: "mobile", }); @@ -74,11 +85,11 @@ describe("react-native gradle", () => { }); test("injects a debug id and uploads once (debug-id only)", async () => { - const func = await gradleCommand.loader(); + const func = await loadCommand(gradleCommand); await func.call(createContext().context, { bundle, sourcemap }); expect(uploadSpy).toHaveBeenCalledTimes(1); - const opts = uploadSpy.mock.calls[0][0] as sourcemaps.UploadOptions; + const opts = at(uploadSpy.mock.calls, 0)[0]; expect(opts.org).toBe("acme"); expect(opts.project).toBe("mobile"); expect(opts.release).toBeUndefined(); @@ -90,13 +101,13 @@ describe("react-native gradle", () => { type: "minified_source", sourcemapFilename: "index.android.bundle.map", }); - expect(opts.files[0].debugId).toMatch(/[0-9a-f-]{36}/); + expect(at(opts.files, 0).debugId).toMatch(/[0-9a-f-]{36}/); // The bundle on disk now carries the injected debug id. expect(await readFile(bundle, "utf8")).toContain("debugId"); }); test("uploads once per distribution when a release is given", async () => { - const func = await gradleCommand.loader(); + const func = await loadCommand(gradleCommand); await func.call(createContext().context, { bundle, sourcemap, @@ -105,37 +116,35 @@ describe("react-native gradle", () => { }); expect(uploadSpy).toHaveBeenCalledTimes(2); - const dists = uploadSpy.mock.calls.map( - (c) => (c[0] as sourcemaps.UploadOptions).dist, - ); + const dists = uploadSpy.mock.calls.map((c) => c[0].dist); expect(dists).toEqual(["1000", "1001"]); for (const call of uploadSpy.mock.calls) { - expect((call[0] as sourcemaps.UploadOptions).release).toBe("1.0.0"); + expect(call[0].release).toBe("1.0.0"); } }); test("threads --wait / --wait-for into the upload", async () => { - const func = await gradleCommand.loader(); + const func = await loadCommand(gradleCommand); await func.call(createContext().context, { bundle, sourcemap }); - expect(uploadSpy.mock.calls[0][0]).toMatchObject({ wait: false }); + expect(at(uploadSpy.mock.calls, 0)[0]).toMatchObject({ wait: false }); await func.call(createContext().context, { bundle, sourcemap, wait: true }); - expect(uploadSpy.mock.calls[1][0]).toMatchObject({ wait: true }); + expect(at(uploadSpy.mock.calls, 1)[0]).toMatchObject({ wait: true }); await func.call(createContext().context, { bundle, sourcemap, "wait-for": 30, }); - expect(uploadSpy.mock.calls[2][0]).toMatchObject({ + expect(at(uploadSpy.mock.calls, 2)[0]).toMatchObject({ wait: true, maxWaitMs: 30_000, }); }); test("rejects a missing bundle", async () => { - const func = await gradleCommand.loader(); + const func = await loadCommand(gradleCommand); await expect( func.call(createContext().context, { bundle: join(tmpDir, "nope.bundle"), @@ -146,7 +155,7 @@ describe("react-native gradle", () => { test("rejects an indexed RAM bundle", async () => { await writeFile(bundle, Buffer.from([0xe5, 0xd1, 0x0b, 0xfb, 0x00, 0x00])); - const func = await gradleCommand.loader(); + const func = await loadCommand(gradleCommand); await expect( func.call(createContext().context, { bundle, sourcemap }), ).rejects.toThrow(/RAM bundle/); diff --git a/packages/cli/test/commands/react-native/xcode.test.ts b/packages/cli/test/commands/react-native/xcode.test.ts index 58ec89242e..94b96a042a 100644 --- a/packages/cli/test/commands/react-native/xcode.test.ts +++ b/packages/cli/test/commands/react-native/xcode.test.ts @@ -6,16 +6,18 @@ * release wrap+upload) can be exercised off-device. */ -import { spawnSync } from "node:child_process"; +import { type SpawnSyncOptions, spawnSync } from "node:child_process"; import { mkdtempSync, rmSync, writeFileSync } from "node:fs"; import { tmpdir } from "node:os"; import { join } from "node:path"; import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import type { SentryContext } from "../../../src/context.js"; import { xcodeCommand } from "../../../src/commands/react-native/xcode.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as sourcemaps from "../../../src/lib/api/sourcemaps.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; +import { loadCommand, at } from "../../helpers.js"; vi.mock("node:child_process", async (importOriginal) => { const actual = await importOriginal(); @@ -44,9 +46,7 @@ function createContext(env: NodeJS.ProcessEnv) { cwd: dir, env, process: { ...process, execPath: "/usr/bin/sentry", exitCode: undefined }, - } as unknown as Parameters< - Awaited> - >[0]; + } satisfies Partial; } beforeEach(() => { @@ -55,6 +55,8 @@ beforeEach(() => { writeFileSync(script, "#!/bin/sh\ntrue\n"); spawnMock.mockClear(); vi.spyOn(resolveTarget, "resolveOrgAndProject").mockResolvedValue({ + orgDisplay: "acme", + projectDisplay: "mobile", org: "acme", project: "mobile", }); @@ -66,7 +68,7 @@ afterEach(() => { }); async function runXcode(env: NodeJS.ProcessEnv, flags = {}): Promise { - const func = await xcodeCommand.loader(); + const func = await loadCommand(xcodeCommand); await func.call(createContext(env), { "build-script": script, ...flags }); } @@ -78,7 +80,7 @@ describe("react-native xcode", () => { test("debug build just runs the script (no upload)", async () => { await runXcode({ CONFIGURATION: "Debug" }); expect(spawnMock).toHaveBeenCalledTimes(1); - expect(spawnMock.mock.calls[0][0]).toBe(script); + expect(at(spawnMock.mock.calls, 0)[0]).toBe(script); expect(sourcemaps.uploadSourcemaps).not.toHaveBeenCalled(); }); @@ -90,9 +92,9 @@ describe("react-native xcode", () => { ( _cmd: string, _args: readonly string[] | undefined, - spawnOpts?: { env?: NodeJS.ProcessEnv }, + spawnOpts?: SpawnSyncOptions, ) => { - const reportPath = spawnOpts?.env?.SENTRY_RN_SOURCEMAP_REPORT; + const reportPath = spawnOpts?.env?.["SENTRY_RN_SOURCEMAP_REPORT"]; if (reportPath) { writeFileSync( reportPath, @@ -124,12 +126,12 @@ describe("react-native xcode", () => { // Non-SEA (npm) run: NODE_BINARY must re-invoke the CLI via a shim, not // plain node, so RN re-enters the wrapper. - const wrapEnv = spawnMock.mock.calls[0][2]?.env; - expect(wrapEnv?.NODE_BINARY).toMatch(/sentry-rn-node\.sh$/); - expect(wrapEnv?.__SENTRY_RN_WRAP_XCODE_CALL).toBe("1"); + const wrapEnv = at(spawnMock.mock.calls, 0)[2]?.env; + expect(wrapEnv?.["NODE_BINARY"]).toMatch(/sentry-rn-node\.sh$/); + expect(wrapEnv?.["__SENTRY_RN_WRAP_XCODE_CALL"]).toBe("1"); expect(sourcemaps.uploadSourcemaps).toHaveBeenCalledTimes(1); - const opts = vi.mocked(sourcemaps.uploadSourcemaps).mock.calls[0][0]; + const opts = at(vi.mocked(sourcemaps.uploadSourcemaps).mock.calls, 0)[0]; expect(opts).toMatchObject({ org: "acme", project: "mobile", @@ -169,9 +171,9 @@ describe("react-native xcode", () => { ( _cmd: string, _args: readonly string[] | undefined, - spawnOpts?: { env?: NodeJS.ProcessEnv }, + spawnOpts?: SpawnSyncOptions, ) => { - const reportPath = spawnOpts?.env?.SENTRY_RN_SOURCEMAP_REPORT; + const reportPath = spawnOpts?.env?.["SENTRY_RN_SOURCEMAP_REPORT"]; if (reportPath) { if (reportState === "missing") { rmSync(reportPath); @@ -191,10 +193,10 @@ describe("react-native xcode", () => { ); const ctx = createContext({ CONFIGURATION: "Release" }); - const func = await xcodeCommand.loader(); + const func = await loadCommand(xcodeCommand); await func.call(ctx, { "build-script": script }); - expect(ctx.process.exitCode).toBe(status === 0 ? undefined : status); + expect(ctx["process"].exitCode).toBe(status === 0 ? undefined : status); expect(sourcemaps.uploadSourcemaps).not.toHaveBeenCalled(); }, ); @@ -204,9 +206,9 @@ describe("react-native xcode", () => { ( _cmd: string, _args: readonly string[] | undefined, - spawnOpts?: { env?: NodeJS.ProcessEnv }, + spawnOpts?: SpawnSyncOptions, ) => { - const reportPath = spawnOpts?.env?.SENTRY_RN_SOURCEMAP_REPORT; + const reportPath = spawnOpts?.env?.["SENTRY_RN_SOURCEMAP_REPORT"]; if (reportPath) { writeFileSync(reportPath, "{}"); } diff --git a/packages/cli/test/commands/release/archive.test.ts b/packages/cli/test/commands/release/archive.test.ts index 13e2ad245f..754e5cdb37 100644 --- a/packages/cli/test/commands/release/archive.test.ts +++ b/packages/cli/test/commands/release/archive.test.ts @@ -9,12 +9,8 @@ import { restoreCommand } from "../../../src/commands/release/restore.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -23,22 +19,19 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; import type { SentryRelease } from "../../../src/types/index.js"; -import { useTestConfigDir } from "../../helpers.js"; +import { useTestConfigDir, loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; useTestConfigDir("release-archive-"); -function makeRelease(status: string): SentryRelease { +function makeRelease(status: "archived" | "open"): SentryRelease { return { id: 1, version: "1.0.0", @@ -57,8 +50,8 @@ function makeRelease(status: string): SentryRelease { } function createMockContext(cwd = "/tmp") { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -89,7 +82,7 @@ describe("release archive", () => { updateReleaseSpy.mockResolvedValue(makeRelease("archived")); const { context, stdoutWrite } = createMockContext(); - const func = await archiveCommand.loader(); + const func = await loadCommand(archiveCommand); await func.call(context, { "dry-run": false, json: true }, "my-org/1.0.0"); expect(updateReleaseSpy).toHaveBeenCalledWith("my-org", "1.0.0", { @@ -103,7 +96,7 @@ describe("release archive", () => { resolveOrgSpy.mockResolvedValue({ org: "my-org" }); const { context } = createMockContext(); - const func = await archiveCommand.loader(); + const func = await loadCommand(archiveCommand); await func.call(context, { "dry-run": true, json: true }, "my-org/1.0.0"); expect(updateReleaseSpy).not.toHaveBeenCalled(); @@ -111,7 +104,7 @@ describe("release archive", () => { test("throws when no version provided", async () => { const { context } = createMockContext(); - const func = await archiveCommand.loader(); + const func = await loadCommand(archiveCommand); await expect( func.call(context, { "dry-run": false, json: false }), @@ -122,7 +115,7 @@ describe("release archive", () => { resolveOrgSpy.mockResolvedValue(null); const { context } = createMockContext(); - const func = await archiveCommand.loader(); + const func = await loadCommand(archiveCommand); await expect( func.call(context, { "dry-run": false, json: false }, "1.0.0"), @@ -149,7 +142,7 @@ describe("release restore", () => { updateReleaseSpy.mockResolvedValue(makeRelease("open")); const { context, stdoutWrite } = createMockContext(); - const func = await restoreCommand.loader(); + const func = await loadCommand(restoreCommand); await func.call(context, { "dry-run": false, json: true }, "my-org/1.0.0"); expect(updateReleaseSpy).toHaveBeenCalledWith("my-org", "1.0.0", { @@ -163,7 +156,7 @@ describe("release restore", () => { resolveOrgSpy.mockResolvedValue({ org: "my-org" }); const { context } = createMockContext(); - const func = await restoreCommand.loader(); + const func = await loadCommand(restoreCommand); await func.call(context, { "dry-run": true, json: true }, "my-org/1.0.0"); expect(updateReleaseSpy).not.toHaveBeenCalled(); @@ -171,7 +164,7 @@ describe("release restore", () => { test("throws when no version provided", async () => { const { context } = createMockContext(); - const func = await restoreCommand.loader(); + const func = await loadCommand(restoreCommand); await expect( func.call(context, { "dry-run": false, json: false }), @@ -182,7 +175,7 @@ describe("release restore", () => { resolveOrgSpy.mockResolvedValue(null); const { context } = createMockContext(); - const func = await restoreCommand.loader(); + const func = await loadCommand(restoreCommand); await expect( func.call(context, { "dry-run": false, json: false }, "1.0.0"), diff --git a/packages/cli/test/commands/release/create.test.ts b/packages/cli/test/commands/release/create.test.ts index 80af6635f6..ad933b4a16 100644 --- a/packages/cli/test/commands/release/create.test.ts +++ b/packages/cli/test/commands/release/create.test.ts @@ -2,18 +2,22 @@ * Release Create Command Tests */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { createCommand } from "../../../src/commands/release/create.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -22,18 +26,15 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; import type { SentryRelease } from "../../../src/types/index.js"; -import { useTestConfigDir } from "../../helpers.js"; +import { useTestConfigDir, loadCommand, at } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; useTestConfigDir("release-create-"); @@ -64,8 +65,8 @@ const sampleRelease: SentryRelease = { }; function createMockContext(cwd = "/tmp") { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -78,8 +79,8 @@ function createMockContext(cwd = "/tmp") { } describe("release create", () => { - let createReleaseSpy: ReturnType; - let resolveOrgSpy: ReturnType; + let createReleaseSpy: MockInstance<(typeof apiClient)["createRelease"]>; + let resolveOrgSpy: MockInstance<(typeof resolveTarget)["resolveOrg"]>; beforeEach(() => { createReleaseSpy = vi.spyOn(apiClient, "createRelease"); @@ -96,7 +97,7 @@ describe("release create", () => { createReleaseSpy.mockResolvedValue(sampleRelease); const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { finalize: false, json: true }, "my-org/1.0.0"); expect(createReleaseSpy).toHaveBeenCalledWith("my-org", { @@ -112,7 +113,7 @@ describe("release create", () => { createReleaseSpy.mockResolvedValue(sampleRelease); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call( context, { finalize: false, project: "my-project", json: true }, @@ -133,10 +134,10 @@ describe("release create", () => { }); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { finalize: true, json: true }, "1.0.0"); - const call = createReleaseSpy.mock.calls[0]; + const call = at(createReleaseSpy.mock.calls, 0); const body = call[1]; expect(body.dateReleased).toBeDefined(); expect(typeof body.dateReleased).toBe("string"); @@ -147,7 +148,7 @@ describe("release create", () => { createReleaseSpy.mockResolvedValue(sampleRelease); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call( context, { finalize: false, ref: "main", json: true }, @@ -164,7 +165,7 @@ describe("release create", () => { resolveOrgSpy.mockResolvedValue({ org: "my-org" }); const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call( context, { @@ -194,7 +195,7 @@ describe("release create", () => { resolveOrgSpy.mockResolvedValue({ org: "my-org" }); const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call( context, { @@ -216,7 +217,7 @@ describe("release create", () => { test("throws when no version provided", async () => { const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await expect( func.call(context, { finalize: false, json: false }), diff --git a/packages/cli/test/commands/release/delete.test.ts b/packages/cli/test/commands/release/delete.test.ts index 62958522bc..6582c907f6 100644 --- a/packages/cli/test/commands/release/delete.test.ts +++ b/packages/cli/test/commands/release/delete.test.ts @@ -6,18 +6,22 @@ * the func() body without real HTTP calls or database access. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { deleteCommand } from "../../../src/commands/release/delete.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -27,19 +31,17 @@ import { ApiError, ContextError } from "../../../src/lib/errors.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; +import { loadCommand } from "../../helpers.js"; +import type { SentryRelease, Writer } from "../../../src/types/index.js"; /** Minimal release shape returned by getRelease */ -const sampleRelease = { +const sampleRelease: SentryRelease = { id: 1, version: "1.0.0", shortVersion: "1.0.0", @@ -60,8 +62,8 @@ const defaultFlags = { }; function createMockContext() { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -74,9 +76,9 @@ function createMockContext() { } describe("release delete", () => { - let getReleaseSpy: ReturnType; - let deleteReleaseSpy: ReturnType; - let resolveOrgSpy: ReturnType; + let getReleaseSpy: MockInstance<(typeof apiClient)["getRelease"]>; + let deleteReleaseSpy: MockInstance<(typeof apiClient)["deleteRelease"]>; + let resolveOrgSpy: MockInstance<(typeof resolveTarget)["resolveOrg"]>; beforeEach(() => { getReleaseSpy = vi.spyOn(apiClient, "getRelease"); @@ -97,7 +99,7 @@ describe("release delete", () => { test("deletes release with explicit org/version and --yes", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call(context, defaultFlags, "my-org/1.0.0"); expect(getReleaseSpy).toHaveBeenCalledWith("my-org", "1.0.0"); @@ -110,7 +112,7 @@ describe("release delete", () => { test("throws ContextError when no version provided", async () => { const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await expect(func.call(context, defaultFlags, "")).rejects.toThrow( ContextError, @@ -120,7 +122,7 @@ describe("release delete", () => { test("dry-run shows what would be deleted without calling deleteRelease", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call( context, { ...defaultFlags, "dry-run": true }, @@ -141,7 +143,7 @@ describe("release delete", () => { ); const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await expect( func.call(context, defaultFlags, "my-org/1.0.0"), @@ -162,7 +164,7 @@ describe("release delete", () => { ); const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); try { await func.call(context, defaultFlags, "my-org/1.0.0"); @@ -189,7 +191,7 @@ describe("release delete", () => { deleteReleaseSpy.mockRejectedValue(originalError); const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); try { await func.call(context, defaultFlags, "my-org/1.0.0"); @@ -205,7 +207,7 @@ describe("release delete", () => { deleteReleaseSpy.mockRejectedValue(originalError); const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); try { await func.call(context, defaultFlags, "my-org/1.0.0"); @@ -217,7 +219,7 @@ describe("release delete", () => { test("verifies release exists before attempting delete", async () => { const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call(context, defaultFlags, "my-org/1.0.0"); // getRelease must be called before deleteRelease diff --git a/packages/cli/test/commands/release/deploy.test.ts b/packages/cli/test/commands/release/deploy.test.ts index c731cf7160..45dda66ef6 100644 --- a/packages/cli/test/commands/release/deploy.test.ts +++ b/packages/cli/test/commands/release/deploy.test.ts @@ -2,18 +2,22 @@ * Release Deploy Command Tests */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { deployCommand } from "../../../src/commands/release/deploy.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -22,18 +26,15 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; import type { SentryDeploy } from "../../../src/types/index.js"; -import { useTestConfigDir } from "../../helpers.js"; +import { useTestConfigDir, loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; useTestConfigDir("release-deploy-"); @@ -47,8 +48,8 @@ const sampleDeploy: SentryDeploy = { }; function createMockContext(cwd = "/tmp") { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -61,8 +62,10 @@ function createMockContext(cwd = "/tmp") { } describe("release deploy", () => { - let createRelaseDeploySpy: ReturnType; - let resolveOrgSpy: ReturnType; + let createRelaseDeploySpy: MockInstance< + (typeof apiClient)["createReleaseDeploy"] + >; + let resolveOrgSpy: MockInstance<(typeof resolveTarget)["resolveOrg"]>; beforeEach(() => { createRelaseDeploySpy = vi.spyOn(apiClient, "createReleaseDeploy"); @@ -79,7 +82,7 @@ describe("release deploy", () => { createRelaseDeploySpy.mockResolvedValue(sampleDeploy); const { context, stdoutWrite } = createMockContext(); - const func = await deployCommand.loader(); + const func = await loadCommand(deployCommand); await func.call(context, { json: true }, "my-org/1.0.0", "production"); expect(createRelaseDeploySpy).toHaveBeenCalledWith("my-org", "1.0.0", { @@ -98,7 +101,7 @@ describe("release deploy", () => { }); const { context } = createMockContext(); - const func = await deployCommand.loader(); + const func = await loadCommand(deployCommand); // Multi-word deploy names are passed as a single quoted positional. await func.call(context, { json: true }, "1.0.0", "staging", "Deploy #42"); @@ -114,7 +117,7 @@ describe("release deploy", () => { createRelaseDeploySpy.mockResolvedValue(sampleDeploy); const { context } = createMockContext(); - const func = await deployCommand.loader(); + const func = await loadCommand(deployCommand); await func.call( context, { url: "https://example.com", json: true }, @@ -134,7 +137,7 @@ describe("release deploy", () => { test("throws when missing environment", async () => { const { context } = createMockContext(); - const func = await deployCommand.loader(); + const func = await loadCommand(deployCommand); await expect(func.call(context, { json: false }, "1.0.0")).rejects.toThrow( "Environment is required", @@ -143,7 +146,7 @@ describe("release deploy", () => { test("throws when no args provided", async () => { const { context } = createMockContext(); - const func = await deployCommand.loader(); + const func = await loadCommand(deployCommand); await expect(func.call(context, { json: false })).rejects.toThrow( "Release version is required", diff --git a/packages/cli/test/commands/release/finalize.test.ts b/packages/cli/test/commands/release/finalize.test.ts index 87c82b9134..091b241c7c 100644 --- a/packages/cli/test/commands/release/finalize.test.ts +++ b/packages/cli/test/commands/release/finalize.test.ts @@ -2,18 +2,22 @@ * Release Finalize Command Tests */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { finalizeCommand } from "../../../src/commands/release/finalize.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -22,18 +26,15 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; import type { SentryRelease } from "../../../src/types/index.js"; -import { useTestConfigDir } from "../../helpers.js"; +import { useTestConfigDir, loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; useTestConfigDir("release-finalize-"); @@ -54,8 +55,8 @@ const finalizedRelease: SentryRelease = { }; function createMockContext(cwd = "/tmp") { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -68,8 +69,8 @@ function createMockContext(cwd = "/tmp") { } describe("release finalize", () => { - let updateReleaseSpy: ReturnType; - let resolveOrgSpy: ReturnType; + let updateReleaseSpy: MockInstance<(typeof apiClient)["updateRelease"]>; + let resolveOrgSpy: MockInstance<(typeof resolveTarget)["resolveOrg"]>; beforeEach(() => { updateReleaseSpy = vi.spyOn(apiClient, "updateRelease"); @@ -86,7 +87,7 @@ describe("release finalize", () => { updateReleaseSpy.mockResolvedValue(finalizedRelease); const { context, stdoutWrite } = createMockContext(); - const func = await finalizeCommand.loader(); + const func = await loadCommand(finalizeCommand); await func.call(context, { json: true }, "my-org/1.0.0"); expect(updateReleaseSpy).toHaveBeenCalledWith( @@ -101,7 +102,7 @@ describe("release finalize", () => { test("throws when no version provided", async () => { const { context } = createMockContext(); - const func = await finalizeCommand.loader(); + const func = await loadCommand(finalizeCommand); await expect(func.call(context, { json: false })).rejects.toThrow( "Release version", @@ -112,7 +113,7 @@ describe("release finalize", () => { resolveOrgSpy.mockResolvedValue(null); const { context } = createMockContext(); - const func = await finalizeCommand.loader(); + const func = await loadCommand(finalizeCommand); await expect(func.call(context, { json: false }, "1.0.0")).rejects.toThrow( "organization", diff --git a/packages/cli/test/commands/release/propose-version.test.ts b/packages/cli/test/commands/release/propose-version.test.ts index 2144907ff6..7306879ed1 100644 --- a/packages/cli/test/commands/release/propose-version.test.ts +++ b/packages/cli/test/commands/release/propose-version.test.ts @@ -2,17 +2,26 @@ * Release Propose-Version Command Tests */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { proposeVersionCommand } from "../../../src/commands/release/propose-version.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as git from "../../../src/lib/git.js"; -import { useTestConfigDir } from "../../helpers.js"; +import { useTestConfigDir, loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; useTestConfigDir("release-propose-version-"); function createMockContext(cwd = "/tmp", env: Record = {}) { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -26,7 +35,7 @@ function createMockContext(cwd = "/tmp", env: Record = {}) { } describe("release propose-version", () => { - let getHeadCommitSpy: ReturnType; + let getHeadCommitSpy: MockInstance<(typeof git)["getHeadCommit"]>; beforeEach(() => { getHeadCommitSpy = vi.spyOn(git, "getHeadCommit"); @@ -42,7 +51,7 @@ describe("release propose-version", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await proposeVersionCommand.loader(); + const func = await loadCommand(proposeVersionCommand); await func.call(context, { json: true }); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -56,7 +65,7 @@ describe("release propose-version", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await proposeVersionCommand.loader(); + const func = await loadCommand(proposeVersionCommand); await func.call(context, { json: false }); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -67,7 +76,7 @@ describe("release propose-version", () => { getHeadCommitSpy.mockReturnValue("deadbeef"); const { context } = createMockContext("/my/project"); - const func = await proposeVersionCommand.loader(); + const func = await loadCommand(proposeVersionCommand); await func.call(context, { json: true }); expect(getHeadCommitSpy).toHaveBeenCalledWith("/my/project"); @@ -79,7 +88,7 @@ describe("release propose-version", () => { }); const { context } = createMockContext(); - const func = await proposeVersionCommand.loader(); + const func = await loadCommand(proposeVersionCommand); await expect(func.call(context, { json: false })).rejects.toThrow( "Not a git repository", @@ -90,7 +99,7 @@ describe("release propose-version", () => { const { context, stdoutWrite } = createMockContext("/tmp", { SENTRY_RELEASE: "my-release-1.0", }); - const func = await proposeVersionCommand.loader(); + const func = await loadCommand(proposeVersionCommand); await func.call(context, { json: true }); // Should NOT call getHeadCommit @@ -105,7 +114,7 @@ describe("release propose-version", () => { CIRCLE_SHA1: "circle-sha", SOURCE_VERSION: "heroku-version", }); - const func = await proposeVersionCommand.loader(); + const func = await loadCommand(proposeVersionCommand); await func.call(context, { json: true }); // SOURCE_VERSION has higher priority than CIRCLE_SHA1 @@ -121,7 +130,7 @@ describe("release propose-version", () => { SENTRY_RELEASE: "", SOURCE_VERSION: " ", }); - const func = await proposeVersionCommand.loader(); + const func = await loadCommand(proposeVersionCommand); await func.call(context, { json: true }); // Empty/whitespace env vars are skipped, falls through to git diff --git a/packages/cli/test/commands/release/set-commits.test.ts b/packages/cli/test/commands/release/set-commits.test.ts index 9d93e43078..7f19516275 100644 --- a/packages/cli/test/commands/release/set-commits.test.ts +++ b/packages/cli/test/commands/release/set-commits.test.ts @@ -8,18 +8,22 @@ import { mkdtempSync, rmSync } from "node:fs"; import { tmpdir } from "node:os"; import { join } from "node:path"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { setCommitsCommand } from "../../../src/commands/release/set-commits.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); import { NO_REPO_INTEGRATIONS_MESSAGE } from "../../../src/lib/api/releases.js"; @@ -30,12 +34,8 @@ import { ApiError, ValidationError } from "../../../src/lib/errors.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -43,7 +43,8 @@ import * as gitLib from "../../../src/lib/git.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; import type { SentryRelease } from "../../../src/types/index.js"; -import { useTestConfigDir } from "../../helpers.js"; +import { useTestConfigDir, loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; useTestConfigDir("release-set-commits-"); @@ -64,8 +65,8 @@ const sampleRelease: SentryRelease = { }; function createMockContext(cwd = "/tmp") { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -78,8 +79,10 @@ function createMockContext(cwd = "/tmp") { } describe("release set-commits --commit", () => { - let setCommitsWithRefsSpy: ReturnType; - let resolveOrgSpy: ReturnType; + let setCommitsWithRefsSpy: MockInstance< + (typeof apiClient)["setCommitsWithRefs"] + >; + let resolveOrgSpy: MockInstance<(typeof resolveTarget)["resolveOrg"]>; beforeEach(() => { setCommitsWithRefsSpy = vi.spyOn(apiClient, "setCommitsWithRefs"); @@ -96,7 +99,7 @@ describe("release set-commits --commit", () => { setCommitsWithRefsSpy.mockResolvedValue(sampleRelease); const { context } = createMockContext(); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await func.call( context, { @@ -132,7 +135,7 @@ describe("release set-commits --commit", () => { .mockResolvedValue(new ValidationError("explained", "commit.repository")); const { context } = createMockContext(); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await expect( func.call( context, @@ -175,7 +178,7 @@ describe("release set-commits --commit", () => { .mockResolvedValue(corrected); const { context } = createMockContext(); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await func.call( context, { @@ -207,7 +210,7 @@ describe("release set-commits --commit", () => { setCommitsWithRefsSpy.mockResolvedValue(sampleRelease); const { context } = createMockContext(); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await func.call( context, { @@ -235,7 +238,7 @@ describe("release set-commits --commit", () => { setCommitsWithRefsSpy.mockResolvedValue(sampleRelease); const { context } = createMockContext(); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await func.call( context, { @@ -259,7 +262,7 @@ describe("release set-commits --commit", () => { resolveOrgSpy.mockResolvedValue({ org: "my-org" }); const { context } = createMockContext(); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await expect( func.call( @@ -281,7 +284,7 @@ describe("release set-commits --commit", () => { resolveOrgSpy.mockResolvedValue({ org: "my-org" }); const { context } = createMockContext(); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await expect( func.call( @@ -301,8 +304,10 @@ describe("release set-commits --commit", () => { }); describe("release set-commits --clear", () => { - let setCommitsWithRefsSpy: ReturnType; - let resolveOrgSpy: ReturnType; + let setCommitsWithRefsSpy: MockInstance< + (typeof apiClient)["setCommitsWithRefs"] + >; + let resolveOrgSpy: MockInstance<(typeof resolveTarget)["resolveOrg"]>; beforeEach(() => { setCommitsWithRefsSpy = vi.spyOn(apiClient, "setCommitsWithRefs"); @@ -322,7 +327,7 @@ describe("release set-commits --clear", () => { setCommitsWithRefsSpy.mockResolvedValue(sampleRelease); const { context } = createMockContext(); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await func.call( context, { @@ -341,8 +346,8 @@ describe("release set-commits --clear", () => { }); describe("release set-commits --auto", () => { - let setCommitsAutoSpy: ReturnType; - let resolveOrgSpy: ReturnType; + let setCommitsAutoSpy: MockInstance<(typeof apiClient)["setCommitsAuto"]>; + let resolveOrgSpy: MockInstance<(typeof resolveTarget)["resolveOrg"]>; beforeEach(() => { setCommitsAutoSpy = vi.spyOn(apiClient, "setCommitsAuto"); @@ -359,7 +364,7 @@ describe("release set-commits --auto", () => { setCommitsAutoSpy.mockResolvedValue(sampleRelease); const { context } = createMockContext("/my/project"); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await func.call( context, { @@ -382,9 +387,9 @@ describe("release set-commits --auto", () => { }); describe("release set-commits (default mode)", () => { - let setCommitsAutoSpy: ReturnType; - let setCommitsLocalSpy: ReturnType; - let resolveOrgSpy: ReturnType; + let setCommitsAutoSpy: MockInstance<(typeof apiClient)["setCommitsAuto"]>; + let setCommitsLocalSpy: MockInstance<(typeof apiClient)["setCommitsLocal"]>; + let resolveOrgSpy: MockInstance<(typeof resolveTarget)["resolveOrg"]>; beforeEach(() => { setCommitsAutoSpy = vi.spyOn(apiClient, "setCommitsAuto"); @@ -414,7 +419,7 @@ describe("release set-commits (default mode)", () => { "", ); const { context } = createMockContext(repoRoot); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await expect( func.call( context, @@ -452,7 +457,7 @@ describe("release set-commits (default mode)", () => { "", ); const { context } = createMockContext(repoRoot); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await func.call( context, { @@ -486,7 +491,7 @@ describe("release set-commits (default mode)", () => { "", ); const { context } = createMockContext(repoRoot); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await func.call( context, { @@ -506,9 +511,9 @@ describe("release set-commits (default mode)", () => { }); describe("release set-commits without a git checkout", () => { - let setCommitsAutoSpy: ReturnType; - let setCommitsLocalSpy: ReturnType; - let resolveOrgSpy: ReturnType; + let setCommitsAutoSpy: MockInstance<(typeof apiClient)["setCommitsAuto"]>; + let setCommitsLocalSpy: MockInstance<(typeof apiClient)["setCommitsLocal"]>; + let resolveOrgSpy: MockInstance<(typeof resolveTarget)["resolveOrg"]>; let noGitDir: string; beforeEach(() => { @@ -544,7 +549,7 @@ describe("release set-commits without a git checkout", () => { setCommitsAutoSpy.mockRejectedValue(autoError); const { context } = createMockContext(noGitDir); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await expect(func.call(context, defaultFlags, "1.0.0")).rejects.toBe( autoError, ); @@ -553,7 +558,7 @@ describe("release set-commits without a git checkout", () => { test("--local explains that it needs a git checkout", async () => { const { context } = createMockContext(noGitDir); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); const error = await Promise.resolve( func.call(context, { ...defaultFlags, local: true }, "1.0.0"), ).catch((caught: unknown) => caught); @@ -567,9 +572,9 @@ describe("release set-commits without a git checkout", () => { }); describe("release set-commits --path", () => { - let setCommitsAutoSpy: ReturnType; - let setCommitsLocalSpy: ReturnType; - let resolveOrgSpy: ReturnType; + let setCommitsAutoSpy: MockInstance<(typeof apiClient)["setCommitsAuto"]>; + let setCommitsLocalSpy: MockInstance<(typeof apiClient)["setCommitsLocal"]>; + let resolveOrgSpy: MockInstance<(typeof resolveTarget)["resolveOrg"]>; // Use the actual repo root as cwd so getCommitLog can read git history const repoRoot = new URL("../../..", import.meta.url).pathname.replace( @@ -594,7 +599,7 @@ describe("release set-commits --path", () => { setCommitsLocalSpy.mockResolvedValue(sampleRelease); const { context } = createMockContext(repoRoot); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await func.call( context, { @@ -618,7 +623,7 @@ describe("release set-commits --path", () => { setCommitsLocalSpy.mockResolvedValue(sampleRelease); const { context } = createMockContext(repoRoot); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await func.call( context, { @@ -641,7 +646,7 @@ describe("release set-commits --path", () => { resolveOrgSpy.mockResolvedValue({ org: "my-org" }); const { context } = createMockContext(repoRoot); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await expect( func.call( @@ -664,7 +669,7 @@ describe("release set-commits --path", () => { resolveOrgSpy.mockResolvedValue({ org: "my-org" }); const { context } = createMockContext(repoRoot); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await expect( func.call( @@ -687,7 +692,7 @@ describe("release set-commits --path", () => { resolveOrgSpy.mockResolvedValue({ org: "my-org" }); const { context } = createMockContext(repoRoot); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await expect( func.call( @@ -708,10 +713,10 @@ describe("release set-commits --path", () => { }); describe("release set-commits --from", () => { - let setCommitsAutoSpy: ReturnType; - let setCommitsLocalSpy: ReturnType; - let resolveOrgSpy: ReturnType; - let getCommitLogSpy: ReturnType; + let setCommitsAutoSpy: MockInstance<(typeof apiClient)["setCommitsAuto"]>; + let setCommitsLocalSpy: MockInstance<(typeof apiClient)["setCommitsLocal"]>; + let resolveOrgSpy: MockInstance<(typeof resolveTarget)["resolveOrg"]>; + let getCommitLogSpy: MockInstance<(typeof gitLib)["getCommitLog"]>; // Use the actual repo root as cwd so the git remote/shallow helpers resolve. const repoRoot = new URL("../../..", import.meta.url).pathname.replace( @@ -748,7 +753,7 @@ describe("release set-commits --from", () => { setCommitsLocalSpy.mockResolvedValue(sampleRelease); const { context } = createMockContext(repoRoot); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await func.call( context, { @@ -777,7 +782,7 @@ describe("release set-commits --from", () => { setCommitsLocalSpy.mockResolvedValue(sampleRelease); const { context } = createMockContext(repoRoot); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await func.call( context, { @@ -805,7 +810,7 @@ describe("release set-commits --from", () => { resolveOrgSpy.mockResolvedValue({ org: "my-org" }); const { context } = createMockContext(repoRoot); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await expect( func.call( @@ -828,7 +833,7 @@ describe("release set-commits --from", () => { resolveOrgSpy.mockResolvedValue({ org: "my-org" }); const { context } = createMockContext(repoRoot); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await expect( func.call( @@ -851,7 +856,7 @@ describe("release set-commits --from", () => { resolveOrgSpy.mockResolvedValue({ org: "my-org" }); const { context } = createMockContext(repoRoot); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await expect( func.call( @@ -874,7 +879,7 @@ describe("release set-commits --from", () => { resolveOrgSpy.mockResolvedValue({ org: "my-org" }); const { context } = createMockContext(repoRoot); - const func = await setCommitsCommand.loader(); + const func = await loadCommand(setCommitsCommand); await expect( func.call( diff --git a/packages/cli/test/commands/release/view.test.ts b/packages/cli/test/commands/release/view.test.ts index 6c88744557..03eac7c251 100644 --- a/packages/cli/test/commands/release/view.test.ts +++ b/packages/cli/test/commands/release/view.test.ts @@ -5,18 +5,22 @@ * per-project health/adoption data rendering. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { viewCommand } from "../../../src/commands/release/view.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -25,18 +29,15 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; import type { SentryRelease } from "../../../src/types/index.js"; -import { useTestConfigDir } from "../../helpers.js"; +import { useTestConfigDir, loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; useTestConfigDir("release-view-"); @@ -130,8 +131,8 @@ const sampleReleaseWithHealth: SentryRelease = { }; function createMockContext(cwd = "/tmp") { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -144,8 +145,8 @@ function createMockContext(cwd = "/tmp") { } describe("release view", () => { - let getReleaseSpy: ReturnType; - let resolveOrgSpy: ReturnType; + let getReleaseSpy: MockInstance<(typeof apiClient)["getRelease"]>; + let resolveOrgSpy: MockInstance<(typeof resolveTarget)["resolveOrg"]>; beforeEach(() => { getReleaseSpy = vi.spyOn(apiClient, "getRelease"); @@ -162,7 +163,7 @@ describe("release view", () => { getReleaseSpy.mockResolvedValue(sampleRelease); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { fresh: false, json: true }, "my-org/1.0.0"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -176,7 +177,7 @@ describe("release view", () => { getReleaseSpy.mockResolvedValue(sampleRelease); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { fresh: false, json: false }, "1.0.0"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -189,7 +190,7 @@ describe("release view", () => { getReleaseSpy.mockResolvedValue(sampleRelease); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { fresh: false, json: true }, "my-org/1.0.0"); expect(resolveOrgSpy).toHaveBeenCalledWith({ org: "my-org", cwd: "/tmp" }); @@ -201,7 +202,7 @@ describe("release view", () => { test("throws when no version provided", async () => { const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect( func.call(context, { fresh: false, json: false }), @@ -212,7 +213,7 @@ describe("release view", () => { resolveOrgSpy.mockResolvedValue(null); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect( func.call(context, { fresh: false, json: false }, "1.0.0"), @@ -224,7 +225,7 @@ describe("release view", () => { getReleaseSpy.mockResolvedValue(sampleReleaseWithHealth); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { fresh: false, json: false }, "1.0.0"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -246,7 +247,7 @@ describe("release view", () => { getReleaseSpy.mockResolvedValue(sampleReleaseWithHealth); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { fresh: false, json: true }, "1.0.0"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -262,7 +263,7 @@ describe("release view", () => { getReleaseSpy.mockResolvedValue(sampleRelease); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { fresh: false, json: false }, "1.0.0"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); diff --git a/packages/cli/test/commands/replay/download.test.ts b/packages/cli/test/commands/replay/download.test.ts index 0763e25531..ecc382100d 100644 --- a/packages/cli/test/commands/replay/download.test.ts +++ b/packages/cli/test/commands/replay/download.test.ts @@ -15,12 +15,8 @@ import { downloadCommand } from "../../../src/commands/replay/download.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -34,17 +30,14 @@ import { vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; import type { ReplayDetails } from "../../../src/types/index.js"; +import { loadCommand } from "../../helpers.js"; const REPLAY_ID = "346789a703f6454384f1de473b8b9fcc"; const T0 = 1_787_282_938_000; @@ -74,6 +67,7 @@ function sampleReplay(overrides: Partial = {}): ReplayDetails { urls: [], user: { display_name: "Test User" }, warning_ids: [], + releases: [], ...overrides, }; } @@ -130,7 +124,7 @@ describe("replay download", () => { test("writes a flat rrweb array to .rrweb.json in cwd", async () => { const harness = createContext(); - const func = await downloadCommand.loader(); + const func = await loadCommand(downloadCommand); await func.call(harness.context, { fresh: false }, REPLAY_ID); @@ -143,7 +137,7 @@ describe("replay download", () => { }); test("fetches every segment from the replay's own project", async () => { - const func = await downloadCommand.loader(); + const func = await loadCommand(downloadCommand); await func.call(createContext().context, { fresh: false }, REPLAY_ID); @@ -152,7 +146,7 @@ describe("replay download", () => { }); test("writes to --output, creating parent directories", async () => { - const func = await downloadCommand.loader(); + const func = await loadCommand(downloadCommand); await func.call( createContext().context, @@ -166,7 +160,7 @@ describe("replay download", () => { test("reports counts with --json", async () => { const harness = createContext(); - const func = await downloadCommand.loader(); + const func = await loadCommand(downloadCommand); await func.call(harness.context, { fresh: false, json: true }, REPLAY_ID); @@ -181,7 +175,7 @@ describe("replay download", () => { }); test("accepts a replay URL", async () => { - const func = await downloadCommand.loader(); + const func = await loadCommand(downloadCommand); await func.call( createContext().context, @@ -200,7 +194,7 @@ describe("replay download", () => { segmentsSpy.mockResolvedValue([ [{ type: 5, data: { tag: "video" }, timestamp: T0 }], ]); - const func = await downloadCommand.loader(); + const func = await loadCommand(downloadCommand); await func.call(createContext().context, { fresh: false }, REPLAY_ID); @@ -212,7 +206,7 @@ describe("replay download", () => { resolveReplaySpy.mockResolvedValue( sampleReplay({ is_archived: true, project_id: null }), ); - const func = await downloadCommand.loader(); + const func = await loadCommand(downloadCommand); await expect( func.call(createContext().context, { fresh: false }, REPLAY_ID), @@ -226,7 +220,7 @@ describe("replay download", () => { project: "other", projectData: { id: "7" }, }); - const func = await downloadCommand.loader(); + const func = await loadCommand(downloadCommand); await expect( func.call( @@ -240,7 +234,7 @@ describe("replay download", () => { test("rejects a replay whose recording is empty", async () => { segmentsSpy.mockResolvedValue([[], []]); - const func = await downloadCommand.loader(); + const func = await loadCommand(downloadCommand); await expect( func.call(createContext().context, { fresh: false }, REPLAY_ID), @@ -252,7 +246,7 @@ describe("replay download", () => { test("maps a 404 to a not-found resolution error", async () => { resolveReplaySpy.mockRejectedValue(new ApiError("Not found", 404)); - const func = await downloadCommand.loader(); + const func = await loadCommand(downloadCommand); await expect( func.call(createContext().context, { fresh: false }, REPLAY_ID), @@ -260,7 +254,7 @@ describe("replay download", () => { }); test("shows its own usage when the replay ID is missing", async () => { - const func = await downloadCommand.loader(); + const func = await loadCommand(downloadCommand); const error = await func .call(createContext().context, { fresh: false }) diff --git a/packages/cli/test/commands/replay/list.test.ts b/packages/cli/test/commands/replay/list.test.ts index 163bd7b212..39c6f4c9fd 100644 --- a/packages/cli/test/commands/replay/list.test.ts +++ b/packages/cli/test/commands/replay/list.test.ts @@ -2,19 +2,23 @@ * Replay List Command Tests */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { listCommand, parseSort } from "../../../src/commands/replay/list.js"; import { ApiError, ValidationError } from "../../../src/lib/errors.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -23,12 +27,8 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/db/pagination.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -38,12 +38,8 @@ import { LIST_PERIOD_FLAG } from "../../../src/lib/list-command.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -53,6 +49,8 @@ import { REPLAY_LIST_FIELDS, type ReplayListItem, } from "../../../src/types/index.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; describe("parseSort", () => { test("accepts supported sort values", () => { @@ -68,11 +66,17 @@ describe("parseSort", () => { }); describe("listCommand.func", () => { - let listReplaysSpy: ReturnType; - let resolveTargetSpy: ReturnType; - let resolveCursorSpy: ReturnType; - let advancePaginationStateSpy: ReturnType; - let hasPreviousPageSpy: ReturnType; + let listReplaysSpy: MockInstance<(typeof apiClient)["listReplays"]>; + let resolveTargetSpy: MockInstance< + (typeof resolveTarget)["resolveOrgOptionalTarget"] + >; + let resolveCursorSpy: MockInstance<(typeof paginationDb)["resolveCursor"]>; + let advancePaginationStateSpy: MockInstance< + (typeof paginationDb)["advancePaginationState"] + >; + let hasPreviousPageSpy: MockInstance< + (typeof paginationDb)["hasPreviousPage"] + >; const sampleReplays: ReplayListItem[] = [ { @@ -89,15 +93,16 @@ describe("listCommand.func", () => { urls: [], user: { display_name: "Test User" }, warning_ids: [], + releases: [], }, ]; function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", commandPrefix: ["sentry", "replay", "list"], }, @@ -136,7 +141,7 @@ describe("listCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 25, json: true, period: parsePeriod("7d"), sort: "-started_at" }, @@ -171,7 +176,7 @@ describe("listCommand.func", () => { ); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call( context, @@ -194,7 +199,7 @@ describe("listCommand.func", () => { ); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call( context, @@ -213,11 +218,10 @@ describe("listCommand.func", () => { resolveTargetSpy.mockResolvedValue({ org: "test-org", project: "cli" }); listReplaysSpy.mockResolvedValue({ data: sampleReplays, - nextCursor: undefined, }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { @@ -247,7 +251,7 @@ describe("listCommand.func", () => { listReplaysSpy.mockResolvedValue({ data: sampleReplays }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { @@ -275,7 +279,7 @@ describe("listCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { diff --git a/packages/cli/test/commands/replay/view.test.ts b/packages/cli/test/commands/replay/view.test.ts index 787648f114..b5570ba19f 100644 --- a/packages/cli/test/commands/replay/view.test.ts +++ b/packages/cli/test/commands/replay/view.test.ts @@ -3,7 +3,15 @@ */ import type { ArgumentParseError } from "@stricli/core"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { parseReplayArguments, type ReplayArguments, @@ -14,12 +22,8 @@ import { vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -28,12 +32,8 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/browser.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -49,18 +49,16 @@ import { vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); import { applyBoundPositionals } from "../../../src/lib/positional-parse.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; import type { ReplayDetails } from "../../../src/types/index.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; const REPLAY_ID = "346789a703f6454384f1de473b8b9fcc"; const TRACE_ID = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; @@ -80,6 +78,7 @@ function sampleReplay(overrides: Partial = {}): ReplayDetails { urls: [], user: { display_name: "Test User" }, warning_ids: [], + releases: [], ...overrides, }; } @@ -198,20 +197,26 @@ describe("parseReplayArguments", () => { }); describe("viewCommand.func", () => { - let getProjectSpy: ReturnType; - let resolveReplaySpy: ReturnType; - let getReplayRecordingSegmentsSpy: ReturnType; - let getTraceMetaSpy: ReturnType; - let listIssuesPaginatedSpy: ReturnType; - let resolveTargetSpy: ReturnType; - let openInBrowserSpy: ReturnType; + let getProjectSpy: MockInstance<(typeof apiClient)["getProject"]>; + let resolveReplaySpy: MockInstance<(typeof apiClient)["resolveReplay"]>; + let getReplayRecordingSegmentsSpy: MockInstance< + (typeof apiClient)["getReplayRecordingSegments"] + >; + let getTraceMetaSpy: MockInstance<(typeof apiClient)["getTraceMeta"]>; + let listIssuesPaginatedSpy: MockInstance< + (typeof apiClient)["listIssuesPaginated"] + >; + let resolveTargetSpy: MockInstance< + (typeof resolveTarget)["resolveOrgOptionalTarget"] + >; + let openInBrowserSpy: MockInstance<(typeof browser)["openInBrowser"]>; function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, stdoutWrite, @@ -278,7 +283,7 @@ describe("viewCommand.func", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false, fresh: false }, @@ -314,7 +319,7 @@ describe("viewCommand.func", () => { resolveReplaySpy.mockResolvedValue(sampleReplay()); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, web: true, fresh: false }, @@ -328,11 +333,11 @@ describe("viewCommand.func", () => { }); test("opens the replay URL target from a replay URL with --web", async () => { - resolveTargetSpy.mockResolvedValue({ org: "test-org", project: undefined }); + resolveTargetSpy.mockResolvedValue({ org: "test-org" }); resolveReplaySpy.mockResolvedValue(sampleReplay()); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, web: true, fresh: false }, @@ -350,7 +355,7 @@ describe("viewCommand.func", () => { resolveReplaySpy.mockResolvedValue(sampleReplay()); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, web: true, fresh: false }, @@ -370,7 +375,7 @@ describe("viewCommand.func", () => { ); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect( func.call(context, { json: false, web: false, fresh: false }, REPLAY_ID), @@ -382,7 +387,7 @@ describe("viewCommand.func", () => { resolveReplaySpy.mockResolvedValue(sampleReplay({ project_id: "999" })); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect( func.call(context, { json: false, web: false, fresh: false }, REPLAY_ID), @@ -400,7 +405,7 @@ describe("viewCommand.func", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false, fresh: false }, @@ -423,7 +428,7 @@ describe("viewCommand.func", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, web: false, fresh: false }, @@ -455,7 +460,7 @@ describe("viewCommand.func", () => { ]); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, web: false, fresh: false }, diff --git a/packages/cli/test/commands/repo/list.test.ts b/packages/cli/test/commands/repo/list.test.ts index 23bc400f4a..c09c119c8c 100644 --- a/packages/cli/test/commands/repo/list.test.ts +++ b/packages/cli/test/commands/repo/list.test.ts @@ -12,12 +12,8 @@ import { listCommand } from "../../../src/commands/repo/list.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for vi.mocked access @@ -27,12 +23,8 @@ import { DEFAULT_SENTRY_URL } from "../../../src/lib/constants.js"; vi.mock("../../../src/lib/db/pagination.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for vi.mocked access @@ -43,17 +35,15 @@ import { ValidationError } from "../../../src/lib/errors.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for vi.mocked access import * as resolveTarget from "../../../src/lib/resolve-target.js"; import type { SentryRepository } from "../../../src/types/sentry.js"; +import { loadCommand, at } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; // Sample test data const sampleRepos: SentryRepository[] = [ @@ -82,8 +72,8 @@ const sampleRepos: SentryRepository[] = [ ]; function createMockContext(cwd = "/tmp") { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -106,13 +96,15 @@ describe("listCommand.func — project-search (bare slug)", () => { test("outputs JSON array when --json flag is set", async () => { findProjectsBySlugSpy.mockResolvedValue({ - projects: [{ slug: "test-proj", orgSlug: "test-org" }], + projects: [ + { id: "1", slug: "test-proj", name: "test-proj", orgSlug: "test-org" }, + ], orgs: [], }); listRepositoriesSpy.mockResolvedValue(sampleRepos); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: true }, "test-proj"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -125,13 +117,15 @@ describe("listCommand.func — project-search (bare slug)", () => { test("outputs empty JSON array when no repos found with --json", async () => { findProjectsBySlugSpy.mockResolvedValue({ - projects: [{ slug: "test-proj", orgSlug: "test-org" }], + projects: [ + { id: "1", slug: "test-proj", name: "test-proj", orgSlug: "test-org" }, + ], orgs: [], }); listRepositoriesSpy.mockResolvedValue([]); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: true }, "test-proj"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -140,13 +134,15 @@ describe("listCommand.func — project-search (bare slug)", () => { test("writes 'No repositories found' when empty without --json", async () => { findProjectsBySlugSpy.mockResolvedValue({ - projects: [{ slug: "test-proj", orgSlug: "test-org" }], + projects: [ + { id: "1", slug: "test-proj", name: "test-proj", orgSlug: "test-org" }, + ], orgs: [], }); listRepositoriesSpy.mockResolvedValue([]); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, "test-proj"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -155,13 +151,15 @@ describe("listCommand.func — project-search (bare slug)", () => { test("writes header and rows for human output", async () => { findProjectsBySlugSpy.mockResolvedValue({ - projects: [{ slug: "test-proj", orgSlug: "test-org" }], + projects: [ + { id: "1", slug: "test-proj", name: "test-proj", orgSlug: "test-org" }, + ], orgs: [], }); listRepositoriesSpy.mockResolvedValue(sampleRepos); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, "test-proj"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -180,18 +178,20 @@ describe("listCommand.func — project-search (bare slug)", () => { test("shows count when results exceed limit", async () => { const manyRepos = Array.from({ length: 10 }, (_, i) => ({ - ...sampleRepos[0], + ...at(sampleRepos, 0), id: String(i), name: `repo-${i}`, })); findProjectsBySlugSpy.mockResolvedValue({ - projects: [{ slug: "test-proj", orgSlug: "test-org" }], + projects: [ + { id: "1", slug: "test-proj", name: "test-proj", orgSlug: "test-org" }, + ], orgs: [], }); listRepositoriesSpy.mockResolvedValue(manyRepos); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 5, json: false }, "test-proj"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -200,13 +200,15 @@ describe("listCommand.func — project-search (bare slug)", () => { test("shows all repos when count is under limit", async () => { findProjectsBySlugSpy.mockResolvedValue({ - projects: [{ slug: "test-proj", orgSlug: "test-org" }], + projects: [ + { id: "1", slug: "test-proj", name: "test-proj", orgSlug: "test-org" }, + ], orgs: [], }); listRepositoriesSpy.mockResolvedValue(sampleRepos); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, "test-proj"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -217,7 +219,7 @@ describe("listCommand.func — project-search (bare slug)", () => { findProjectsBySlugSpy.mockResolvedValue({ projects: [], orgs: [] }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: true }, "unknown-proj"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -236,7 +238,6 @@ describe("listCommand.func — explicit org/project (org-scoped with note)", () // `/` tries repository names first; none is like `my-project`. listRepositoriesPaginatedSpy.mockResolvedValue({ data: sampleRepos, - nextCursor: undefined, }); }); @@ -247,7 +248,7 @@ describe("listCommand.func — explicit org/project (org-scoped with note)", () test("/ keeps repositories named like it", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 30, json: true }, @@ -270,7 +271,7 @@ describe("listCommand.func — explicit org/project (org-scoped with note)", () test("/ fuzzily matches the repo name without its owner", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 30, json: true }, @@ -288,7 +289,7 @@ describe("listCommand.func — explicit org/project (org-scoped with note)", () test("/ with no matches stays empty", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: true }, "my-org/other/*"); const parsed = JSON.parse(stdoutWrite.mock.calls.map((c) => c[0]).join("")); @@ -302,7 +303,7 @@ describe("listCommand.func — explicit org/project (org-scoped with note)", () listRepositoriesSpy.mockResolvedValue(sampleRepos); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, "my-org/my-project"); expect(listRepositoriesSpy).toHaveBeenCalledWith("my-org"); @@ -312,7 +313,7 @@ describe("listCommand.func — explicit org/project (org-scoped with note)", () listRepositoriesSpy.mockResolvedValue(sampleRepos); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, "my-org/my-project"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -323,7 +324,7 @@ describe("listCommand.func — explicit org/project (org-scoped with note)", () listRepositoriesSpy.mockResolvedValue(sampleRepos); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: true }, "my-org/my-project"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -355,7 +356,7 @@ describe("listCommand.func — auto-detect mode", () => { listRepositoriesSpy.mockResolvedValue(sampleRepos); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, undefined); expect(listRepositoriesSpy).toHaveBeenCalledWith("default-org"); @@ -366,7 +367,7 @@ describe("listCommand.func — auto-detect mode", () => { listRepositoriesSpy.mockResolvedValue(sampleRepos); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, undefined); expect(listRepositoriesSpy).toHaveBeenCalledWith("detected-org"); @@ -381,7 +382,7 @@ describe("listCommand.func — auto-detect mode", () => { listRepositoriesSpy.mockResolvedValue(sampleRepos); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, undefined); expect(listOrganizationsSpy).toHaveBeenCalled(); @@ -392,7 +393,7 @@ describe("listCommand.func — auto-detect mode", () => { listRepositoriesSpy.mockResolvedValue(sampleRepos); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: true }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -406,7 +407,7 @@ describe("listCommand.func — auto-detect mode", () => { listRepositoriesSpy.mockResolvedValue([]); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -419,7 +420,7 @@ describe("listCommand.func — auto-detect mode", () => { listRepositoriesSpy.mockResolvedValue([]); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -453,11 +454,10 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { test("returns paginated JSON with hasMore=false when no nextCursor", async () => { listRepositoriesPaginatedSpy.mockResolvedValue({ data: sampleRepos, - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 25, json: true }, "my-org/"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -475,7 +475,7 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 2, json: true }, "my-org/"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -492,7 +492,7 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 25, json: false }, "my-org/"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -507,11 +507,10 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { test("human output shows count without next-page hint when no more", async () => { listRepositoriesPaginatedSpy.mockResolvedValue({ data: sampleRepos, - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 25, json: false }, "my-org/"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -522,11 +521,10 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { test("human output 'No repositories found' when empty and no cursor", async () => { listRepositoriesPaginatedSpy.mockResolvedValue({ data: [], - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 25, json: false }, "my-org/"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -540,11 +538,10 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { }); listRepositoriesPaginatedSpy.mockResolvedValue({ data: sampleRepos, - nextCursor: undefined, }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 25, json: false, cursor: "explicit:cursor:value" }, @@ -564,11 +561,10 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { }); listRepositoriesPaginatedSpy.mockResolvedValue({ data: sampleRepos, - nextCursor: undefined, }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 25, json: false, cursor: "next" }, @@ -590,7 +586,7 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call(context, { limit: 25, json: false, cursor: "next" }, "my-org/"), @@ -599,7 +595,7 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { test("throws ValidationError when --cursor used outside org-all mode", async () => { const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call( @@ -613,11 +609,10 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { test("passes perPage from limit to paginated call", async () => { listRepositoriesPaginatedSpy.mockResolvedValue({ data: [], - nextCursor: undefined, }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 10, json: false }, "my-org/"); expect(listRepositoriesPaginatedSpy).toHaveBeenCalledWith( diff --git a/packages/cli/test/commands/schema-path.test.ts b/packages/cli/test/commands/schema-path.test.ts index b73e56b546..4dc688d803 100644 --- a/packages/cli/test/commands/schema-path.test.ts +++ b/packages/cli/test/commands/schema-path.test.ts @@ -9,6 +9,8 @@ import { schemaCommand } from "../../src/commands/schema.js"; import type { SentryContext } from "../../src/context.js"; import { getAllEndpoints } from "../../src/lib/api-schema.js"; import { OutputError, ResolutionError } from "../../src/lib/errors.js"; +import { loadCommand } from "../helpers.js"; +import type { Writer } from "../../src/types/index.js"; const ORG_ISSUES = "/api/0/organizations/{organization_id_or_slug}/issues/"; const SKILL_QUERY = `GET ${ORG_ISSUES}`; @@ -17,13 +19,13 @@ function createMockContext(): { context: SentryContext; stdoutWrite: ReturnType; } { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { process, env: process.env, stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, stdin: process.stdin, cwd: "/tmp", homeDir: "/tmp", @@ -48,7 +50,7 @@ describe("sentry schema path lookup", () => { ["GET", ORG_ISSUES], ])("exact lookup preserves the endpoint object for %j", async (...args) => { const { context, stdoutWrite } = createMockContext(); - const func = await schemaCommand.loader(); + const func = await loadCommand(schemaCommand); await func.call(context, { json: true, all: false }, ...args); expect(JSON.parse(stdoutOf(stdoutWrite))).toEqual( getAllEndpoints().find( @@ -59,7 +61,7 @@ describe("sentry schema path lookup", () => { test("--search keeps exact HTTP-qualified identifiers in an array and rejects a different method", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await schemaCommand.loader(); + const func = await loadCommand(schemaCommand); await func.call( context, { json: true, all: false, search: "GET" }, @@ -85,7 +87,7 @@ describe("sentry schema path lookup", () => { test("--all remains an unannotated flat array", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await schemaCommand.loader(); + const func = await loadCommand(schemaCommand); await func.call(context, { json: true, all: true }); expect(JSON.parse(stdoutOf(stdoutWrite))).toEqual(getAllEndpoints()); }); @@ -121,7 +123,7 @@ describe("sentry schema path lookup", () => { }, ])("discovers the API used by $args", async ({ args, fn, command, note }) => { const { context, stdoutWrite } = createMockContext(); - const func = await schemaCommand.loader(); + const func = await loadCommand(schemaCommand); await func.call(context, { json: true, all: false }, ...args); const result = JSON.parse(stdoutOf(stdoutWrite)); expect(Array.isArray(result)).toBe(true); @@ -143,7 +145,7 @@ describe("sentry schema path lookup", () => { test("--search and positionals share discovery, including a complete nested path", async () => { const positional = createMockContext(); const search = createMockContext(); - const func = await schemaCommand.loader(); + const func = await loadCommand(schemaCommand); await func.call( positional.context, { json: true, all: false }, @@ -179,7 +181,7 @@ describe("sentry schema path lookup", () => { "HTTP filters preserve CLI discovery for $args", async ({ args, search, fn, command }) => { const { context, stdoutWrite } = createMockContext(); - const func = await schemaCommand.loader(); + const func = await loadCommand(schemaCommand); await func.call( context, { json: true, all: false, search: search ? "GET" : undefined }, @@ -213,7 +215,7 @@ describe("sentry schema path lookup", () => { test("renders the selector and related CLI command in human output", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await schemaCommand.loader(); + const func = await loadCommand(schemaCommand); await func.call(context, { json: false, all: false }, "logs"); const output = stdoutOf(stdoutWrite); expect(output).toContain("dataset=logs"); @@ -222,7 +224,7 @@ describe("sentry schema path lookup", () => { test("discovery supports existing --fields filtering", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await schemaCommand.loader(); + const func = await loadCommand(schemaCommand); await func.call( context, { json: true, all: false, fields: ["fn"] }, @@ -238,7 +240,7 @@ describe("sentry schema path lookup", () => { test("path without METHOD lists methods on that URL", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await schemaCommand.loader(); + const func = await loadCommand(schemaCommand); await func.call(context, { json: true, all: false }, ORG_ISSUES); const parsed = JSON.parse(stdoutOf(stdoutWrite)); @@ -252,7 +254,7 @@ describe("sentry schema path lookup", () => { test("--search with GET + path finds the endpoint", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await schemaCommand.loader(); + const func = await loadCommand(schemaCommand); await func.call(context, { json: true, all: false, search: SKILL_QUERY }); const parsed = JSON.parse(stdoutOf(stdoutWrite)); @@ -262,7 +264,7 @@ describe("sentry schema path lookup", () => { test("--search GET plus path positional (unquoted) finds the endpoint", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await schemaCommand.loader(); + const func = await loadCommand(schemaCommand); await func.call( context, { json: true, all: false, search: "GET" }, @@ -276,7 +278,7 @@ describe("sentry schema path lookup", () => { test("unknown path does not suggest --search GET /path", async () => { const { context } = createMockContext(); - const func = await schemaCommand.loader(); + const func = await loadCommand(schemaCommand); const query = "GET /api/0/organizations/{organization_id_or_slug}/not-a-route/"; @@ -293,7 +295,7 @@ describe("sentry schema path lookup", () => { test("wrong METHOD at a real path hints the methods that exist", async () => { const { context } = createMockContext(); - const func = await schemaCommand.loader(); + const func = await loadCommand(schemaCommand); const err = await func .call(context, { json: false, all: false }, `POST ${ORG_ISSUES}`) @@ -309,7 +311,7 @@ describe("sentry schema path lookup", () => { test("resource discovery preserves the endpoint array JSON shape", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await schemaCommand.loader(); + const func = await loadCommand(schemaCommand); await func.call(context, { json: true, all: false }, "issues"); const parsed = JSON.parse(stdoutOf(stdoutWrite)); diff --git a/packages/cli/test/commands/send-envelope.test.ts b/packages/cli/test/commands/send-envelope.test.ts index 1db3406b83..5dbd88e148 100644 --- a/packages/cli/test/commands/send-envelope.test.ts +++ b/packages/cli/test/commands/send-envelope.test.ts @@ -2,26 +2,32 @@ * Tests for `sentry send-envelope` deprecation shim. */ +import type { SentryContext } from "../../src/context.js"; import { beforeEach, describe, expect, test, vi } from "vitest"; import { sendEnvelopeCommand } from "../../src/commands/send-envelope.js"; import { CliError } from "../../src/lib/errors.js"; -import { useTestConfigDir } from "../helpers.js"; +import { + useTestConfigDir, + loadCommand, + type TestCommandFunction, +} from "../helpers.js"; +import type { Writer } from "../../src/types/index.js"; useTestConfigDir("send-envelope-"); function makeContext() { return { - stdout: { write: vi.fn(() => true) }, - stderr: { write: vi.fn(() => true) }, + stdout: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }; } describe("sendEnvelopeCommand (deprecation shim)", () => { - let func: Awaited>; + let func: TestCommandFunction; beforeEach(async () => { - func = await sendEnvelopeCommand.loader(); + func = await loadCommand(sendEnvelopeCommand); }); test("throws CliError suggesting event send --raw", async () => { diff --git a/packages/cli/test/commands/snapshots/diff.test.ts b/packages/cli/test/commands/snapshots/diff.test.ts index e805958882..22fbec632d 100644 --- a/packages/cli/test/commands/snapshots/diff.test.ts +++ b/packages/cli/test/commands/snapshots/diff.test.ts @@ -19,6 +19,7 @@ import { PNG } from "pngjs"; import { afterEach, beforeEach, describe, expect, test } from "vitest"; import { diffCommand } from "../../../src/commands/snapshots/diff.js"; import { ValidationError } from "../../../src/lib/errors.js"; +import { loadCommand } from "../../helpers.js"; let tmpDir: string; let baseDir: string; @@ -82,7 +83,7 @@ describe("snapshots diff", () => { writeFileSync(join(headDir, "added.png"), png([1, 1, 1])); const harness = createContext(); - const func = await diffCommand.loader(); + const func = await loadCommand(diffCommand); await func.call(harness.context, { output: outDir }, baseDir, headDir); // A mask was written for the changed image, but not the unchanged one. @@ -97,7 +98,7 @@ describe("snapshots diff", () => { writeFileSync(join(headDir, "a.png"), png([255, 255, 255])); const harness = createContext(); - const func = await diffCommand.loader(); + const func = await loadCommand(diffCommand); await func.call( harness.context, { output: outDir, "fail-on-diff": true }, @@ -113,7 +114,7 @@ describe("snapshots diff", () => { writeFileSync(join(headDir, "a.png"), png([5, 5, 5])); const harness = createContext(); - const func = await diffCommand.loader(); + const func = await loadCommand(diffCommand); await func.call( harness.context, { output: outDir, "fail-on-diff": true }, @@ -131,7 +132,7 @@ describe("snapshots diff", () => { writeFileSync(join(headDir, "new.png"), png([4, 5, 6])); const harness = createContext(); - const func = await diffCommand.loader(); + const func = await loadCommand(diffCommand); await func.call(harness.context, { output: outDir }, baseDir, headDir); const out = harness.output(); @@ -144,7 +145,7 @@ describe("snapshots diff", () => { // Without --selective, a base-only image is a removal → fail-on-diff exits 1. const removedHarness = createContext(); - const func = await diffCommand.loader(); + const func = await loadCommand(diffCommand); await func.call( removedHarness.context, { output: outDir, "fail-on-diff": true }, @@ -170,7 +171,7 @@ describe("snapshots diff", () => { writeFileSync(join(headDir, "bad.png"), Buffer.from("not a png BBBB")); const harness = createContext(); - const func = await diffCommand.loader(); + const func = await loadCommand(diffCommand); await func.call( harness.context, { output: outDir, "fail-on-diff": true }, @@ -188,7 +189,7 @@ describe("snapshots diff", () => { writeFileSync(join(headDir, "a.png"), png([255, 255, 255])); const harness = createContext(); - const func = await diffCommand.loader(); + const func = await loadCommand(diffCommand); await func.call( harness.context, { output: outDir, "no-antialiasing": true }, @@ -201,7 +202,7 @@ describe("snapshots diff", () => { test("rejects a missing base directory", async () => { const harness = createContext(); - const func = await diffCommand.loader(); + const func = await loadCommand(diffCommand); await expect( func.call(harness.context, {}, join(tmpDir, "nope"), headDir), ).rejects.toThrow(ValidationError); diff --git a/packages/cli/test/commands/snapshots/download.test.ts b/packages/cli/test/commands/snapshots/download.test.ts index dae94ca7e6..69ed0de23a 100644 --- a/packages/cli/test/commands/snapshots/download.test.ts +++ b/packages/cli/test/commands/snapshots/download.test.ts @@ -17,6 +17,7 @@ import * as preprod from "../../../src/lib/api/preprod-artifacts.js"; import { ContextError, ValidationError } from "../../../src/lib/errors.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; +import { loadCommand } from "../../helpers.js"; let tmpDir: string; @@ -92,7 +93,7 @@ describe("snapshots download", () => { test("downloads a snapshot by --snapshot-id and extracts images", async () => { const out = join(tmpDir, "base"); const harness = createContext(); - const func = await downloadCommand.loader(); + const func = await loadCommand(downloadCommand); await func.call(harness.context, { "snapshot-id": "snap-1", @@ -112,7 +113,7 @@ describe("snapshots download", () => { test("resolves the latest baseline by --app-id", async () => { const harness = createContext(); - const func = await downloadCommand.loader(); + const func = await loadCommand(downloadCommand); await func.call(harness.context, { "app-id": "my-app", @@ -128,7 +129,7 @@ describe("snapshots download", () => { }); test("rejects when both --app-id and --snapshot-id are given", async () => { - const func = await downloadCommand.loader(); + const func = await loadCommand(downloadCommand); await expect( func.call(createContext().context, { "app-id": "a", @@ -138,14 +139,14 @@ describe("snapshots download", () => { }); test("rejects when neither --app-id nor --snapshot-id is given", async () => { - const func = await downloadCommand.loader(); + const func = await loadCommand(downloadCommand); await expect(func.call(createContext().context, {})).rejects.toThrow( ContextError, ); }); test("rejects --branch without --app-id", async () => { - const func = await downloadCommand.loader(); + const func = await loadCommand(downloadCommand); await expect( func.call(createContext().context, { "snapshot-id": "s", diff --git a/packages/cli/test/commands/snapshots/upload.test.ts b/packages/cli/test/commands/snapshots/upload.test.ts index f003d4d844..13afc7520b 100644 --- a/packages/cli/test/commands/snapshots/upload.test.ts +++ b/packages/cli/test/commands/snapshots/upload.test.ts @@ -10,7 +10,15 @@ import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises"; import { tmpdir } from "node:os"; import { join } from "node:path"; import { PNG } from "pngjs"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + type MockInstance, + test, + vi, +} from "vitest"; import { uploadCommand } from "../../../src/commands/snapshots/upload.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as preprod from "../../../src/lib/api/preprod-artifacts.js"; @@ -19,6 +27,7 @@ import { ValidationError } from "../../../src/lib/errors.js"; import * as objectstore from "../../../src/lib/objectstore.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; +import { loadCommand, must } from "../../helpers.js"; let tmpDir: string; @@ -67,13 +76,15 @@ const UPLOAD_OPTIONS = { describe("snapshots upload", () => { let existsSpy: ReturnType; - let putSpy: ReturnType; + let putSpy: MockInstance<(typeof objectstore)["putObjects"]>; let createSpy: ReturnType; let uploadOptionsSpy: ReturnType; beforeEach(async () => { tmpDir = await mkdtemp(join(tmpdir(), "snap-up-")); vi.spyOn(resolveTarget, "resolveOrgAndProject").mockResolvedValue({ + orgDisplay: "test-org", + projectDisplay: "test-project", org: "test-org", project: "test-project", }); @@ -99,7 +110,7 @@ describe("snapshots upload", () => { /** Object keys passed to `putObjects` across all calls. */ function uploadedKeys(): string[] { return putSpy.mock.calls.flatMap(([, uploads]) => - (uploads as objectstore.ObjectUpload[]).map((u) => u.key), + uploads.map((u) => u.key), ); } @@ -120,7 +131,7 @@ describe("snapshots upload", () => { uploadOptionsSpy.mockResolvedValue({ objectstore: config }); const dir = await writeShots(); const harness = createContext(); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await func.call(harness.context, { "app-id": "com.example.app" }, dir); @@ -134,21 +145,24 @@ describe("snapshots upload", () => { string, Record, ]; - expect(manifest.app_id).toBe("com.example.app"); - const images = manifest.images as Record>; + expect(manifest["app_id"]).toBe("com.example.app"); + const images = manifest["images"] as Record< + string, + Record + >; expect(Object.keys(images).sort()).toEqual(["a.png", "sub/b.png"]); expect(images["a.png"]).toMatchObject({ width: 4, height: 3, note: "hi", }); - expect(images["a.png"].content_hash).toMatch(/^[0-9a-f]{64}$/); + expect(must(images["a.png"])["content_hash"]).toMatch(/^[0-9a-f]{64}$/); // selective omitted when not requested. - expect(manifest.selective).toBeUndefined(); + expect(manifest["selective"]).toBeUndefined(); expect(harness.output()).toContain("snap-1"); // The objectstore key is `{orgId}/{projectId}/{sha256}` from the scope. - const hash = images["a.png"].content_hash as string; + const hash = must(images["a.png"])["content_hash"] as string; const key = uploadedKeys().find((k) => k.endsWith(hash)) as string; expect(key).toMatch(/^1\/2\/[0-9a-f]{64}$/); expect(existsSpy).toHaveBeenCalledTimes(1); @@ -179,7 +193,7 @@ describe("snapshots upload", () => { }), ); const harness = createContext(); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await func.call(harness.context, { "app-id": "app" }, dir); @@ -188,18 +202,18 @@ describe("snapshots upload", () => { string, Record, ]; - const entry = (manifest.images as Record>)[ - "a.png" - ]; - expect(entry.width).toBe(4); - expect(entry.height).toBe(3); - expect(entry.content_hash).toMatch(/^[0-9a-f]{64}$/); - expect(entry.keep).toBe(1); + const entry = must( + (manifest["images"] as Record>)["a.png"], + ); + expect(entry["width"]).toBe(4); + expect(entry["height"]).toBe(3); + expect(entry["content_hash"]).toMatch(/^[0-9a-f]{64}$/); + expect(entry["keep"]).toBe(1); }); test("rejects --pr-number without a resolvable base SHA", async () => { const dir = await writeShots(); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await expect( func.call( createContext().context, @@ -212,7 +226,7 @@ describe("snapshots upload", () => { test("resolves a relative folder path against the command cwd", async () => { await writeShots(); // creates /shots const harness = createContext(); // cwd === tmpDir - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await func.call(harness.context, { "app-id": "app" }, "shots"); @@ -227,7 +241,7 @@ describe("snapshots upload", () => { async (_config: unknown, requested: string[]) => new Set([requested[0]]), ); const harness = createContext(); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await func.call(harness.context, { "app-id": "app" }, dir); @@ -239,7 +253,7 @@ describe("snapshots upload", () => { const dir = join(tmpDir, "empty"); await mkdir(dir); const harness = createContext(); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await func.call(harness.context, { "app-id": "app" }, dir); @@ -257,7 +271,7 @@ describe("snapshots upload", () => { snapshotUrl: "https://sentry.io/snap-empty", }); const harness = createContext(); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await func.call( harness.context, @@ -292,7 +306,7 @@ describe("snapshots upload", () => { imageCount: 0, snapshotUrl: null, }); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await func.call( createContext().context, @@ -314,7 +328,7 @@ describe("snapshots upload", () => { const dir = join(tmpDir, "empty"); await mkdir(dir); const harness = createContext(); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await func.call(harness.context, { "app-id": "app", selective: true }, dir); @@ -326,7 +340,7 @@ describe("snapshots upload", () => { test("rejects an unreadable image-name file for an empty upload", async () => { const dir = join(tmpDir, "empty"); await mkdir(dir); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await expect( func.call( @@ -346,7 +360,7 @@ describe("snapshots upload", () => { const namesFile = join(tmpDir, "all-images.txt"); await mkdir(dir); await writeFile(namesFile, " \n\n"); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await expect( func.call( @@ -364,7 +378,7 @@ describe("snapshots upload", () => { ])("rejects an explicitly empty image-name flag", async (flag) => { const dir = join(tmpDir, "empty"); await mkdir(dir); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await expect( func.call(createContext().context, { "app-id": "app", ...flag }, dir), @@ -375,7 +389,7 @@ describe("snapshots upload", () => { test("rejects a path that is not a directory", async () => { const file = join(tmpDir, "a.png"); await writeFile(file, pngBytes(1, 1)); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await expect( func.call(createContext().context, { "app-id": "app" }, file), ).rejects.toThrow(ValidationError); @@ -383,7 +397,7 @@ describe("snapshots upload", () => { test("marks selective + rejects images missing from --all-image-file-names", async () => { const dir = await writeShots(); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await expect( func.call( createContext().context, @@ -396,7 +410,7 @@ describe("snapshots upload", () => { test("passes diff-threshold and selective into the manifest", async () => { const dir = await writeShots(); const harness = createContext(); - const func = await uploadCommand.loader(); + const func = await loadCommand(uploadCommand); await func.call( harness.context, @@ -409,7 +423,7 @@ describe("snapshots upload", () => { string, Record, ]; - expect(manifest.diff_threshold).toBe(0.05); - expect(manifest.selective).toBe(true); + expect(manifest["diff_threshold"]).toBe(0.05); + expect(manifest["selective"]).toBe(true); }); }); diff --git a/packages/cli/test/commands/sourcemap/inject.test.ts b/packages/cli/test/commands/sourcemap/inject.test.ts index 0edbc54724..0edb970a10 100644 --- a/packages/cli/test/commands/sourcemap/inject.test.ts +++ b/packages/cli/test/commands/sourcemap/inject.test.ts @@ -10,6 +10,7 @@ import { join } from "node:path"; import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; import { injectCommand } from "../../../src/commands/sourcemap/inject.js"; import { useEnvSandbox, useTestConfigDir } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; type InjectFuncArgs = { ext?: string; @@ -24,8 +25,8 @@ type CmdFunc = ( function makeContext() { return { - stdout: { write: vi.fn(() => true) }, - stderr: { write: vi.fn(() => true) }, + stdout: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }; } diff --git a/packages/cli/test/commands/sourcemap/upload.test.ts b/packages/cli/test/commands/sourcemap/upload.test.ts index 7fbcbef494..8f0d3f2639 100644 --- a/packages/cli/test/commands/sourcemap/upload.test.ts +++ b/packages/cli/test/commands/sourcemap/upload.test.ts @@ -16,6 +16,7 @@ import * as sourcemapsApi from "../../../src/lib/api/sourcemaps.js"; import { ValidationError } from "../../../src/lib/errors.js"; import { getDebugIdSnippet } from "../../../src/lib/sourcemap/debug-id.js"; import { buildEmptyDiscoveryError } from "../../../src/lib/sourcemap/inject.js"; +import type { Writer } from "../../../src/types/index.js"; type InjectFuncArgs = { ext?: string; @@ -38,8 +39,8 @@ type CmdFunc = (this: unknown, flags: A, dir: string) => Promise; function makeContext() { return { - stdout: { write: vi.fn(() => true) }, - stderr: { write: vi.fn(() => true) }, + stdout: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }; } @@ -264,11 +265,11 @@ describe("sourcemap upload command — --allow-empty behavior", () => { dir = await mkdtemp(join(tmpdir(), "sentry-upload-cmd-")); // Short-circuit resolveOrgAndProject so tests don't need DSN/config. savedEnv = { - SENTRY_ORG: process.env.SENTRY_ORG, - SENTRY_PROJECT: process.env.SENTRY_PROJECT, + SENTRY_ORG: process.env["SENTRY_ORG"], + SENTRY_PROJECT: process.env["SENTRY_PROJECT"], }; - process.env.SENTRY_ORG = "test-org"; - process.env.SENTRY_PROJECT = "test-project"; + process.env["SENTRY_ORG"] = "test-org"; + process.env["SENTRY_PROJECT"] = "test-project"; func = (await uploadCommand.loader()) as unknown as CmdFunc; }); @@ -307,8 +308,8 @@ describe("sourcemap upload command — --allow-empty behavior", () => { // The library-only / conditional-release-skip cases named in the // docs may run without DSN/org/project context. With nothing to // upload, the command must not insist on resolving them. - delete process.env.SENTRY_ORG; - delete process.env.SENTRY_PROJECT; + delete process.env["SENTRY_ORG"]; + delete process.env["SENTRY_PROJECT"]; const ctx = makeContext(); await expect( func.call(ctx, { "allow-empty": true }, dir), @@ -326,8 +327,8 @@ describe("sourcemap upload command — --allow-empty behavior", () => { test("non-existent directory: throws before resolving org/project", async () => { // Cleared so the dir-check has to fire first to produce a useful error. - delete process.env.SENTRY_ORG; - delete process.env.SENTRY_PROJECT; + delete process.env["SENTRY_ORG"]; + delete process.env["SENTRY_PROJECT"]; const missing = join(dir, "does-not-exist"); const ctx = makeContext(); try { diff --git a/packages/cli/test/commands/span/list.test.ts b/packages/cli/test/commands/span/list.test.ts index dceee184b5..d876d01c9a 100644 --- a/packages/cli/test/commands/span/list.test.ts +++ b/packages/cli/test/commands/span/list.test.ts @@ -8,7 +8,15 @@ * - listCommand.func (project mode): new project-scoped behavior */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { listCommand, parseSort, @@ -18,12 +26,8 @@ import { vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -32,12 +36,8 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/db/pagination.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -46,12 +46,8 @@ import * as paginationDb from "../../../src/lib/db/pagination.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); import { ApiError, ValidationError } from "../../../src/lib/errors.js"; @@ -59,12 +55,10 @@ import { ApiError, ValidationError } from "../../../src/lib/errors.js"; import * as resolveTarget from "../../../src/lib/resolve-target.js"; import { parsePeriod } from "../../../src/lib/time-range.js"; import { FlatSpanSchema } from "../../../src/generated/output-schemas/span.js"; +import { at, must } from "../../helpers.js"; const VALID_TRACE_ID = "aaaa1111bbbb2222cccc3333dddd4444"; -// Reference paginationDb early to prevent import stripping by auto-organize -const _paginationDbRef = paginationDb; - // Note: trace-target parsing tests are in test/lib/trace-target.test.ts // ============================================================================ @@ -176,7 +170,7 @@ describe("parseSpanListInput", () => { }); test("a pasted URL's server is returned, not applied", () => { - const savedUrl = process.env.SENTRY_URL; + const savedUrl = process.env["SENTRY_URL"]; expect( parseSpanListInput([ `https://sentry.example.com/organizations/acme/traces/${VALID_TRACE_ID}/`, @@ -185,7 +179,7 @@ describe("parseSpanListInput", () => { mode: "trace", trace: { baseUrl: "https://sentry.example.com" }, }); - expect(process.env.SENTRY_URL).toBe(savedUrl); + expect(process.env["SENTRY_URL"]).toBe(savedUrl); }); }); @@ -201,11 +195,17 @@ type ListFunc = ( describe("listCommand.func (trace mode)", () => { let func: ListFunc; - let listSpansSpy: ReturnType; - let resolveOrgAndProjectSpy: ReturnType; - let resolveCursorSpy: ReturnType; - let advancePaginationStateSpy: ReturnType; - let hasPreviousPageSpy: ReturnType; + let listSpansSpy: MockInstance<(typeof apiClient)["listSpans"]>; + let resolveOrgAndProjectSpy: MockInstance< + (typeof resolveTarget)["resolveOrgAndProject"] + >; + let resolveCursorSpy: MockInstance<(typeof paginationDb)["resolveCursor"]>; + let advancePaginationStateSpy: MockInstance< + (typeof paginationDb)["advancePaginationState"] + >; + let hasPreviousPageSpy: MockInstance< + (typeof paginationDb)["hasPreviousPage"] + >; function createContext() { const stdoutChunks: string[] = []; @@ -232,6 +232,8 @@ describe("listCommand.func (trace mode)", () => { listSpansSpy = vi.spyOn(apiClient, "listSpans"); resolveOrgAndProjectSpy = vi.spyOn(resolveTarget, "resolveOrgAndProject"); resolveOrgAndProjectSpy.mockResolvedValue({ + orgDisplay: "test-org", + projectDisplay: "test-project", org: "test-org", project: "test-project", }); @@ -268,7 +270,6 @@ describe("listCommand.func (trace mode)", () => { trace: VALID_TRACE_ID, }, ], - nextCursor: undefined, }); const { context, getStdout } = createContext(); @@ -298,7 +299,7 @@ describe("listCommand.func (trace mode)", () => { }); test("translates query shorthand when --query is set", async () => { - listSpansSpy.mockResolvedValue({ data: [], nextCursor: undefined }); + listSpansSpy.mockResolvedValue({ data: [] }); const { context } = createContext(); @@ -324,7 +325,7 @@ describe("listCommand.func (trace mode)", () => { }); test("requests discovered typed attribute keys intact through --fields", async () => { - listSpansSpy.mockResolvedValue({ data: [], nextCursor: undefined }); + listSpansSpy.mockResolvedValue({ data: [] }); const { context } = createContext(); await func.call( @@ -371,7 +372,7 @@ describe("listCommand.func (trace mode)", () => { }); test("uses explicit org/project when target is provided", async () => { - listSpansSpy.mockResolvedValue({ data: [], nextCursor: undefined }); + listSpansSpy.mockResolvedValue({ data: [] }); const { context } = createContext(); @@ -409,7 +410,6 @@ describe("listCommand.func (trace mode)", () => { trace: VALID_TRACE_ID, }, ], - nextCursor: undefined, }); const { context } = createContext(); @@ -503,7 +503,7 @@ describe("listCommand.func (trace mode)", () => { }); test("passes statsPeriod to listSpans", async () => { - listSpansSpy.mockResolvedValue({ data: [], nextCursor: undefined }); + listSpansSpy.mockResolvedValue({ data: [] }); const { context } = createContext(); @@ -537,7 +537,6 @@ describe("listCommand.func (trace mode)", () => { trace: VALID_TRACE_ID, }, ], - nextCursor: undefined, }); const { context, getStdout } = createContext(); @@ -568,7 +567,6 @@ describe("listCommand.func (trace mode)", () => { trace: VALID_TRACE_ID, }, ], - nextCursor: undefined, }); const { context, getStdout } = createContext(); @@ -604,7 +602,6 @@ describe("listCommand.func (trace mode)", () => { trace: VALID_TRACE_ID, }, ], - nextCursor: undefined, }); const { context, getStdout } = createContext(); @@ -627,7 +624,7 @@ describe("listCommand.func (trace mode)", () => { }); test("trace mode passes allProjects: true to listSpans", async () => { - listSpansSpy.mockResolvedValue({ data: [], nextCursor: undefined }); + listSpansSpy.mockResolvedValue({ data: [] }); const { context } = createContext(); @@ -729,7 +726,6 @@ describe("listCommand.func (project mode)", () => { trace: VALID_TRACE_ID, }, ], - nextCursor: undefined, }); const { context, getStdout } = createContext(); @@ -743,7 +739,7 @@ describe("listCommand.func (project mode)", () => { }); // Should NOT have trace: prefix in the query - const callArgs = listSpansSpy.mock.calls[0]; + const callArgs = at(listSpansSpy.mock.calls, 0); const query = callArgs[2]?.query; expect(query).toBeUndefined(); @@ -752,7 +748,7 @@ describe("listCommand.func (project mode)", () => { }); test("uses explicit org/project in project mode", async () => { - listSpansSpy.mockResolvedValue({ data: [], nextCursor: undefined }); + listSpansSpy.mockResolvedValue({ data: [] }); const { context } = createContext(); @@ -781,7 +777,7 @@ describe("listCommand.func (project mode)", () => { }); test("translates query in project mode", async () => { - listSpansSpy.mockResolvedValue({ data: [], nextCursor: undefined }); + listSpansSpy.mockResolvedValue({ data: [] }); const { context } = createContext(); @@ -854,7 +850,7 @@ describe("listCommand.func (project mode)", () => { }); test("passes statsPeriod in project mode", async () => { - listSpansSpy.mockResolvedValue({ data: [], nextCursor: undefined }); + listSpansSpy.mockResolvedValue({ data: [] }); const { context } = createContext(); @@ -891,7 +887,6 @@ describe("listCommand.func (project mode)", () => { trace: VALID_TRACE_ID, }, ], - nextCursor: undefined, }); const { context, getStdout } = createContext(); @@ -950,7 +945,7 @@ describe("listCommand.func (project mode)", () => { }); test("shows 'No spans matched' when empty in project mode", async () => { - listSpansSpy.mockResolvedValue({ data: [], nextCursor: undefined }); + listSpansSpy.mockResolvedValue({ data: [] }); const { context, getStdout } = createContext(); @@ -970,7 +965,7 @@ describe("listCommand.func (project mode)", () => { }); test("project mode does not pass allProjects to listSpans", async () => { - listSpansSpy.mockResolvedValue({ data: [], nextCursor: undefined }); + listSpansSpy.mockResolvedValue({ data: [] }); const { context } = createContext(); @@ -985,8 +980,8 @@ describe("listCommand.func (project mode)", () => { "my-org/my-project", ); - const callArgs = listSpansSpy.mock.calls[0]; - const options = callArgs[2]; + const callArgs = at(listSpansSpy.mock.calls, 0); + const options = must(callArgs[2]); expect(options.allProjects).toBeUndefined(); expect(options.projectId).toBe(4242); }); diff --git a/packages/cli/test/commands/span/view.test.ts b/packages/cli/test/commands/span/view.test.ts index 87bbf8dd85..6c235a0bd8 100644 --- a/packages/cli/test/commands/span/view.test.ts +++ b/packages/cli/test/commands/span/view.test.ts @@ -6,7 +6,15 @@ */ import { ArgumentParseError } from "@stricli/core"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { parseSpanViewInput, viewCommand, @@ -15,12 +23,8 @@ import { vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -37,17 +41,14 @@ import { validateSpanId } from "../../../src/lib/hex-id.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; import { parseTraceArgumentsInput } from "../../../src/lib/trace-target.js"; +import type { TraceSpan } from "../../../src/types/index.js"; const VALID_TRACE_ID = "aaaa1111bbbb2222cccc3333dddd4444"; const VALID_SPAN_ID = "a1b2c3d4e5f67890"; @@ -251,7 +252,7 @@ type ViewFunc = ( ) => Promise; /** Minimal trace span tree for testing */ -function makeTraceSpan(spanId: string, children: unknown[] = []): unknown { +function makeTraceSpan(spanId: string, children: TraceSpan[] = []): TraceSpan { return { span_id: spanId, parent_span_id: null, @@ -268,9 +269,11 @@ function makeTraceSpan(spanId: string, children: unknown[] = []): unknown { describe("viewCommand.func", () => { let func: ViewFunc; - let getDetailedTraceSpy: ReturnType; - let getSpanDetailsSpy: ReturnType; - let resolveOrgAndProjectSpy: ReturnType; + let getDetailedTraceSpy: MockInstance<(typeof apiClient)["getDetailedTrace"]>; + let getSpanDetailsSpy: MockInstance<(typeof apiClient)["getSpanDetails"]>; + let resolveOrgAndProjectSpy: MockInstance< + (typeof resolveTarget)["resolveOrgAndProject"] + >; function createContext() { const stdoutChunks: string[] = []; @@ -299,11 +302,13 @@ describe("viewCommand.func", () => { .spyOn(apiClient, "getSpanDetails") .mockResolvedValue({ itemId: "mock-span", - itemType: "span", + timestamp: "2023-11-14T22:13:20.000Z", attributes: [], }); resolveOrgAndProjectSpy = vi.spyOn(resolveTarget, "resolveOrgAndProject"); resolveOrgAndProjectSpy.mockResolvedValue({ + orgDisplay: "test-org", + projectDisplay: "test-project", org: "test-org", project: "test-project", }); diff --git a/packages/cli/test/commands/status/show.test.ts b/packages/cli/test/commands/status/show.test.ts index e524e04155..796565a049 100644 --- a/packages/cli/test/commands/status/show.test.ts +++ b/packages/cli/test/commands/status/show.test.ts @@ -8,6 +8,7 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; import { showCommand } from "../../../src/commands/status/show.js"; +import type { Writer } from "../../../src/types/index.js"; type ShowFlags = { readonly json: boolean; @@ -38,7 +39,7 @@ function createContext() { stdoutChunks.push(s); }), }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, getOutput: () => stdoutChunks.join(""), diff --git a/packages/cli/test/commands/team/list.test.ts b/packages/cli/test/commands/team/list.test.ts index a9bfedaf5c..6ce1a48b3e 100644 --- a/packages/cli/test/commands/team/list.test.ts +++ b/packages/cli/test/commands/team/list.test.ts @@ -12,12 +12,8 @@ import { listCommand } from "../../../src/commands/team/list.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for vi.mocked access @@ -27,12 +23,8 @@ import { DEFAULT_SENTRY_URL } from "../../../src/lib/constants.js"; vi.mock("../../../src/lib/db/pagination.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for vi.mocked access @@ -43,17 +35,15 @@ import { ApiError, ValidationError } from "../../../src/lib/errors.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for vi.mocked access import * as resolveTarget from "../../../src/lib/resolve-target.js"; import type { SentryTeam } from "../../../src/types/sentry.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; // Sample test data const sampleTeams: SentryTeam[] = [ @@ -78,8 +68,8 @@ const sampleTeams: SentryTeam[] = [ ]; function createMockContext(cwd = "/tmp") { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -102,13 +92,20 @@ describe("listCommand.func — project-search (bare slug)", () => { test("outputs JSON array when --json flag is set", async () => { findProjectsBySlugSpy.mockResolvedValue({ - projects: [{ slug: "test-org-proj", orgSlug: "test-org" }], + projects: [ + { + id: "1", + slug: "test-org-proj", + name: "test-org-proj", + orgSlug: "test-org", + }, + ], orgs: [], }); listProjectTeamsSpy.mockResolvedValue(sampleTeams); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: true }, "test-org-proj"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -121,13 +118,20 @@ describe("listCommand.func — project-search (bare slug)", () => { test("outputs empty JSON array when no teams found with --json", async () => { findProjectsBySlugSpy.mockResolvedValue({ - projects: [{ slug: "test-org-proj", orgSlug: "test-org" }], + projects: [ + { + id: "1", + slug: "test-org-proj", + name: "test-org-proj", + orgSlug: "test-org", + }, + ], orgs: [], }); listProjectTeamsSpy.mockResolvedValue([]); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: true }, "test-org-proj"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -136,13 +140,20 @@ describe("listCommand.func — project-search (bare slug)", () => { test("writes 'No teams found' when empty without --json", async () => { findProjectsBySlugSpy.mockResolvedValue({ - projects: [{ slug: "test-org-proj", orgSlug: "test-org" }], + projects: [ + { + id: "1", + slug: "test-org-proj", + name: "test-org-proj", + orgSlug: "test-org", + }, + ], orgs: [], }); listProjectTeamsSpy.mockResolvedValue([]); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, "test-org-proj"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -151,13 +162,20 @@ describe("listCommand.func — project-search (bare slug)", () => { test("writes header and rows for human output", async () => { findProjectsBySlugSpy.mockResolvedValue({ - projects: [{ slug: "test-org-proj", orgSlug: "test-org" }], + projects: [ + { + id: "1", + slug: "test-org-proj", + name: "test-org-proj", + orgSlug: "test-org", + }, + ], orgs: [], }); listProjectTeamsSpy.mockResolvedValue(sampleTeams); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, "test-org-proj"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -181,13 +199,20 @@ describe("listCommand.func — project-search (bare slug)", () => { name: `Team ${i}`, })); findProjectsBySlugSpy.mockResolvedValue({ - projects: [{ slug: "test-org-proj", orgSlug: "test-org" }], + projects: [ + { + id: "1", + slug: "test-org-proj", + name: "test-org-proj", + orgSlug: "test-org", + }, + ], orgs: [], }); listProjectTeamsSpy.mockResolvedValue(manyTeams); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 5, json: false }, "test-org-proj"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -196,13 +221,20 @@ describe("listCommand.func — project-search (bare slug)", () => { test("shows all teams when count is under limit", async () => { findProjectsBySlugSpy.mockResolvedValue({ - projects: [{ slug: "test-org-proj", orgSlug: "test-org" }], + projects: [ + { + id: "1", + slug: "test-org-proj", + name: "test-org-proj", + orgSlug: "test-org", + }, + ], orgs: [], }); listProjectTeamsSpy.mockResolvedValue(sampleTeams); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, "test-org-proj"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -213,7 +245,7 @@ describe("listCommand.func — project-search (bare slug)", () => { findProjectsBySlugSpy.mockResolvedValue({ projects: [], orgs: [] }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: true }, "unknown-proj"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -242,12 +274,11 @@ describe("listCommand.func — explicit org/project", () => { data: sampleTeams.filter( (team) => !opts?.query || team.slug.includes(opts.query), ), - nextCursor: undefined, }), ); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, "my-org/backnd"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -260,11 +291,10 @@ describe("listCommand.func — explicit org/project", () => { listProjectTeamsSpy.mockRejectedValue(new ApiError("Not found", 404)); listTeamsPaginatedSpy.mockResolvedValue({ data: sampleTeams, - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, "my-org/zzzzzz"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -277,7 +307,7 @@ describe("listCommand.func — explicit org/project", () => { listProjectTeamsSpy.mockRejectedValue(new ApiError("Forbidden", 403)); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call(context, { limit: 30, json: false }, "my-org/my-project"), ).rejects.toThrow("Forbidden"); @@ -288,7 +318,7 @@ describe("listCommand.func — explicit org/project", () => { listProjectTeamsSpy.mockResolvedValue(sampleTeams); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, "my-org/my-project"); expect(listProjectTeamsSpy).toHaveBeenCalledWith("my-org", "my-project"); @@ -298,7 +328,7 @@ describe("listCommand.func — explicit org/project", () => { listProjectTeamsSpy.mockResolvedValue(sampleTeams); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: true }, "my-org/my-project"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -333,7 +363,7 @@ describe("listCommand.func — auto-detect mode", () => { listTeamsSpy.mockResolvedValue(sampleTeams); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, undefined); expect(listTeamsSpy).toHaveBeenCalledWith("default-org"); @@ -344,7 +374,7 @@ describe("listCommand.func — auto-detect mode", () => { listTeamsSpy.mockResolvedValue(sampleTeams); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, undefined); expect(listTeamsSpy).toHaveBeenCalledWith("detected-org"); @@ -359,7 +389,7 @@ describe("listCommand.func — auto-detect mode", () => { listTeamsSpy.mockResolvedValue(sampleTeams); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, undefined); expect(listOrganizationsSpy).toHaveBeenCalled(); @@ -370,7 +400,7 @@ describe("listCommand.func — auto-detect mode", () => { listTeamsSpy.mockResolvedValue(sampleTeams); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: true }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -384,7 +414,7 @@ describe("listCommand.func — auto-detect mode", () => { listTeamsSpy.mockResolvedValue([]); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -397,7 +427,7 @@ describe("listCommand.func — auto-detect mode", () => { listTeamsSpy.mockResolvedValue([]); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: false }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -429,11 +459,10 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { test("returns paginated JSON with hasMore=false when no nextCursor", async () => { listTeamsPaginatedSpy.mockResolvedValue({ data: sampleTeams, - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 25, json: true }, "my-org/"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -451,7 +480,7 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 2, json: true }, "my-org/"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -468,7 +497,7 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 25, json: false }, "my-org/"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -481,11 +510,10 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { test("human output shows count without next-page hint when no more", async () => { listTeamsPaginatedSpy.mockResolvedValue({ data: sampleTeams, - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 25, json: false }, "my-org/"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -496,11 +524,10 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { test("human output 'No teams found' when empty and no cursor", async () => { listTeamsPaginatedSpy.mockResolvedValue({ data: [], - nextCursor: undefined, }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 25, json: false }, "my-org/"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -514,11 +541,10 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { }); listTeamsPaginatedSpy.mockResolvedValue({ data: sampleTeams, - nextCursor: undefined, }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 25, json: false, cursor: "explicit:cursor:value" }, @@ -538,11 +564,10 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { }); listTeamsPaginatedSpy.mockResolvedValue({ data: sampleTeams, - nextCursor: undefined, }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 25, json: false, cursor: "next" }, @@ -564,7 +589,7 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call(context, { limit: 25, json: false, cursor: "next" }, "my-org/"), @@ -573,7 +598,7 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { test("throws ValidationError when --cursor used outside org-all mode", async () => { const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call( @@ -587,11 +612,10 @@ describe("listCommand.func — org-all mode (cursor pagination)", () => { test("passes perPage from limit to paginated call", async () => { listTeamsPaginatedSpy.mockResolvedValue({ data: [], - nextCursor: undefined, }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 10, json: false }, "my-org/"); expect(listTeamsPaginatedSpy).toHaveBeenCalledWith( @@ -612,7 +636,6 @@ describe("listCommand.func — name filter", () => { setOrgRegion("test-org", DEFAULT_SENTRY_URL); listTeamsPaginatedSpy.mockResolvedValue({ data: sampleTeams, - nextCursor: undefined, }); }); @@ -624,7 +647,7 @@ describe("listCommand.func — name filter", () => { async function runJson(...args: (string | undefined)[]) { const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { limit: 30, json: true }, ...args); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); const parsed = JSON.parse(output); diff --git a/packages/cli/test/commands/token/accounts.test.ts b/packages/cli/test/commands/token/accounts.test.ts index 2cd362f0ce..538ae7c6db 100644 --- a/packages/cli/test/commands/token/accounts.test.ts +++ b/packages/cli/test/commands/token/accounts.test.ts @@ -18,7 +18,9 @@ import { resetHostScopingState, useEnvSandbox, useTestConfigDir, + loadCommand, } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; const getConfigDir = useTestConfigDir("token-accounts-", { isolateProjectRoot: true, @@ -119,11 +121,11 @@ async function runCommand( target: string, name = "list", ): Promise { - const func = await command.loader(); + const func = await loadCommand(command); await func.call( { - stdout: { write: vi.fn(() => true) }, - stderr: { write: vi.fn(() => true) }, + stdout: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: getConfigDir(), commandPrefix: ["sentry", "token", name], }, diff --git a/packages/cli/test/commands/token/create.test.ts b/packages/cli/test/commands/token/create.test.ts index 9db2f32b60..4aaf505a79 100644 --- a/packages/cli/test/commands/token/create.test.ts +++ b/packages/cli/test/commands/token/create.test.ts @@ -5,17 +5,13 @@ import { stripVTControlCharacters } from "node:util"; import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; import { createCommand } from "../../../src/commands/token/create.js"; -import { useEnvSandbox } from "../../helpers.js"; +import { useEnvSandbox, loadCommand } from "../../helpers.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -29,12 +25,8 @@ import { vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -48,6 +40,7 @@ vi.mock("../../../src/lib/scope-recovery.js", async (importOriginal) => { // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for vi.mocked access import * as scopeRecovery from "../../../src/lib/scope-recovery.js"; +import type { Writer } from "../../../src/types/index.js"; const created = { id: "9", @@ -62,11 +55,11 @@ const created = { const flags = { "dry-run": false, json: false }; function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, stdoutWrite, @@ -103,7 +96,7 @@ describe("token create", () => { test("prints a long token intact on its own line exactly once", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, flags, "my-org/github-actions"); expect(resolveOrgSpy).toHaveBeenCalledWith({ org: "my-org", cwd: "/tmp" }); @@ -120,9 +113,9 @@ describe("token create", () => { }); test("prints the token without styling or padding in a rendered terminal", async () => { - process.env.SENTRY_PLAIN_OUTPUT = "0"; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, flags, "my-org/github-actions"); // Raw output, not ANSI-stripped: a code span would add color codes and @@ -135,7 +128,7 @@ describe("token create", () => { test("JSON output includes the token value", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { ...flags, json: true }, "github-actions"); expect(resolveOrgSpy).toHaveBeenCalledWith({ org: undefined, cwd: "/tmp" }); @@ -161,7 +154,7 @@ describe("token create", () => { }); expect(resolveOrgSpy).not.toHaveBeenCalled(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, flags, target); expect(resolveOrgSpy).toHaveBeenCalledWith({ org: "my-org", cwd: "/tmp" }); @@ -170,7 +163,7 @@ describe("token create", () => { test("dry-run neither elevates nor creates", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await func.call(context, { ...flags, "dry-run": true }, "my-org/ci"); expect(ensureScopesSpy).not.toHaveBeenCalled(); @@ -181,7 +174,7 @@ describe("token create", () => { test("does not create when authorization is declined", async () => { ensureScopesSpy.mockResolvedValue("declined"); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); await expect(func.call(context, flags, "my-org/ci")).rejects.toThrow( AuthError, @@ -192,7 +185,7 @@ describe("token create", () => { test("explains a 403", async () => { createSpy.mockRejectedValue(new ApiError("Forbidden", 403)); const { context } = createMockContext(); - const func = await createCommand.loader(); + const func = await loadCommand(createCommand); const error = await func .call(context, flags, "my-org/ci") diff --git a/packages/cli/test/commands/token/delete.test.ts b/packages/cli/test/commands/token/delete.test.ts index 43ff8c393c..5c9be4d778 100644 --- a/packages/cli/test/commands/token/delete.test.ts +++ b/packages/cli/test/commands/token/delete.test.ts @@ -11,12 +11,8 @@ import { vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -26,12 +22,8 @@ import { ApiError, ResolutionError } from "../../../src/lib/errors.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -45,6 +37,8 @@ vi.mock("../../../src/lib/scope-recovery.js", async (importOriginal) => { // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for vi.mocked access import * as scopeRecovery from "../../../src/lib/scope-recovery.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; const tokens = [ { @@ -60,11 +54,11 @@ const tokens = [ const yesFlags = { yes: true, force: false, "dry-run": false, json: false }; function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, stdoutWrite, @@ -150,7 +144,7 @@ describe("token delete", () => { test("revokes the token with --yes", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call(context, yesFlags, "my-org/7"); expect(ensureScopesSpy).toHaveBeenCalledWith( @@ -164,7 +158,7 @@ describe("token delete", () => { test("JSON output reports the revoked token", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call(context, { ...yesFlags, json: true }, "my-org/7"); expect(JSON.parse(output(stdoutWrite))).toEqual({ @@ -177,7 +171,7 @@ describe("token delete", () => { test("dry-run does not delete", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call(context, { ...yesFlags, "dry-run": true }, "my-org/7"); expect(deleteSpy).not.toHaveBeenCalled(); @@ -188,7 +182,7 @@ describe("token delete", () => { ensureScopesSpy.mockResolvedValue("unavailable"); listSpy.mockRejectedValue(new ApiError("Forbidden", 403)); const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); const error = await func .call(context, { ...yesFlags, "dry-run": true }, "my-org/7") @@ -200,7 +194,7 @@ describe("token delete", () => { test("revokes a token by name", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await func.call(context, yesFlags, "my-org/github-actions"); expect(deleteSpy).toHaveBeenCalledWith("my-org", "7"); @@ -210,7 +204,7 @@ describe("token delete", () => { test("refuses a name several tokens share", async () => { listSpy.mockResolvedValue([...tokens, { ...tokens[0], id: "8" }]); const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await expect( func.call(context, yesFlags, "my-org/github-actions"), @@ -220,7 +214,7 @@ describe("token delete", () => { test("fails before deleting when no token has the name", async () => { const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await expect( func.call(context, yesFlags, "my-org/no-such-token"), @@ -230,7 +224,7 @@ describe("token delete", () => { test("fails before deleting when the token doesn't exist", async () => { const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); await expect(func.call(context, yesFlags, "my-org/99")).rejects.toThrow( ResolutionError, @@ -241,7 +235,7 @@ describe("token delete", () => { test("explains a 403 from the delete", async () => { deleteSpy.mockRejectedValue(new ApiError("Forbidden", 403)); const { context } = createMockContext(); - const func = await deleteCommand.loader(); + const func = await loadCommand(deleteCommand); const error = await func .call(context, yesFlags, "my-org/7") diff --git a/packages/cli/test/commands/token/list.test.ts b/packages/cli/test/commands/token/list.test.ts index 4b0624529f..252363b055 100644 --- a/packages/cli/test/commands/token/list.test.ts +++ b/packages/cli/test/commands/token/list.test.ts @@ -8,12 +8,8 @@ import { listCommand } from "../../../src/commands/token/list.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -23,12 +19,8 @@ import { ApiError, ContextError } from "../../../src/lib/errors.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -42,6 +34,8 @@ vi.mock("../../../src/lib/scope-recovery.js", async (importOriginal) => { // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for vi.mocked access import * as scopeRecovery from "../../../src/lib/scope-recovery.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; const tokens = [ { @@ -65,11 +59,11 @@ const tokens = [ ]; function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", commandPrefix: ["sentry", "token", "list"], }, @@ -102,7 +96,7 @@ describe("token list", () => { test("lists tokens without their values", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: false }, "my-org/"); expect(resolveOrgSpy).toHaveBeenCalledWith({ org: "my-org", cwd: "/tmp" }); @@ -120,7 +114,7 @@ describe("token list", () => { test("JSON output is the token array", async () => { const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: true }); expect(JSON.parse(output(stdoutWrite))).toEqual(tokens); @@ -129,7 +123,7 @@ describe("token list", () => { test("says when there are no tokens", async () => { listSpy.mockResolvedValue([]); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: false }, "my-org"); expect(output(stdoutWrite)).toContain("No active org auth tokens"); @@ -139,7 +133,7 @@ describe("token list", () => { ensureScopesSpy.mockResolvedValue("unavailable"); listSpy.mockRejectedValue(new ApiError("Forbidden", 403)); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); const error = await func .call(context, { json: true }, "my-org") @@ -151,7 +145,7 @@ describe("token list", () => { test("throws ContextError when no org can be resolved", async () => { resolveOrgSpy.mockResolvedValue(null); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect(func.call(context, { json: false })).rejects.toThrow( ContextError, diff --git a/packages/cli/test/commands/trace/list.test.ts b/packages/cli/test/commands/trace/list.test.ts index ed16064e97..35edeb3a04 100644 --- a/packages/cli/test/commands/trace/list.test.ts +++ b/packages/cli/test/commands/trace/list.test.ts @@ -8,19 +8,23 @@ * the func() body without real HTTP calls or database access. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { listCommand, parseSort } from "../../../src/commands/trace/list.js"; import type { ProjectWithOrg } from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -31,12 +35,8 @@ import { DEFAULT_SENTRY_URL } from "../../../src/lib/constants.js"; vi.mock("../../../src/lib/db/pagination.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -47,21 +47,16 @@ import { ContextError, ResolutionError } from "../../../src/lib/errors.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; import { parsePeriod } from "../../../src/lib/time-range.js"; import type { TransactionListItem } from "../../../src/types/sentry.js"; - -// Reference paginationDb early to prevent import stripping by auto-organize -const _paginationDbRef = paginationDb; +import { loadCommand, at, must } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; // ============================================================================ // validateLimit (shared utility from arg-parsing.ts) @@ -120,8 +115,12 @@ describe("parseSort", () => { // ============================================================================ describe("resolveProjectBoundFromArg", () => { - let findProjectsBySlugSpy: ReturnType; - let resolveOrgAndProjectSpy: ReturnType; + let findProjectsBySlugSpy: MockInstance< + (typeof apiClient)["findProjectsBySlug"] + >; + let resolveOrgAndProjectSpy: MockInstance< + (typeof resolveTarget)["resolveOrgAndProject"] + >; beforeEach(async () => { findProjectsBySlugSpy = vi.spyOn(apiClient, "findProjectsBySlug"); @@ -226,6 +225,8 @@ describe("resolveProjectBoundFromArg", () => { // oxlint-disable-next-line sentry-cli/no-skipped-tests -- vitest can't intercept same-file internal calls test.skip("uses auto-detect when no target provided", async () => { resolveOrgAndProjectSpy.mockResolvedValue({ + orgDisplay: "detected-org", + projectDisplay: "detected-project", org: "detected-org", project: "detected-project", }); @@ -261,12 +262,20 @@ describe("resolveProjectBoundFromArg", () => { // ============================================================================ describe("listCommand.func", () => { - let listTransactionsSpy: ReturnType; - let findProjectsBySlugSpy: ReturnType; - let resolveOrgAndProjectSpy: ReturnType; - let resolveCursorSpy: ReturnType; - let advancePaginationStateSpy: ReturnType; - let hasPreviousPageSpy: ReturnType; + let listTransactionsSpy: MockInstance<(typeof apiClient)["listTransactions"]>; + let findProjectsBySlugSpy: MockInstance< + (typeof apiClient)["findProjectsBySlug"] + >; + let resolveOrgAndProjectSpy: MockInstance< + (typeof resolveTarget)["resolveOrgAndProject"] + >; + let resolveCursorSpy: MockInstance<(typeof paginationDb)["resolveCursor"]>; + let advancePaginationStateSpy: MockInstance< + (typeof paginationDb)["advancePaginationState"] + >; + let hasPreviousPageSpy: MockInstance< + (typeof paginationDb)["hasPreviousPage"] + >; const sampleTraces: TransactionListItem[] = [ { @@ -288,11 +297,11 @@ describe("listCommand.func", () => { ]; function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", commandPrefix: ["sentry", "trace", "list"], }, @@ -330,7 +339,7 @@ describe("listCommand.func", () => { listTransactionsSpy.mockResolvedValue({ data: sampleTraces }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 20, sort: "date", json: true, period: parsePeriod("7d") }, @@ -350,7 +359,7 @@ describe("listCommand.func", () => { listTransactionsSpy.mockResolvedValue({ data: [] }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 20, sort: "date", json: true, period: parsePeriod("7d") }, @@ -369,7 +378,7 @@ describe("listCommand.func", () => { listTransactionsSpy.mockResolvedValue({ data: [] }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 20, sort: "date", json: false, period: parsePeriod("7d") }, @@ -384,7 +393,7 @@ describe("listCommand.func", () => { listTransactionsSpy.mockResolvedValue({ data: sampleTraces }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 20, sort: "date", json: false, period: parsePeriod("7d") }, @@ -406,7 +415,7 @@ describe("listCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 2, sort: "date", json: false, period: parsePeriod("7d") }, @@ -422,7 +431,7 @@ describe("listCommand.func", () => { listTransactionsSpy.mockResolvedValue({ data: sampleTraces }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 100, sort: "date", json: false, period: parsePeriod("7d") }, @@ -435,10 +444,10 @@ describe("listCommand.func", () => { }); test("uses singular 'trace' for single result", async () => { - listTransactionsSpy.mockResolvedValue({ data: [sampleTraces[0]] }); + listTransactionsSpy.mockResolvedValue({ data: [at(sampleTraces, 0)] }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 20, sort: "date", json: false, period: parsePeriod("7d") }, @@ -454,7 +463,7 @@ describe("listCommand.func", () => { listTransactionsSpy.mockResolvedValue({ data: [] }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { @@ -488,7 +497,7 @@ describe("listCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 20, sort: "date", json: true, period: parsePeriod("7d") }, @@ -511,7 +520,7 @@ describe("listCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 20, sort: "duration", json: false, period: parsePeriod("7d") }, @@ -528,15 +537,15 @@ describe("listCommand.func", () => { listTransactionsSpy.mockResolvedValue({ data: [] }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 20, sort: "date", json: false, period: parsePeriod("7d") }, "test-org/test-project", ); - const callArgs = listTransactionsSpy.mock.calls[0]; - expect(callArgs[2].cursor).toBeUndefined(); + const callArgs = at(listTransactionsSpy.mock.calls, 0); + expect(must(callArgs[2]).cursor).toBeUndefined(); }); test("shows 'try next page' hint when no traces on page but hasMore", async () => { @@ -546,7 +555,7 @@ describe("listCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 20, sort: "date", json: false, period: parsePeriod("7d") }, @@ -565,7 +574,7 @@ describe("listCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { @@ -587,7 +596,7 @@ describe("listCommand.func", () => { listTransactionsSpy.mockResolvedValue({ data: sampleTraces }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 20, sort: "date", json: true, period: parsePeriod("7d") }, @@ -605,7 +614,7 @@ describe("listCommand.func", () => { listTransactionsSpy.mockResolvedValue({ data: [] }); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 20, sort: "date", json: false, period: parsePeriod("24h") }, @@ -628,7 +637,7 @@ describe("listCommand.func", () => { }); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call( context, { limit: 20, sort: "date", json: false, period: parsePeriod("30d") }, diff --git a/packages/cli/test/commands/trace/logs.test.ts b/packages/cli/test/commands/trace/logs.test.ts index c6fa16b8f1..2fe334c39f 100644 --- a/packages/cli/test/commands/trace/logs.test.ts +++ b/packages/cli/test/commands/trace/logs.test.ts @@ -16,9 +16,10 @@ import { beforeEach, describe, expect, - type mock, + type Mock, test, vi, + type MockInstance, } from "vitest"; import { ArgumentParseError } from "@stricli/core"; import { logsCommand } from "../../../src/commands/trace/logs.js"; @@ -26,12 +27,8 @@ import { logsCommand } from "../../../src/commands/trace/logs.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -40,12 +37,8 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/browser.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -55,12 +48,8 @@ import { ContextError, ValidationError } from "../../../src/lib/errors.js"; vi.mock("../../../src/lib/polling.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -69,18 +58,16 @@ import * as polling from "../../../src/lib/polling.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; import { parsePeriod } from "../../../src/lib/time-range.js"; import type { TraceLog } from "../../../src/types/sentry.js"; +import { loadCommand, at } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; // Note: trace-target parsing tests are in test/lib/trace-target.test.ts @@ -121,7 +108,7 @@ const sampleLogs: TraceLog[] = [ ]; function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -134,9 +121,7 @@ function createMockContext() { /** * Collect all output written to a mock write function. */ -function collectMockOutput( - writeMock: ReturnType boolean>>, -): string { +function collectMockOutput(writeMock: Mock): string { return writeMock.mock.calls .map((c) => { const arg = c[0]; @@ -152,11 +137,13 @@ function collectMockOutput( } describe("logsCommand.func", () => { - let listTraceLogsSpy: ReturnType; - let resolveOrgSpy: ReturnType; - let resolveOrgOnlyTargetSpy: ReturnType; - let withProgressSpy: ReturnType; - let openInBrowserSpy: ReturnType; + let listTraceLogsSpy: MockInstance<(typeof apiClient)["listTraceLogs"]>; + let resolveOrgSpy: MockInstance<(typeof resolveTarget)["resolveOrg"]>; + let resolveOrgOnlyTargetSpy: MockInstance< + (typeof resolveTarget)["resolveOrgOnlyTarget"] + >; + let withProgressSpy: MockInstance<(typeof polling)["withProgress"]>; + let openInBrowserSpy: MockInstance<(typeof browser)["openInBrowser"]>; beforeEach(() => { listTraceLogsSpy = vi.spyOn(apiClient, "listTraceLogs"); @@ -191,7 +178,7 @@ describe("logsCommand.func", () => { resolveOrgSpy.mockResolvedValue({ org: ORG }); const { context, stdoutWrite } = createMockContext(); - const func = await logsCommand.loader(); + const func = await loadCommand(logsCommand); await func.call( context, { @@ -220,7 +207,7 @@ describe("logsCommand.func", () => { resolveOrgSpy.mockResolvedValue({ org: ORG }); const { context, stdoutWrite } = createMockContext(); - const func = await logsCommand.loader(); + const func = await loadCommand(logsCommand); await func.call( context, { @@ -245,7 +232,7 @@ describe("logsCommand.func", () => { resolveOrgSpy.mockResolvedValue({ org: ORG }); const { context, stdoutWrite } = createMockContext(); - const func = await logsCommand.loader(); + const func = await loadCommand(logsCommand); await func.call( context, { @@ -268,7 +255,7 @@ describe("logsCommand.func", () => { resolveOrgSpy.mockResolvedValue({ org: ORG }); const { context, stdoutWrite } = createMockContext(); - const func = await logsCommand.loader(); + const func = await loadCommand(logsCommand); await func.call( context, { @@ -290,7 +277,7 @@ describe("logsCommand.func", () => { resolveOrgSpy.mockResolvedValue({ org: ORG }); const { context, stdoutWrite } = createMockContext(); - const func = await logsCommand.loader(); + const func = await loadCommand(logsCommand); await func.call( context, { @@ -314,7 +301,7 @@ describe("logsCommand.func", () => { resolveOrgSpy.mockResolvedValue({ org: ORG }); const { context, stdoutWrite } = createMockContext(); - const func = await logsCommand.loader(); + const func = await loadCommand(logsCommand); await func.call( context, { @@ -333,11 +320,11 @@ describe("logsCommand.func", () => { }); test("uses singular 'log' for exactly one result", async () => { - listTraceLogsSpy.mockResolvedValue([sampleLogs[0]]); + listTraceLogsSpy.mockResolvedValue([at(sampleLogs, 0)]); resolveOrgSpy.mockResolvedValue({ org: ORG }); const { context, stdoutWrite } = createMockContext(); - const func = await logsCommand.loader(); + const func = await loadCommand(logsCommand); await func.call( context, { @@ -360,7 +347,7 @@ describe("logsCommand.func", () => { resolveOrgSpy.mockResolvedValue({ org: ORG }); const { context, stdoutWrite } = createMockContext(); - const func = await logsCommand.loader(); + const func = await loadCommand(logsCommand); await func.call( context, // limit equals number of returned logs → hasMore = true @@ -383,7 +370,7 @@ describe("logsCommand.func", () => { resolveOrgSpy.mockResolvedValue({ org: ORG }); const { context, stdoutWrite } = createMockContext(); - const func = await logsCommand.loader(); + const func = await loadCommand(logsCommand); await func.call( context, { @@ -407,7 +394,7 @@ describe("logsCommand.func", () => { resolveOrgSpy.mockResolvedValue({ org: ORG }); const { context } = createMockContext(); - const func = await logsCommand.loader(); + const func = await loadCommand(logsCommand); await func.call( context, { @@ -429,7 +416,7 @@ describe("logsCommand.func", () => { resolveOrgSpy.mockResolvedValue({ org: ORG }); const { context } = createMockContext(); - const func = await logsCommand.loader(); + const func = await loadCommand(logsCommand); await func.call( context, { @@ -452,7 +439,7 @@ describe("logsCommand.func", () => { resolveOrgSpy.mockResolvedValue(null); const { context } = createMockContext(); - const func = await logsCommand.loader(); + const func = await loadCommand(logsCommand); await expect( func.call( @@ -474,7 +461,7 @@ describe("logsCommand.func", () => { ["an invalid trace ID", "not-a-trace-id", ValidationError], ])("%s fails to parse, before any lookup", async (_, arg, cause) => { const { context } = createMockContext(); - const func = await logsCommand.loader(); + const func = await loadCommand(logsCommand); const error = await func .call( @@ -502,7 +489,7 @@ describe("logsCommand.func", () => { resolveOrgSpy.mockResolvedValue({ org: ORG }); const { context } = createMockContext(); - const func = await logsCommand.loader(); + const func = await loadCommand(logsCommand); await func.call( context, { @@ -529,7 +516,7 @@ describe("logsCommand.func", () => { resolveOrgSpy.mockResolvedValue({ org: ORG }); const { context } = createMockContext(); - const func = await logsCommand.loader(); + const func = await loadCommand(logsCommand); await func.call( context, { @@ -556,7 +543,7 @@ describe("logsCommand.func", () => { resolveOrgSpy.mockResolvedValue({ org: ORG }); const { context } = createMockContext(); - const func = await logsCommand.loader(); + const func = await loadCommand(logsCommand); await func.call( context, { @@ -583,7 +570,7 @@ describe("logsCommand.func", () => { resolveOrgSpy.mockResolvedValue({ org: ORG }); const { context } = createMockContext(); - const func = await logsCommand.loader(); + const func = await loadCommand(logsCommand); await func.call( context, { @@ -608,7 +595,7 @@ describe("logsCommand.func", () => { resolveOrgSpy.mockResolvedValue({ org: ORG }); const { context } = createMockContext(); - const func = await logsCommand.loader(); + const func = await loadCommand(logsCommand); await func.call( context, { diff --git a/packages/cli/test/commands/trace/view.func.test.ts b/packages/cli/test/commands/trace/view.func.test.ts index 393b37da9b..4aa9fc8480 100644 --- a/packages/cli/test/commands/trace/view.func.test.ts +++ b/packages/cli/test/commands/trace/view.func.test.ts @@ -9,7 +9,15 @@ */ import { ArgumentParseError } from "@stricli/core"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { flattenSpanTree, formatTraceView, @@ -19,12 +27,8 @@ import { vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -33,12 +37,8 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/browser.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -55,22 +55,41 @@ import { vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../../src/lib/resolve-target.js"; import type { TraceSpan } from "../../../src/types/sentry.js"; +import { loadCommand, issueProject } from "../../helpers.js"; +import type { ReplayListItem } from "../../../src/types/replay.js"; +import type { Writer } from "../../../src/types/index.js"; // ============================================================================ // formatTraceView // ============================================================================ +/** A replay list row; trace view reads only its `id`. */ +function makeReplay(id: string): ReplayListItem { + return { + id, + count_errors: 0, + count_segments: 1, + duration: 1, + error_ids: [], + info_ids: [], + started_at: "2025-01-30T14:32:15+00:00", + tags: {}, + project_id: "42", + trace_ids: [], + urls: [], + user: { display_name: "Test User" }, + warning_ids: [], + releases: [], + }; +} + describe("formatTraceView", () => { const mockSummary = { traceId: "abc123", @@ -95,7 +114,6 @@ describe("formatTraceView", () => { const result = formatTraceView({ summary: mockSummary, spans: [], - spanTreeLines: undefined, }); expect(result).toContain("abc123"); @@ -119,16 +137,24 @@ describe("formatTraceView", () => { // ============================================================================ describe("viewCommand.func", () => { - let getDetailedTraceSpy: ReturnType; - let findTraceReplaySpy: ReturnType; - let fetchMultiSpanDetailsSpy: ReturnType; - let getIssueByShortIdSpy: ReturnType; - let getLatestEventSpy: ReturnType; - let getProjectSpy: ReturnType; - let findProjectsBySlugSpy: ReturnType; - let resolveOrgAndProjectSpy: ReturnType; - let resolveOrgSpy: ReturnType; - let openInBrowserSpy: ReturnType; + let getDetailedTraceSpy: MockInstance<(typeof apiClient)["getDetailedTrace"]>; + let findTraceReplaySpy: MockInstance<(typeof apiClient)["findTraceReplay"]>; + let fetchMultiSpanDetailsSpy: MockInstance< + (typeof apiClient)["fetchMultiSpanDetails"] + >; + let getIssueByShortIdSpy: MockInstance< + (typeof apiClient)["getIssueByShortId"] + >; + let getLatestEventSpy: MockInstance<(typeof apiClient)["getLatestEvent"]>; + let getProjectSpy: MockInstance<(typeof apiClient)["getProject"]>; + let findProjectsBySlugSpy: MockInstance< + (typeof apiClient)["findProjectsBySlug"] + >; + let resolveOrgAndProjectSpy: MockInstance< + (typeof resolveTarget)["resolveOrgAndProject"] + >; + let resolveOrgSpy: MockInstance<(typeof resolveTarget)["resolveOrg"]>; + let openInBrowserSpy: MockInstance<(typeof browser)["openInBrowser"]>; const sampleSpans: TraceSpan[] = [ { @@ -188,11 +214,11 @@ describe("viewCommand.func", () => { ]; function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, - stderr: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }, stdoutWrite, @@ -205,7 +231,7 @@ describe("viewCommand.func", () => { ): Promise { getDetailedTraceSpy.mockResolvedValue(spans); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false, spans: 100, fields }, @@ -258,7 +284,7 @@ describe("viewCommand.func", () => { getDetailedTraceSpy.mockResolvedValue(sampleSpans); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false, spans: 100 }, @@ -524,7 +550,7 @@ describe("viewCommand.func", () => { getDetailedTraceSpy.mockResolvedValue(sampleSpans); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, web: false, spans: 100 }, @@ -545,7 +571,7 @@ describe("viewCommand.func", () => { async function renderHuman(): Promise { getDetailedTraceSpy.mockResolvedValue(sampleSpans); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, web: false, spans: 100 }, @@ -556,7 +582,7 @@ describe("viewCommand.func", () => { } test("shows the stored replay ID without a hint", async () => { - findTraceReplaySpy.mockResolvedValue({ id: REPLAY_ID }); + findTraceReplaySpy.mockResolvedValue(makeReplay(REPLAY_ID)); const output = await renderHuman(); @@ -587,7 +613,7 @@ describe("viewCommand.func", () => { ): Promise> { getDetailedTraceSpy.mockResolvedValue(sampleSpans); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false, spans: 100, fields }, @@ -614,7 +640,7 @@ describe("viewCommand.func", () => { }); test("selects replayId with --fields", async () => { - findTraceReplaySpy.mockResolvedValue({ id: REPLAY_ID }); + findTraceReplaySpy.mockResolvedValue(makeReplay(REPLAY_ID)); expect(await renderJson("replayId")).toEqual({ replayId: REPLAY_ID }); expect(getDetailedTraceSpy).toHaveBeenCalledWith("test-org", TRACE_ID, { @@ -627,7 +653,7 @@ describe("viewCommand.func", () => { getDetailedTraceSpy.mockResolvedValue([]); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect( func.call( @@ -643,7 +669,7 @@ describe("viewCommand.func", () => { getDetailedTraceSpy.mockResolvedValue([]); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); try { await func.call( @@ -665,7 +691,7 @@ describe("viewCommand.func", () => { openInBrowserSpy.mockResolvedValue(undefined); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, web: true, spans: 100 }, @@ -682,7 +708,7 @@ describe("viewCommand.func", () => { getDetailedTraceSpy.mockResolvedValue(sampleSpans); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, web: false, spans: 0 }, @@ -702,7 +728,7 @@ describe("viewCommand.func", () => { getDetailedTraceSpy.mockResolvedValue(sampleSpans); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, @@ -727,7 +753,7 @@ describe("viewCommand.func", () => { ); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect( func.call( @@ -740,7 +766,7 @@ describe("viewCommand.func", () => { test("a missing trace ID fails to parse, before any lookup", async () => { const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); const error = await func .call(context, { json: false, web: false, spans: 100 }, "my-org/web") @@ -757,7 +783,7 @@ describe("viewCommand.func", () => { getDetailedTraceSpy.mockResolvedValue(sampleSpans); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false, spans: 100 }, @@ -781,7 +807,7 @@ describe("viewCommand.func", () => { getDetailedTraceSpy.mockResolvedValue(sampleSpans); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false, spans: 100 }, @@ -796,7 +822,7 @@ describe("viewCommand.func", () => { getDetailedTraceSpy.mockResolvedValue(sampleSpans); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); // Trace ID first (no slash), target second (has slash) → swap detected (line 168-169) await func.call( context, @@ -820,7 +846,7 @@ describe("viewCommand.func", () => { setOrgRegion("cam-org", DEFAULT_SENTRY_URL); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false, spans: 100 }, @@ -839,7 +865,7 @@ describe("viewCommand.func", () => { id: "12345", shortId: "CLI-G5", title: "Test issue", - project: { slug: "test-project" }, + project: issueProject("test-project"), }); getLatestEventSpy.mockResolvedValue({ eventID: "event-abc123", @@ -848,7 +874,7 @@ describe("viewCommand.func", () => { getDetailedTraceSpy.mockResolvedValue(sampleSpans); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call(context, { json: true, web: false, spans: 100 }, "CLI-G5"); expect(resolveOrgSpy).toHaveBeenCalled(); @@ -871,7 +897,7 @@ describe("viewCommand.func", () => { id: "12345", shortId: "CLI-G5", title: "Test issue", - project: { slug: "test-project" }, + project: issueProject("test-project"), }); getLatestEventSpy.mockResolvedValue({ eventID: "event-abc123", @@ -879,7 +905,7 @@ describe("viewCommand.func", () => { }); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect( func.call(context, { json: false, web: false, spans: 100 }, "CLI-G5"), @@ -890,7 +916,7 @@ describe("viewCommand.func", () => { resolveOrgSpy.mockResolvedValue(null); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await expect( func.call(context, { json: false, web: false, spans: 100 }, "CLI-G5"), @@ -901,7 +927,7 @@ describe("viewCommand.func", () => { getDetailedTraceSpy.mockResolvedValue(sampleSpans); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false, spans: 100 }, @@ -916,7 +942,7 @@ describe("viewCommand.func", () => { getDetailedTraceSpy.mockResolvedValue(sampleSpans); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, full: true, web: false, spans: 100 }, @@ -931,7 +957,7 @@ describe("viewCommand.func", () => { getDetailedTraceSpy.mockResolvedValue(sampleSpans); const { context } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: false, web: false, spans: 100 }, @@ -963,7 +989,7 @@ describe("viewCommand.func", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); await func.call( context, { json: true, web: false, spans: 100 }, diff --git a/packages/cli/test/commands/trace/view.test.ts b/packages/cli/test/commands/trace/view.test.ts index 2953d5bbc4..de7b45f90a 100644 --- a/packages/cli/test/commands/trace/view.test.ts +++ b/packages/cli/test/commands/trace/view.test.ts @@ -7,19 +7,23 @@ * Note: Core trace target parsing tests are in test/lib/trace-target.test.ts. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { parseTraceViewInput } from "../../../src/commands/trace/view.js"; import type { ProjectWithOrg } from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -82,7 +86,9 @@ describe("parseTraceViewInput", () => { describe("resolveProjectBoundSlug", () => { const HINT = "sentry trace view [//]"; - let findProjectsBySlugSpy: ReturnType; + let findProjectsBySlugSpy: MockInstance< + (typeof apiClient)["findProjectsBySlug"] + >; beforeEach(() => { findProjectsBySlugSpy = vi.spyOn(apiClient, "findProjectsBySlug"); diff --git a/packages/cli/test/commands/trial/list.test.ts b/packages/cli/test/commands/trial/list.test.ts index 0c3f0a545d..e7226f1172 100644 --- a/packages/cli/test/commands/trial/list.test.ts +++ b/packages/cli/test/commands/trial/list.test.ts @@ -5,19 +5,23 @@ * Uses spyOn pattern to mock API client and resolve-target. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { listCommand } from "../../../src/commands/trial/list.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -26,12 +30,8 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -40,14 +40,16 @@ import type { CustomerTrialInfo, ProductTrial, } from "../../../src/types/index.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; // --------------------------------------------------------------------------- // Helpers // --------------------------------------------------------------------------- function createMockContext(cwd = "/tmp") { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -64,7 +66,7 @@ function createMockContext(cwd = "/tmp") { function daysFromNow(days: number): string { const d = new Date(); d.setDate(d.getDate() + days); - return d.toISOString().split("T")[0]; + return d.toISOString().slice(0, "YYYY-MM-DD".length); } /** @@ -121,8 +123,10 @@ const EXPIRED_TRIAL: ProductTrial = { // --------------------------------------------------------------------------- describe("trial list command", () => { - let getCustomerTrialInfoSpy: ReturnType; - let resolveOrgSpy: ReturnType; + let getCustomerTrialInfoSpy: MockInstance< + (typeof apiClient)["getCustomerTrialInfo"] + >; + let resolveOrgSpy: MockInstance<(typeof resolveTarget)["resolveOrg"]>; beforeEach(() => { getCustomerTrialInfoSpy = vi.spyOn(apiClient, "getCustomerTrialInfo"); @@ -143,7 +147,7 @@ describe("trial list command", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: true }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -164,7 +168,7 @@ describe("trial list command", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: true }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -181,7 +185,7 @@ describe("trial list command", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: false }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -204,7 +208,7 @@ describe("trial list command", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: false }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -218,7 +222,7 @@ describe("trial list command", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: true }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -232,7 +236,7 @@ describe("trial list command", () => { ); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: true }, "my-org"); expect(resolveOrgSpy).toHaveBeenCalledWith( @@ -245,7 +249,7 @@ describe("trial list command", () => { resolveOrgSpy.mockResolvedValue(null); const { context } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await expect( func.call(context, { json: false }, undefined), @@ -259,7 +263,7 @@ describe("trial list command", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: false }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -281,7 +285,7 @@ describe("trial list command", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: true }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -303,7 +307,7 @@ describe("trial list command", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: false }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -323,7 +327,7 @@ describe("trial list command", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: true }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -346,7 +350,7 @@ describe("trial list command", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: true }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -367,7 +371,7 @@ describe("trial list command", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: false }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -385,7 +389,7 @@ describe("trial list command", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: true }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -406,7 +410,7 @@ describe("trial list command", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: true }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -427,7 +431,7 @@ describe("trial list command", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: true }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -448,7 +452,7 @@ describe("trial list command", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: true }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -476,7 +480,7 @@ describe("trial list command", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: true }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -499,7 +503,7 @@ describe("trial list command", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await listCommand.loader(); + const func = await loadCommand(listCommand); await func.call(context, { json: false }, undefined); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); diff --git a/packages/cli/test/commands/trial/start.test.ts b/packages/cli/test/commands/trial/start.test.ts index 0ccc877886..a5b5f56b3b 100644 --- a/packages/cli/test/commands/trial/start.test.ts +++ b/packages/cli/test/commands/trial/start.test.ts @@ -6,19 +6,23 @@ */ import { ArgumentParseError } from "@stricli/core"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { startCommand } from "../../../src/commands/trial/start.js"; vi.mock("../../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -27,12 +31,8 @@ import * as apiClient from "../../../src/lib/api-client.js"; vi.mock("../../../src/lib/browser.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -42,12 +42,8 @@ import { ValidationError } from "../../../src/lib/errors.js"; vi.mock("../../../src/lib/qrcode.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -56,12 +52,8 @@ import * as qrcodeMod from "../../../src/lib/qrcode.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -70,14 +62,16 @@ import type { CustomerTrialInfo, ProductTrial, } from "../../../src/types/index.js"; +import { loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; // --------------------------------------------------------------------------- // Helpers // --------------------------------------------------------------------------- function createMockContext(cwd = "/tmp") { - const stdoutWrite = vi.fn(() => true); - const stderrWrite = vi.fn(() => true); + const stdoutWrite = vi.fn(() => true); + const stderrWrite = vi.fn(() => true); return { context: { stdout: { write: stdoutWrite }, @@ -107,9 +101,11 @@ const MOCK_TRIAL: ProductTrial = { // --------------------------------------------------------------------------- describe("trial start command", () => { - let getProductTrialsSpy: ReturnType; - let startProductTrialSpy: ReturnType; - let resolveOrgSpy: ReturnType; + let getProductTrialsSpy: MockInstance<(typeof apiClient)["getProductTrials"]>; + let startProductTrialSpy: MockInstance< + (typeof apiClient)["startProductTrial"] + >; + let resolveOrgSpy: MockInstance<(typeof resolveTarget)["resolveOrg"]>; beforeEach(() => { getProductTrialsSpy = vi.spyOn(apiClient, "getProductTrials"); @@ -130,7 +126,7 @@ describe("trial start command", () => { getProductTrialsSpy.mockResolvedValue([MOCK_TRIAL]); const { context, stdoutWrite } = createMockContext(); - const func = await startCommand.loader(); + const func = await loadCommand(startCommand); await func.call(context, { json: true }, "seer"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -147,7 +143,7 @@ describe("trial start command", () => { getProductTrialsSpy.mockResolvedValue([MOCK_TRIAL]); const { context } = createMockContext(); - const func = await startCommand.loader(); + const func = await loadCommand(startCommand); await func.call(context, { json: true }, "seer"); expect(startProductTrialSpy).toHaveBeenCalledWith("test-org", "seerUsers"); @@ -158,7 +154,7 @@ describe("trial start command", () => { getProductTrialsSpy.mockResolvedValue([MOCK_TRIAL]); const { context, stdoutWrite } = createMockContext(); - const func = await startCommand.loader(); + const func = await loadCommand(startCommand); await func.call(context, { json: false }, "seer"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -171,7 +167,7 @@ describe("trial start command", () => { resolveOrgSpy.mockResolvedValue({ org: "test-org" }); const { context } = createMockContext(); - const func = await startCommand.loader(); + const func = await loadCommand(startCommand); const error = await func .call(context, { json: false }, "unknown-name") @@ -189,7 +185,7 @@ describe("trial start command", () => { getProductTrialsSpy.mockResolvedValue([]); const { context } = createMockContext(); - const func = await startCommand.loader(); + const func = await loadCommand(startCommand); await expect(func.call(context, { json: false }, "seer")).rejects.toThrow( ValidationError, @@ -201,7 +197,7 @@ describe("trial start command", () => { getProductTrialsSpy.mockResolvedValue([]); const { context } = createMockContext(); - const func = await startCommand.loader(); + const func = await loadCommand(startCommand); try { await func.call(context, { json: false }, "seer"); @@ -216,7 +212,7 @@ describe("trial start command", () => { resolveOrgSpy.mockResolvedValue(null); const { context } = createMockContext(); - const func = await startCommand.loader(); + const func = await loadCommand(startCommand); await expect(func.call(context, { json: false }, "seer")).rejects.toThrow( "organization", @@ -228,7 +224,7 @@ describe("trial start command", () => { getProductTrialsSpy.mockResolvedValue([MOCK_TRIAL]); const { context } = createMockContext(); - const func = await startCommand.loader(); + const func = await loadCommand(startCommand); await func.call(context, { json: true }, "seer", "my-org"); expect(resolveOrgSpy).toHaveBeenCalledWith( @@ -241,7 +237,7 @@ describe("trial start command", () => { getProductTrialsSpy.mockResolvedValue([MOCK_TRIAL]); const { context } = createMockContext(); - const func = await startCommand.loader(); + const func = await loadCommand(startCommand); // Swapped: org first, name second await func.call(context, { json: true }, "my-org", "seer"); @@ -264,7 +260,7 @@ describe("trial start command", () => { }); const { context } = createMockContext(); - const func = await startCommand.loader(); + const func = await loadCommand(startCommand); // Swapped: org first, "plan" second await func.call(context, { json: true }, "my-org", "plan"); @@ -284,7 +280,7 @@ describe("trial start command", () => { getProductTrialsSpy.mockResolvedValue([replaysTrial]); const { context, stdoutWrite } = createMockContext(); - const func = await startCommand.loader(); + const func = await loadCommand(startCommand); await func.call(context, { json: true }, "replays"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -313,10 +309,12 @@ function makeCustomerInfo( } describe("trial start plan", () => { - let getCustomerTrialInfoSpy: ReturnType; - let resolveOrgSpy: ReturnType; - let openBrowserSpy: ReturnType; - let generateQRCodeSpy: ReturnType; + let getCustomerTrialInfoSpy: MockInstance< + (typeof apiClient)["getCustomerTrialInfo"] + >; + let resolveOrgSpy: MockInstance<(typeof resolveTarget)["resolveOrg"]>; + let openBrowserSpy: MockInstance<(typeof browserMod)["openBrowser"]>; + let generateQRCodeSpy: MockInstance<(typeof qrcodeMod)["generateQRCode"]>; beforeEach(() => { getCustomerTrialInfoSpy = vi.spyOn(apiClient, "getCustomerTrialInfo"); @@ -343,7 +341,7 @@ describe("trial start plan", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await startCommand.loader(); + const func = await loadCommand(startCommand); await func.call(context, { json: true }, "plan"); const output = stdoutWrite.mock.calls.map((c) => c[0]).join(""); @@ -362,7 +360,7 @@ describe("trial start plan", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await startCommand.loader(); + const func = await loadCommand(startCommand); await func.call(context, { json: false }, "plan"); // URL and QR code go through commandOutput → context stdout @@ -378,7 +376,7 @@ describe("trial start plan", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await startCommand.loader(); + const func = await loadCommand(startCommand); await func.call(context, { json: false }, "plan"); expect(generateQRCodeSpy).toHaveBeenCalled(); @@ -398,7 +396,7 @@ describe("trial start plan", () => { ); const { context } = createMockContext(); - const func = await startCommand.loader(); + const func = await loadCommand(startCommand); try { await func.call(context, { json: false }, "plan"); @@ -417,7 +415,7 @@ describe("trial start plan", () => { ); const { context } = createMockContext(); - const func = await startCommand.loader(); + const func = await loadCommand(startCommand); await expect(func.call(context, { json: false }, "plan")).rejects.toThrow( ValidationError, @@ -435,7 +433,7 @@ describe("trial start plan", () => { ); const { context } = createMockContext(); - const func = await startCommand.loader(); + const func = await loadCommand(startCommand); await func.call(context, { json: true }, "plan"); expect(startProductTrialSpy).not.toHaveBeenCalled(); @@ -452,7 +450,7 @@ describe("trial start plan", () => { ); const { context, stdoutWrite } = createMockContext(); - const func = await startCommand.loader(); + const func = await loadCommand(startCommand); await func.call(context, { json: false }, "plan"); // URL goes through commandOutput → context stdout diff --git a/packages/cli/test/commands/wasm-split.test.ts b/packages/cli/test/commands/wasm-split.test.ts index 9529fef2d7..7b223c0e19 100644 --- a/packages/cli/test/commands/wasm-split.test.ts +++ b/packages/cli/test/commands/wasm-split.test.ts @@ -27,6 +27,7 @@ import { toHex, wasmModule, } from "../lib/wasm/helpers.js"; +import { loadCommand } from "../helpers.js"; /** Flags the command sees when the user passes none. */ const NO_FLAGS = { @@ -62,7 +63,7 @@ async function run( input: string, ): Promise { const harness = createContext(); - const func = await wasmSplitCommand.loader(); + const func = await loadCommand(wasmSplitCommand); await func.call(harness.context, { ...NO_FLAGS, ...flags }, input); return harness.output(); } diff --git a/packages/cli/test/constants.ts b/packages/cli/test/constants.ts index fc4522f541..355374d020 100644 --- a/packages/cli/test/constants.ts +++ b/packages/cli/test/constants.ts @@ -20,7 +20,7 @@ import { join } from "node:path"; * `upgrade-lock-test`) still get a unique path per worker because the * parent is already worker-scoped. */ -const WORKER_ID = process.env.VITEST_POOL_ID; +const WORKER_ID = process.env["VITEST_POOL_ID"]; export const TEST_TMP_DIR = WORKER_ID ? join(tmpdir(), `sentry-cli-test-w${WORKER_ID}`) : join(tmpdir(), "sentry-cli-test"); diff --git a/packages/cli/test/e2e/api.test.ts b/packages/cli/test/e2e/api.test.ts index 65ca24e62f..bbf419b485 100644 --- a/packages/cli/test/e2e/api.test.ts +++ b/packages/cli/test/e2e/api.test.ts @@ -19,7 +19,7 @@ import { EXIT } from "../../src/lib/errors.js"; import { createE2EContext, type E2EContext, runCli } from "../fixture.js"; import organizationsFixture from "../fixtures/organizations.json"; import transactionsFixture from "../fixtures/transactions.json"; -import { cleanupTestDir, createTestConfigDir } from "../helpers.js"; +import { cleanupTestDir, createTestConfigDir, at } from "../helpers.js"; import { apiRoutes, TEST_TOKEN } from "../mocks/routes.js"; import { createMockServer, type MockServer } from "../mocks/server.js"; @@ -231,7 +231,7 @@ describe("sentry api", () => { const result = await ctx.run(args); expect(result.exitCode).toBe(EXIT.OUTPUT_ERROR); expect(preparedRequests).toHaveLength(1); - const sent = preparedRequests[0]; + const sent = at(preparedRequests, 0); expect(sent.url).toBe(request.url); expect(sent.method).toBe(request.method); expect(sent.body).toBe("raw payload"); @@ -422,7 +422,7 @@ describe("sentry api", () => { hasPrev ? undefined : nextCursor, ); } - expect(paginationRequests[0].href).toBe(url.href); + expect(at(paginationRequests, 0).href).toBe(url.href); expect( paginationRequests.map((request) => request.searchParams.get("cursor")), ).toEqual(["2:0:0", nextCursor, "2:0:0"]); diff --git a/packages/cli/test/e2e/bundle-setup.ts b/packages/cli/test/e2e/bundle-setup.ts index 12ae0688fd..2c39b50af2 100644 --- a/packages/cli/test/e2e/bundle-setup.ts +++ b/packages/cli/test/e2e/bundle-setup.ts @@ -100,7 +100,7 @@ async function spawnBundle(): Promise { cwd: ROOT_DIR, env: { ...process.env, - SENTRY_CLIENT_ID: process.env.SENTRY_CLIENT_ID || "test-client-id", + SENTRY_CLIENT_ID: process.env["SENTRY_CLIENT_ID"] || "test-client-id", }, stdio: ["pipe", "pipe", "pipe"], }); diff --git a/packages/cli/test/e2e/delta-upgrade.test.ts b/packages/cli/test/e2e/delta-upgrade.test.ts index 0480eae7b4..adb8eb7138 100644 --- a/packages/cli/test/e2e/delta-upgrade.test.ts +++ b/packages/cli/test/e2e/delta-upgrade.test.ts @@ -25,7 +25,7 @@ const realFetch = (globalThis as { __originalFetch?: typeof fetch }) const savedFetch = globalThis.fetch; /** Path to zig-bsdiff binary */ -const BSDIFF_PATH = process.env.ZIG_BSDIFF_PATH ?? "/tmp/bsdiff"; +const BSDIFF_PATH = process.env["ZIG_BSDIFF_PATH"] ?? "/tmp/bsdiff"; /** Two consecutive releases to test patching between */ const OLD_VERSION = "0.12.0"; diff --git a/packages/cli/test/e2e/explore.test.ts b/packages/cli/test/e2e/explore.test.ts index 5895ac0084..a602fa1f99 100644 --- a/packages/cli/test/e2e/explore.test.ts +++ b/packages/cli/test/e2e/explore.test.ts @@ -4,7 +4,7 @@ import { expect, test } from "vitest"; import { createE2EContext } from "../fixture.js"; import organizationFixture from "../fixtures/organization.json"; import projectFixture from "../fixtures/project.json"; -import { useTestConfigDir } from "../helpers.js"; +import { useTestConfigDir, at } from "../helpers.js"; import { TEST_ORG, TEST_PROJECT, TEST_TOKEN } from "../mocks/routes.js"; import { createMockServer } from "../mocks/server.js"; @@ -101,7 +101,7 @@ test("combines -b buckets with -t period and preserves metadata when projecting expect(result.exitCode, result.stderr + result.stdout).toBe(0); expect(requests).toHaveLength(1); - const params = requests[0].searchParams; + const params = at(requests, 0).searchParams; expect(params.getAll("yAxis")).toEqual(["count()", "latest_event()"]); expect(Object.fromEntries(params)).toEqual({ dataset: "spans", diff --git a/packages/cli/test/e2e/feedback.test.ts b/packages/cli/test/e2e/feedback.test.ts index 4c08b5c736..3f2396b919 100644 --- a/packages/cli/test/e2e/feedback.test.ts +++ b/packages/cli/test/e2e/feedback.test.ts @@ -27,7 +27,11 @@ import { TEST_PROJECT, TEST_TOKEN, } from "../mocks/routes.js"; -import { createMockServer, type MockServer } from "../mocks/server.js"; +import { + createMockServer, + type MockServer, + routeParam, +} from "../mocks/server.js"; let testConfigDir: string; let mockServer: MockServer; @@ -162,11 +166,11 @@ describe.each([ method: "PUT", path: "/api/0/organizations/:orgSlug/issues/:issueId/", response: (_req, params) => { - mutatedId = params.issueId; + mutatedId = routeParam(params, "issueId"); return { body: { ...feedbackFixture, - id: params.issueId, + id: routeParam(params, "issueId"), status, }, }; diff --git a/packages/cli/test/e2e/library.test.ts b/packages/cli/test/e2e/library.test.ts index 84993703d7..5b0f611191 100644 --- a/packages/cli/test/e2e/library.test.ts +++ b/packages/cli/test/e2e/library.test.ts @@ -42,8 +42,8 @@ async function runNodeScript( }; // Ensure no auth leaks into tests — delete rather than set to undefined // because spawn may pass "undefined" as a literal string - delete env.SENTRY_AUTH_TOKEN; - delete env.SENTRY_TOKEN; + delete env["SENTRY_AUTH_TOKEN"]; + delete env["SENTRY_TOKEN"]; const proc = spawn("node", ["--no-warnings", "-e", script], { cwd: ROOT_DIR, diff --git a/packages/cli/test/e2e/local.test.ts b/packages/cli/test/e2e/local.test.ts index 6801b68467..08b75d7ac3 100644 --- a/packages/cli/test/e2e/local.test.ts +++ b/packages/cli/test/e2e/local.test.ts @@ -17,7 +17,7 @@ import { setTimeout as sleep } from "node:timers/promises"; import { promisify } from "node:util"; import { afterEach, describe, expect, test } from "vitest"; import { runCli } from "../fixture.js"; -import { useTestConfigDir } from "../helpers.js"; +import { at, must, useTestConfigDir } from "../helpers.js"; /** Capability URLs returned explicitly by session creation. */ type Session = { @@ -221,7 +221,7 @@ describe("Local daemon E2E", () => { } expect(text).toContain("event: sentry.local.directory"); directoryUrl = ( - JSON.parse(text.match(/data: (.+)/)![1]) as { directoryUrl: string } + JSON.parse(at(text.match(/data: (.+)/)!, 1)) as { directoryUrl: string } ).directoryUrl; } finally { await bootstrapReader.cancel(); @@ -265,7 +265,7 @@ describe("Local daemon E2E", () => { [web.id, "web-only", "worker-only"], [worker.id, "worker-only", "web-only"], [web.id, "web-only", "worker-only"], - ]) { + ] as const) { const session = directory.sessions.find((s) => s.id === id)!; const stream = await fetch(session.streamUrl, { headers: origin, @@ -723,8 +723,7 @@ describe("Local daemon E2E", () => { const { events } = JSON.parse(listed.stdout) as { events: { envelopeId: string }[]; }; - const envelopeId = events[0]?.envelopeId; - expect(envelopeId).toBeDefined(); + const envelopeId = must(events[0]?.envelopeId, "a listed envelope"); for (const parts of [["My App"], ["My", "App"]]) { const event = await cli("event", "view", ...parts, eventId); expect(event.exitCode, event.stderr).toBe(0); diff --git a/packages/cli/test/e2e/migration.test.ts b/packages/cli/test/e2e/migration.test.ts index cc6de98e05..8cc78316e6 100644 --- a/packages/cli/test/e2e/migration.test.ts +++ b/packages/cli/test/e2e/migration.test.ts @@ -102,7 +102,7 @@ describe("e2e: legacy ~/.sentry migration", () => { const result = await runCli(setupArgs, { env: homeEnv({ - PATH: `${xdgBinDir}:${process.env.PATH ?? ""}`, + PATH: `${xdgBinDir}:${process.env["PATH"] ?? ""}`, }), }); expect(result.exitCode).toBe(0); diff --git a/packages/cli/test/e2e/multiregion.test.ts b/packages/cli/test/e2e/multiregion.test.ts index f251cc0108..6b8d5d244d 100644 --- a/packages/cli/test/e2e/multiregion.test.ts +++ b/packages/cli/test/e2e/multiregion.test.ts @@ -16,7 +16,7 @@ import { test, } from "vitest"; import { createE2EContext, type E2EContext } from "../fixture.js"; -import { cleanupTestDir, createTestConfigDir } from "../helpers.js"; +import { cleanupTestDir, createTestConfigDir, must } from "../helpers.js"; import { createMultiRegionMockServer, EU_ORGS, @@ -168,7 +168,7 @@ describe("multi-region", () => { expect(result.exitCode).toBe(0); // Should contain US projects for acme-corp - for (const projectSlug of US_PROJECTS["acme-corp"]) { + for (const projectSlug of must(US_PROJECTS["acme-corp"])) { expect(result.stdout).toContain(projectSlug); } }, @@ -187,7 +187,7 @@ describe("multi-region", () => { expect(result.exitCode).toBe(0); // Should contain EU projects for euro-gmbh - for (const projectSlug of EU_PROJECTS["euro-gmbh"]) { + for (const projectSlug of must(EU_PROJECTS["euro-gmbh"])) { expect(result.stdout).toContain(projectSlug); } }, @@ -216,7 +216,7 @@ describe("multi-region", () => { expect(Array.isArray(data)).toBe(true); const slugs = data.map((p: { slug: string }) => p.slug); - for (const projectSlug of EU_PROJECTS["berlin-startup"]) { + for (const projectSlug of must(EU_PROJECTS["berlin-startup"])) { expect(slugs).toContain(projectSlug); } }, diff --git a/packages/cli/test/e2e/skill-eval.test.ts b/packages/cli/test/e2e/skill-eval.test.ts index 1ea152fbf8..1519b7ac90 100644 --- a/packages/cli/test/e2e/skill-eval.test.ts +++ b/packages/cli/test/e2e/skill-eval.test.ts @@ -23,8 +23,8 @@ const SKILL_PATH = "plugins/sentry-cli/skills/sentry-cli/SKILL.md"; const DEFAULT_THRESHOLD = 0.75; /** Models under test — env-overridable, defaults to sonnet-5 + gpt-5.6-luna. */ -const AGENT_MODELS = process.env.EVAL_AGENT_MODELS - ? process.env.EVAL_AGENT_MODELS.split(",").map((m) => m.trim()) +const AGENT_MODELS = process.env["EVAL_AGENT_MODELS"] + ? process.env["EVAL_AGENT_MODELS"].split(",").map((m) => m.trim()) : ["anthropic/claude-sonnet-5", "openai/gpt-5.6-luna"]; const provider = resolveEvalProvider(); @@ -50,8 +50,8 @@ describe.skipIf(!provider)("skill eval", () => { globalThis.fetch = savedFetch; }); const testCases = cases as unknown as TestCase[]; - const threshold = process.env.EVAL_THRESHOLD - ? Number.parseFloat(process.env.EVAL_THRESHOLD) + const threshold = process.env["EVAL_THRESHOLD"] + ? Number.parseFloat(process.env["EVAL_THRESHOLD"]) : DEFAULT_THRESHOLD; /** diff --git a/packages/cli/test/e2e/telemetry-exit.test.ts b/packages/cli/test/e2e/telemetry-exit.test.ts index 7c066937c1..f0f33cad6c 100644 --- a/packages/cli/test/e2e/telemetry-exit.test.ts +++ b/packages/cli/test/e2e/telemetry-exit.test.ts @@ -40,7 +40,7 @@ describe("telemetry exit timing", () => { // Test: telemetry enabled (with patched Sentry) // Remove SENTRY_CLI_NO_TELEMETRY to enable telemetry const envWithTelemetry = { ...process.env }; - delete envWithTelemetry.SENTRY_CLI_NO_TELEMETRY; + delete envWithTelemetry["SENTRY_CLI_NO_TELEMETRY"]; const enabledStart = performance.now(); const enabledProc = spawn(cmdBin, [...cmdArgs, "--version"], { diff --git a/packages/cli/test/eval-common/anthropic-client.ts b/packages/cli/test/eval-common/anthropic-client.ts index 0c1b067bcc..18ff2d8a9e 100644 --- a/packages/cli/test/eval-common/anthropic-client.ts +++ b/packages/cli/test/eval-common/anthropic-client.ts @@ -50,11 +50,11 @@ export type EvalProvider = { export function resolveEvalProvider( env: NodeJS.ProcessEnv = process.env, ): EvalProvider | null { - const openRouterKey = env.OPENROUTER_API_KEY?.trim(); - const anthropicKey = env.ANTHROPIC_API_KEY?.trim(); + const openRouterKey = env["OPENROUTER_API_KEY"]?.trim(); + const anthropicKey = env["ANTHROPIC_API_KEY"]?.trim(); if (openRouterKey) { - const baseURL = env.OPENROUTER_BASE_URL?.trim() || OPENROUTER_BASE_URL; + const baseURL = env["OPENROUTER_BASE_URL"]?.trim() || OPENROUTER_BASE_URL; return { provider: "openrouter", chat: (model, messages, maxTokens) => @@ -69,7 +69,7 @@ export function resolveEvalProvider( } if (anthropicKey) { - const baseURL = env.ANTHROPIC_BASE_URL?.trim() || undefined; + const baseURL = env["ANTHROPIC_BASE_URL"]?.trim() || undefined; return { provider: "anthropic", chat: (model, messages, maxTokens) => @@ -159,7 +159,7 @@ async function anthropicChat({ const response = await client.messages.create({ model: anthropicModel, max_tokens: maxTokens, - system, + ...(system === undefined ? {} : { system }), messages: userMsgs, }); diff --git a/packages/cli/test/fixture.ts b/packages/cli/test/fixture.ts index bb001185e0..9458cb4b82 100644 --- a/packages/cli/test/fixture.ts +++ b/packages/cli/test/fixture.ts @@ -56,8 +56,8 @@ export type CliResult = { * bun, which hits TDZ errors from circular imports in the db/ layer — see * issue #1070). */ -export function getCliCommand(): string[] { - const binaryPath = process.env.SENTRY_CLI_BINARY; +export function getCliCommand(): [string, ...string[]] { + const binaryPath = process.env["SENTRY_CLI_BINARY"]; if (binaryPath) { if (/\.[cm]?js$/i.test(binaryPath)) { return [process.execPath, binaryPath]; diff --git a/packages/cli/test/fixtures/bench/generate.ts b/packages/cli/test/fixtures/bench/generate.ts index 125cb73824..ef781ddb79 100644 --- a/packages/cli/test/fixtures/bench/generate.ts +++ b/packages/cli/test/fixtures/bench/generate.ts @@ -14,6 +14,7 @@ import { createHash } from "node:crypto"; import { mkdirSync, readFileSync, writeFileSync } from "node:fs"; import { join } from "node:path"; +import { at } from "../../helpers.js"; /** Parameters for a synthetic repo. Defaults live in `presets.ts`. */ export type FixtureSpec = { @@ -105,7 +106,11 @@ class XorShift32 { /** Pick one element from `arr`. */ pick(arr: readonly T[]): T { - return arr[this.int(arr.length)]; + const value = arr[this.int(arr.length)]; + if (value === undefined) { + throw new Error("pick() needs a non-empty array"); + } + return value; } /** Boolean true with probability `p`. */ @@ -330,7 +335,7 @@ function buildTextFileContent( if (includeDsn) { // Put the DSN somewhere non-commented so the DSN scanner accepts it. lines.push(`const SENTRY_DSN = "${rng.pick(DSN_TEMPLATES)}";`); - bytes += lines[0].length + 1; + bytes += at(lines, 0).length + 1; } while (bytes < targetBytes) { const line = rng.pick(FILLER_LINES); diff --git a/packages/cli/test/fixtures/bench/helpers.ts b/packages/cli/test/fixtures/bench/helpers.ts index 5e1fb6da29..2778aa0e44 100644 --- a/packages/cli/test/fixtures/bench/helpers.ts +++ b/packages/cli/test/fixtures/bench/helpers.ts @@ -112,8 +112,8 @@ export function summarize(samples: readonly number[]): BenchStats { } const sorted = [...samples].sort((a, b) => a - b); const n = sorted.length; - const min = sorted[0]; - const max = sorted[n - 1]; + const min = sampleAt(sorted, 0); + const max = sampleAt(sorted, n - 1); const mean = sorted.reduce((acc, x) => acc + x, 0) / n; // Population stddev — we're measuring the full sample, not inferring a population. const variance = sorted.reduce((acc, x) => acc + (x - mean) ** 2, 0) / n; @@ -135,7 +135,16 @@ function percentile(sorted: readonly number[], p: number): number { sorted.length - 1, Math.max(0, Math.ceil(p * sorted.length) - 1), ); - return sorted[idx]; + return sampleAt(sorted, idx); +} + +/** The sample at `index`; throws when the index is out of range. */ +function sampleAt(sorted: readonly number[], index: number): number { + const value = sorted[index]; + if (value === undefined) { + throw new Error(`No sample at index ${index} of ${sorted.length}`); + } + return value; } /** @@ -153,10 +162,10 @@ export async function withBenchDb( // effects (loads bun:sqlite, @sentry/node via createTracedDatabase). const { closeDatabase } = await import("../../../src/lib/db/index.js"); - const saved = process.env.SENTRY_CONFIG_DIR; + const saved = process.env["SENTRY_CONFIG_DIR"]; mkdirSync(join(tmpdir(), "sentry-cli-bench"), { recursive: true }); const dir = mkdtempSync(join(tmpdir(), "sentry-cli-bench", "cfg-")); - process.env.SENTRY_CONFIG_DIR = dir; + process.env["SENTRY_CONFIG_DIR"] = dir; closeDatabase(); try { @@ -170,9 +179,15 @@ export async function withBenchDb( // either reassignment is fine — preserving the convention by setting to the // benchless baseline (empty string) would be wrong, so we just leave `dir` // in place. The process exits right after. - process.env.SENTRY_CONFIG_DIR = dir; + // Follow the test/helpers.ts rule — never `delete process.env.SENTRY_CONFIG_DIR` + // because other modules may read it. Set to an unreachable sentinel instead; + // tests that care use `useTestConfigDir`. Bench is a one-shot process, so + // either reassignment is fine — preserving the convention by setting to the + // benchless baseline (empty string) would be wrong, so we just leave `dir` + // in place. The process exits right after. + process.env["SENTRY_CONFIG_DIR"] = dir; } else { - process.env.SENTRY_CONFIG_DIR = saved; + process.env["SENTRY_CONFIG_DIR"] = saved; } try { rmSync(dir, { recursive: true, force: true }); @@ -290,20 +305,20 @@ export function compareReports( for (const key of [...keys].sort()) { const b = index.get(`b:${key}`); const c = index.get(`c:${key}`); - const [fixture, operation] = key.split("||"); + const { fixture, operation } = parseBenchKey(key); if (!b) { rows.push({ - fixture: fixture, - operation: operation, - current: c?.stats, + fixture, + operation, + ...(c === undefined ? {} : { current: c.stats }), verdict: "missing-baseline", }); continue; } if (!c) { rows.push({ - fixture: fixture, - operation: operation, + fixture, + operation, baseline: b.stats, verdict: "missing-current", }); @@ -315,8 +330,8 @@ export function compareReports( if (deltaPct > thresholdPct) verdict = "regressed"; else if (deltaPct < -thresholdPct) verdict = "improved"; rows.push({ - fixture: fixture, - operation: operation, + fixture, + operation, baseline: b.stats, current: c.stats, deltaMs, @@ -327,8 +342,22 @@ export function compareReports( return rows; } +const KEY_SEPARATOR = "||"; + function benchKey(e: BenchEntry): string { - return `${e.fixture}||${e.operation}`; + return `${e.fixture}${KEY_SEPARATOR}${e.operation}`; +} + +/** Split a {@link benchKey} back into its fixture and operation. */ +function parseBenchKey(key: string): { fixture: string; operation: string } { + const separator = key.indexOf(KEY_SEPARATOR); + if (separator === -1) { + throw new Error(`Malformed bench key: ${key}`); + } + return { + fixture: key.slice(0, separator), + operation: key.slice(separator + KEY_SEPARATOR.length), + }; } /** Single-character status icon per verdict. */ diff --git a/packages/cli/test/fixtures/local-agent-server.ts b/packages/cli/test/fixtures/local-agent-server.ts index 4cb6724b15..e42ea44bb5 100644 --- a/packages/cli/test/fixtures/local-agent-server.ts +++ b/packages/cli/test/fixtures/local-agent-server.ts @@ -40,7 +40,7 @@ export function createLocalAgentServer() { ); app.post("/api/agent/run", async (c) => { - const { prompt } = (await c.req.json()) as { prompt?: unknown }; + const { prompt } = await c.req.json<{ prompt?: unknown }>(); const safePrompt = typeof prompt === "string" ? prompt : ""; return await startSpan( @@ -104,11 +104,11 @@ export function createLocalAgentServer() { function startServer(): void { init({ - dsn: process.env.SENTRY_DSN, + dsn: process.env["SENTRY_DSN"], tracesSampleRate: 1, }); - const port = Number(process.env.PORT ?? DEFAULT_PORT); + const port = Number(process.env["PORT"] ?? DEFAULT_PORT); if (!Number.isInteger(port) || port < 1 || port > 65_535) { throw new Error("PORT must be an integer between 1 and 65535"); } diff --git a/packages/cli/test/helpers.ts b/packages/cli/test/helpers.ts index 43477b62f9..1b2417aa5b 100644 --- a/packages/cli/test/helpers.ts +++ b/packages/cli/test/helpers.ts @@ -7,7 +7,13 @@ import { mkdirSync } from "node:fs"; import { mkdtemp, rm } from "node:fs/promises"; import { join } from "node:path"; -import { ArgumentParseError } from "@stricli/core"; +import { + ArgumentParseError, + type BaseArgs, + type BaseFlags, + type Command, + type CommandContext, +} from "@stricli/core"; import { afterEach, beforeEach, expect } from "vitest"; import { resetAccountSelection, @@ -19,12 +25,17 @@ import { import { CONFIG_DIR_ENV_VAR, closeDatabase } from "../src/lib/db/index.js"; import { ENV_VAR_AGENTS } from "../src/lib/detect-agent.js"; import { resetTipsCache } from "../src/lib/tips.js"; +import type { withProgress } from "../src/lib/polling.js"; +import type { SentryIssue } from "../src/types/index.js"; // re-exporting a single constant, not a barrel export { TEST_TMP_DIR } from "./constants.js"; import { TEST_TMP_DIR } from "./constants.js"; +/** First parameter of `fetch`, without relying on the DOM `RequestInfo` type. */ +type FetchInput = Parameters[0]; + mkdirSync(TEST_TMP_DIR, { recursive: true }); type TestConfigDirOptions = { @@ -76,7 +87,7 @@ export async function cleanupTestDir(dir: string): Promise { * Supports both full signature and simpler forms for tests that don't need input/init. */ type FetchMockFn = - | ((input: RequestInfo | URL, init?: RequestInit) => Promise) + | ((input: FetchInput, init?: RequestInit) => Promise) | (() => Promise); /** @@ -223,7 +234,7 @@ export function mintSntrysToken(payload: Record): string { * Used by tests that intercept `globalThis.fetch` and assert on the * destination URLs of captured calls. */ -export function extractFetchUrl(input: RequestInfo | URL): string { +export function extractFetchUrl(input: FetchInput): string { if (typeof input === "string") { return input; } @@ -292,7 +303,7 @@ export function installFetchMock( const fallbackBody = fallback?.body ?? { detail: "Not found" }; globalThis.fetch = async ( - input: RequestInfo | URL, + input: FetchInput, init?: RequestInit, // test mock router requires branching for method/URL/body matching ): Promise => { @@ -301,7 +312,7 @@ export function installFetchMock( const body = init?.body && typeof init.body === "string" ? init.body : undefined; - calls.push({ url, method, body }); + calls.push(body === undefined ? { url, method } : { url, method, body }); for (const route of routes) { // Method filter @@ -381,3 +392,127 @@ export function parseFailure(error: unknown): Error { expect(error).toBeInstanceOf(ArgumentParseError); return (error as ArgumentParseError).exception as Error; } + +/** + * The context a test passes to a command: only the fields, and the parts of + * them, that the command reads. + */ +export type TestCommandContext = { + readonly [K in keyof CONTEXT]?: Partial; +}; + +/** A loaded command function as tests call it. */ +export type TestCommandFunction = ( + this: TestCommandContext, + flags: BaseFlags, + ...args: BaseArgs +) => Promise; + +/** + * Load the function behind a lazily loaded command. Stricli's loader + * resolves to either the function or a module whose default export is the + * function (`CommandModule`); this returns the function in both cases, + * always as an async function. + */ +export async function loadCommand( + command: Command, +): Promise> { + const loaded = await command.loader(); + const func = typeof loaded === "function" ? loaded : loaded.default; + return async function (this: TestCommandContext, flags, ...args) { + // The command reads only the context fields each test supplies. + return await func.call(this as CONTEXT, flags, ...args); + }; +} + +/** + * The element of `items` at `index`, failing the test when there is none. + * A negative index counts back from the end, as with `Array.prototype.at`. + */ +export function at(items: ArrayLike, index: number): T { + const position = index < 0 ? items.length + index : index; + if (position < 0 || position >= items.length) { + throw new Error( + `Expected an element at index ${index}, but there are ${items.length}`, + ); + } + return items[position] as T; +} + +/** `value`, failing the test when it is `null` or `undefined`. */ +export function must(value: T | null | undefined, what = "a value"): T { + if (value === null || value === undefined) { + throw new Error(`Expected ${what}, but got ${String(value)}`); + } + return value; +} + +/** + * The error `promise` rejects with, failing the test when it resolves or + * rejects with something other than an Error. + */ +export async function rejection(promise: Promise): Promise { + try { + await promise; + } catch (error) { + if (error instanceof Error) { + return error; + } + throw new Error(`Expected an Error rejection, but got ${String(error)}`); + } + throw new Error("Expected the promise to reject, but it resolved"); +} + +/** Keys of `T` whose properties are optional. */ +type OptionalKeys = { + [K in keyof T]-?: object extends Pick ? K : never; +}[keyof T]; + +/** + * A copy of `value` without the optional `keys`, for fixtures that need a + * field to be absent rather than set to a default. + */ +export function without( + value: T, + ...keys: OptionalKeys[] +): T { + const copy = { ...value }; + for (const key of keys) { + delete copy[key]; + } + return copy; +} + +declare global { + /** The real `fetch`, saved by test/preload.ts before it stubs the global. */ + var __originalFetch: typeof fetch | undefined; +} + +/** The real `fetch` saved by test/preload.ts, for tests that need the network stack. */ +export function originalFetch(): typeof fetch { + const fetchImpl = globalThis.__originalFetch; + if (fetchImpl === undefined) { + throw new Error("test/preload.ts did not save the original fetch"); + } + return fetchImpl; +} + +/** The project summary embedded in an issue response. */ +export type IssueProject = NonNullable; + +/** + * Build the project summary embedded in an issue response, for fixtures that + * only care about the slug. + */ +export function issueProject( + slug: string, + overrides: Partial = {}, +): IssueProject { + return { id: "1", name: slug, slug, platform: null, ...overrides }; +} + +/** Passthrough for `withProgress` that skips the spinner and runs `fn` directly. */ +export const passthroughWithProgress: typeof withProgress = (_options, fn) => + fn(() => { + // Progress messages are not rendered in tests. + }); diff --git a/packages/cli/test/lib/account-selection.test.ts b/packages/cli/test/lib/account-selection.test.ts index 0053f85cc3..78baa5fae9 100644 --- a/packages/cli/test/lib/account-selection.test.ts +++ b/packages/cli/test/lib/account-selection.test.ts @@ -7,7 +7,7 @@ import { beforeEach, describe, expect, test, vi } from "vitest"; const { selectWithFilter, isatty } = vi.hoisted(() => ({ selectWithFilter: vi.fn(), - isatty: vi.fn(() => true), + isatty: vi.fn((_fd: number) => true), })); vi.mock("../../src/lib/select-ui/terminal.js", () => ({ selectWithFilter })); vi.mock("node:tty", async (importOriginal) => ({ diff --git a/packages/cli/test/lib/alias.property.test.ts b/packages/cli/test/lib/alias.property.test.ts index 18900a8bff..52845d6909 100644 --- a/packages/cli/test/lib/alias.property.test.ts +++ b/packages/cli/test/lib/alias.property.test.ts @@ -21,6 +21,7 @@ import { type OrgProjectPair, } from "../../src/lib/alias.js"; import { DEFAULT_NUM_RUNS } from "../model-based/helpers.js"; +import { at } from "../helpers.js"; // Arbitraries @@ -441,7 +442,7 @@ describe("property: cross-function invariants", () => { // Aliases should be shorter than full project slugs for (const [key, alias] of aliasMap) { - const project = key.split("/")[1]; + const project = at(key.split("/"), 1); expect(alias.length).toBeLessThanOrEqual(project.length); } }), @@ -469,7 +470,7 @@ describe("property: cross-function invariants", () => { // Aliases should match direct prefixes for simple unique slugs for (const [key, alias] of aliasMap) { - const project = key.split("/")[1]; + const project = at(key.split("/"), 1); expect(directPrefixes.get(project)).toBe(alias); } }, diff --git a/packages/cli/test/lib/api-client.coverage.test.ts b/packages/cli/test/lib/api-client.coverage.test.ts index 9c1c17218d..17637ca49f 100644 --- a/packages/cli/test/lib/api-client.coverage.test.ts +++ b/packages/cli/test/lib/api-client.coverage.test.ts @@ -51,7 +51,7 @@ import { setAuthToken } from "../../src/lib/db/auth.js"; import { getCachedCompletionEntities } from "../../src/lib/db/completion-cache.js"; import { setOrgRegion } from "../../src/lib/db/regions.js"; import { ApiError, AuthError, TimeoutError } from "../../src/lib/errors.js"; -import { mockFetch, useTestConfigDir } from "../helpers.js"; +import { mockFetch, useTestConfigDir, at } from "../helpers.js"; // --- Shared test setup --- @@ -505,7 +505,7 @@ describe("teams.ts", () => { const result = await listProjectTeams("test-org", "test-project"); expect(result).toHaveLength(1); - expect(result[0].slug).toBe("test-team"); + expect(at(result, 0).slug).toBe("test-team"); }); }); @@ -868,7 +868,7 @@ describe("projects.ts", () => { status: "active", }); expect(result).toHaveLength(1); - expect(result[0].dsn.public).toBe("https://abc@sentry.io/1"); + expect(at(result, 0).dsn.public).toBe("https://abc@sentry.io/1"); }); }); @@ -966,27 +966,12 @@ describe("projects.ts", () => { ); const captureSpy = vi.spyOn(Sentry, "captureException"); - const withScopeSpy = vi.spyOn(Sentry, "withScope"); - withScopeSpy.mockImplementation((fn: (scope: unknown) => void) => { - fn({ - setTag() { - /* noop */ - }, - setContext() { - /* noop */ - }, - setFingerprint() { - /* noop */ - }, - }); - }); try { const dsn = await tryGetPrimaryDsn("test-org", "test-project"); expect(dsn).toBeNull(); expect(captureSpy).toHaveBeenCalledTimes(1); } finally { captureSpy.mockRestore(); - withScopeSpy.mockRestore(); } }); }); @@ -1244,7 +1229,7 @@ describe("traces.ts", () => { timestamp: 1_700_000_000, }); expect(result).toHaveLength(1); - expect(result[0].span_id).toBe("span-1"); + expect(at(result, 0).span_id).toBe("span-1"); }); }); }); @@ -1277,7 +1262,7 @@ describe("repositories.ts", () => { const result = await listRepositories("test-org"); expect(result).toHaveLength(1); - expect(result[0].name).toBe("getsentry/sentry"); + expect(at(result, 0).name).toBe("getsentry/sentry"); }); }); @@ -1364,7 +1349,7 @@ describe("logs.ts", () => { const result = await listLogs("test-org", "my-project"); expect(result).toHaveLength(1); - expect(result[0]["sentry.item_id"]).toBe("log-1"); + expect(at(result, 0)["sentry.item_id"]).toBe("log-1"); }); test("uses numeric project ID via project param", async () => { @@ -1926,7 +1911,7 @@ describe("traces.ts (transactions)", () => { limit: 1, }); expect(result.data).toHaveLength(1); - expect(result.data[0].transaction).toBe("GET /api/users"); + expect(at(result.data, 0).transaction).toBe("GET /api/users"); expect(result.nextCursor).toContain("txn-next"); }); @@ -2026,7 +2011,7 @@ describe("logs.ts (detailed)", () => { const result = await getLogs("test-org", "test-project", ["log-1"]); expect(result).toHaveLength(1); - expect(result[0]["sentry.item_id"]).toBe("log-1"); + expect(at(result, 0)["sentry.item_id"]).toBe("log-1"); }); test("splits into batches when over API_MAX_PER_PAGE", async () => { @@ -2101,7 +2086,7 @@ describe("logs.ts (detailed)", () => { const result = await listTraceLogs("test-org", "abc123def456"); expect(result).toHaveLength(1); - expect(result[0].id).toBe("tlog-1"); + expect(at(result, 0).id).toBe("tlog-1"); }); test("passes custom statsPeriod and limit", async () => { diff --git a/packages/cli/test/lib/api-client.multiregion.test.ts b/packages/cli/test/lib/api-client.multiregion.test.ts index 400beec0de..c06c58861d 100644 --- a/packages/cli/test/lib/api-client.multiregion.test.ts +++ b/packages/cli/test/lib/api-client.multiregion.test.ts @@ -21,7 +21,7 @@ import { setOrgRegion, } from "../../src/lib/db/regions.js"; import { ApiError } from "../../src/lib/errors.js"; -import { useTestConfigDir } from "../helpers.js"; +import { useTestConfigDir, at } from "../helpers.js"; useTestConfigDir("test-multiregion-"); let originalFetch: typeof globalThis.fetch; @@ -35,10 +35,10 @@ beforeEach(async () => { // Isolate from env-var auth tokens so isEnvTokenActive() returns false. // Without this, tests for 403 enrichment would flake when CI sets // SENTRY_AUTH_TOKEN (the error message changes based on token source). - savedAuthToken = process.env.SENTRY_AUTH_TOKEN; - savedSentryToken = process.env.SENTRY_TOKEN; - delete process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_TOKEN; + savedAuthToken = process.env["SENTRY_AUTH_TOKEN"]; + savedSentryToken = process.env["SENTRY_TOKEN"]; + delete process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_TOKEN"]; // Set up auth token (manual token, no refresh) setAuthToken("test-token"); @@ -53,10 +53,10 @@ afterEach(() => { // Restore env vars if (savedAuthToken !== undefined) { - process.env.SENTRY_AUTH_TOKEN = savedAuthToken; + process.env["SENTRY_AUTH_TOKEN"] = savedAuthToken; } if (savedSentryToken !== undefined) { - process.env.SENTRY_TOKEN = savedSentryToken; + process.env["SENTRY_TOKEN"] = savedSentryToken; } }); @@ -136,8 +136,8 @@ describe("checkTokenAccess", () => { }); test("asks the self-hosted server the token belongs to", async () => { - const savedUrl = process.env.SENTRY_URL; - process.env.SENTRY_URL = "http://localhost:9000"; + const savedUrl = process.env["SENTRY_URL"]; + process.env["SENTRY_URL"] = "http://localhost:9000"; setAuthToken("self-hosted-token", undefined, undefined, { host: "http://localhost:9000", }); @@ -153,9 +153,9 @@ describe("checkTokenAccess", () => { await checkTokenAccess(); } finally { if (savedUrl === undefined) { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; } else { - process.env.SENTRY_URL = savedUrl; + process.env["SENTRY_URL"] = savedUrl; } } @@ -190,7 +190,7 @@ describe("listOrganizationsPage", () => { expect(capturedUrl).toContain("us.sentry.io"); expect(capturedUrl).toContain("/api/0/organizations/"); expect(orgs).toHaveLength(2); - expect(orgs[0].slug).toBe("us-org-1"); + expect(at(orgs, 0).slug).toBe("us-org-1"); }); test("enriches 403 error with re-auth guidance for OAuth users", async () => { @@ -582,20 +582,6 @@ describe("findProjectByDsn (multi-region)", () => { }); const captureSpy = vi.spyOn(Sentry, "captureException"); - const withScopeSpy = vi.spyOn(Sentry, "withScope"); - withScopeSpy.mockImplementation((fn: (scope: unknown) => void) => { - fn({ - setTag() { - /* noop */ - }, - setContext() { - /* noop */ - }, - setFingerprint() { - /* noop */ - }, - }); - }); try { const project = await findProjectByDsn(TEST_DSN, "abc123"); @@ -607,7 +593,6 @@ describe("findProjectByDsn (multi-region)", () => { }); } finally { captureSpy.mockRestore(); - withScopeSpy.mockRestore(); } }); @@ -616,8 +601,8 @@ describe("findProjectByDsn (multi-region)", () => { let savedUrl: string | undefined; beforeEach(() => { - savedUrl = process.env.SENTRY_URL; - process.env.SENTRY_URL = "http://localhost:9000"; + savedUrl = process.env["SENTRY_URL"]; + process.env["SENTRY_URL"] = "http://localhost:9000"; setAuthToken("self-hosted-token", undefined, undefined, { host: "http://localhost:9000", }); @@ -625,9 +610,9 @@ describe("findProjectByDsn (multi-region)", () => { afterEach(() => { if (savedUrl === undefined) { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; } else { - process.env.SENTRY_URL = savedUrl; + process.env["SENTRY_URL"] = savedUrl; } }); diff --git a/packages/cli/test/lib/api-client.seer.test.ts b/packages/cli/test/lib/api-client.seer.test.ts index b246f573ad..c431c0f617 100644 --- a/packages/cli/test/lib/api-client.seer.test.ts +++ b/packages/cli/test/lib/api-client.seer.test.ts @@ -344,7 +344,7 @@ describe("getAutofixState", () => { const result = await getAutofixState("test-org", "123456789"); expect(result?.status).toBe("COMPLETED"); - expect(result?.blocks).toEqual(blocks); + expect(result?.["blocks"]).toEqual(blocks); }); }); diff --git a/packages/cli/test/lib/api-client.test.ts b/packages/cli/test/lib/api-client.test.ts index 422734ea03..850b302e9f 100644 --- a/packages/cli/test/lib/api-client.test.ts +++ b/packages/cli/test/lib/api-client.test.ts @@ -20,7 +20,7 @@ import { import { DEFAULT_SENTRY_URL } from "../../src/lib/constants.js"; import { setAuthToken } from "../../src/lib/db/auth.js"; import { setOrgRegion, setOrgRegions } from "../../src/lib/db/regions.js"; -import { useTestConfigDir } from "../helpers.js"; +import { useTestConfigDir, at, must } from "../helpers.js"; useTestConfigDir("test-api-"); @@ -38,7 +38,8 @@ type RequestLog = { beforeEach(async () => { // Set required env var for OAuth refresh - process.env.SENTRY_CLIENT_ID = "test-client-id"; + // Set required env var for OAuth refresh + process.env["SENTRY_CLIENT_ID"] = "test-client-id"; // Save original fetch originalFetch = globalThis.fetch; @@ -110,12 +111,12 @@ describe("401 retry behavior", () => { let savedAuthToken: string | undefined; beforeEach(() => { - savedAuthToken = process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_AUTH_TOKEN; + savedAuthToken = process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_AUTH_TOKEN"]; }); afterEach(() => { if (savedAuthToken !== undefined) { - process.env.SENTRY_AUTH_TOKEN = savedAuthToken; + process.env["SENTRY_AUTH_TOKEN"] = savedAuthToken; } }); @@ -158,12 +159,12 @@ describe("401 retry behavior", () => { expect(oauthRequests).toHaveLength(1); // First request with initial token - expect(apiRequests[0].authorization).toBe("Bearer initial-token"); - expect(apiRequests[0].isRetry).toBe(false); + expect(at(apiRequests, 0).authorization).toBe("Bearer initial-token"); + expect(at(apiRequests, 0).isRetry).toBe(false); // Retry request with new token - expect(apiRequests[1].authorization).toBe("Bearer refreshed-token"); - expect(apiRequests[1].isRetry).toBe(true); + expect(at(apiRequests, 1).authorization).toBe("Bearer refreshed-token"); + expect(at(apiRequests, 1).isRetry).toBe(true); }); test("does not retry on non-401 errors", async () => { @@ -186,7 +187,7 @@ describe("401 retry behavior", () => { r.url.includes("/test-endpoint"), ); expect(apiRequests).toHaveLength(1); - expect(apiRequests[0].isRetry).toBe(false); + expect(at(apiRequests, 0).isRetry).toBe(false); // No OAuth refresh should have been attempted const oauthRequests = requests.filter((r) => @@ -215,8 +216,8 @@ describe("401 retry behavior", () => { r.url.includes("/test-endpoint"), ); expect(apiRequests).toHaveLength(2); - expect(apiRequests[0].isRetry).toBe(false); - expect(apiRequests[1].isRetry).toBe(true); + expect(at(apiRequests, 0).isRetry).toBe(false); + expect(at(apiRequests, 1).isRetry).toBe(true); // OAuth refresh should have been called once (after first 401) const oauthRequests = requests.filter((r) => @@ -274,7 +275,7 @@ describe("401 retry behavior", () => { r.url.includes("/test-endpoint"), ); expect(apiRequests).toHaveLength(1); - expect(apiRequests[0].isRetry).toBe(false); + expect(at(apiRequests, 0).isRetry).toBe(false); // No OAuth refresh should have been attempted (no refresh token available) const oauthRequests = requests.filter((r) => @@ -370,7 +371,7 @@ describe("rawApiRequest", () => { expect(result.status).toBe(200); expect(result.body).toEqual([{ id: 1 }]); expect(requests).toHaveLength(1); - expect(requests[0].method).toBe("GET"); + expect(at(requests, 0).method).toBe("GET"); }); test("sends POST request with JSON object body", async () => { @@ -395,7 +396,7 @@ describe("rawApiRequest", () => { expect(result.status).toBe(200); expect(result.body).toEqual({ success: true }); - expect(requests[0].method).toBe("POST"); + expect(at(requests, 0).method).toBe("POST"); expect(capturedBody).toBe('{"status":"resolved"}'); }); @@ -421,13 +422,13 @@ describe("rawApiRequest", () => { expect(result.status).toBe(200); expect(result.body).toEqual({ updated: true }); - expect(requests[0].method).toBe("PUT"); + expect(at(requests, 0).method).toBe("PUT"); // String body should be sent as-is expect(capturedBody).toBe('{"status":"resolved"}'); // No explicit Content-Type header set by rawApiRequest for string bodies. // Node.js Request constructor auto-sets "text/plain;charset=UTF-8" for // string bodies; Bun leaves it null. Accept either. - const ct = requests[0].headers.get("Content-Type"); + const ct = at(requests, 0).headers.get("Content-Type"); expect(ct === null || ct === "text/plain;charset=UTF-8").toBe(true); }); @@ -451,7 +452,7 @@ describe("rawApiRequest", () => { }); // User-provided Content-Type should be used - expect(requests[0].headers.get("Content-Type")).toBe("text/plain"); + expect(at(requests, 0).headers.get("Content-Type")).toBe("text/plain"); }); test("string body with lowercase content-type header (case-insensitive)", async () => { @@ -474,7 +475,7 @@ describe("rawApiRequest", () => { }); // Lowercase content-type should be detected and preserved (case-insensitive check) - expect(requests[0].headers.get("Content-Type")).toBe("text/xml"); + expect(at(requests, 0).headers.get("Content-Type")).toBe("text/xml"); }); test("string body with mixed case Content-TYPE header", async () => { @@ -497,7 +498,7 @@ describe("rawApiRequest", () => { }); // Mixed case Content-TYPE should be detected and preserved - expect(requests[0].headers.get("Content-Type")).toBe( + expect(at(requests, 0).headers.get("Content-Type")).toBe( "application/octet-stream", ); }); @@ -519,7 +520,7 @@ describe("rawApiRequest", () => { params: { status: "resolved", limit: "10" }, }); - const url = new URL(requests[0].url); + const url = new URL(at(requests, 0).url); expect(url.searchParams.get("status")).toBe("resolved"); expect(url.searchParams.get("limit")).toBe("10"); }); @@ -541,7 +542,7 @@ describe("rawApiRequest", () => { headers: { "X-Custom-Header": "test-value" }, }); - expect(requests[0].headers.get("X-Custom-Header")).toBe("test-value"); + expect(at(requests, 0).headers.get("X-Custom-Header")).toBe("test-value"); }); test("custom headers merged with string body (no default Content-Type)", async () => { @@ -566,8 +567,8 @@ describe("rawApiRequest", () => { // Custom headers should be present, but no explicit Content-Type for string bodies. // Node.js Request constructor auto-sets "text/plain;charset=UTF-8" for // string bodies; Bun leaves it null. Accept either. - expect(requests[0].headers.get("X-Custom")).toBe("value"); - const ct = requests[0].headers.get("Content-Type"); + expect(at(requests, 0).headers.get("X-Custom")).toBe("value"); + const ct = at(requests, 0).headers.get("Content-Type"); expect(ct === null || ct === "text/plain;charset=UTF-8").toBe(true); }); @@ -666,10 +667,10 @@ describe("findProjectsBySlug", () => { const { projects, orgs } = await findProjectsBySlug("frontend"); expect(projects).toHaveLength(2); - expect(projects[0].slug).toBe("frontend"); - expect(projects[0].orgSlug).toBe("acme"); - expect(projects[1].slug).toBe("frontend"); - expect(projects[1].orgSlug).toBe("beta"); + expect(at(projects, 0).slug).toBe("frontend"); + expect(at(projects, 0).orgSlug).toBe("acme"); + expect(at(projects, 1).slug).toBe("frontend"); + expect(at(projects, 1).orgSlug).toBe("beta"); expect(orgs).toHaveLength(2); }); @@ -744,7 +745,7 @@ describe("findProjectsBySlug", () => { const { projects } = await findProjectsBySlug("frontend"); expect(projects).toHaveLength(1); - expect(projects[0].orgSlug).toBe("acme"); + expect(at(projects, 0).orgSlug).toBe("acme"); }); test("resolves numeric project ID when slug differs", async () => { @@ -784,8 +785,8 @@ describe("findProjectsBySlug", () => { // Numeric ID should resolve even though returned slug differs const { projects } = await findProjectsBySlug("7275560680"); expect(projects).toHaveLength(1); - expect(projects[0].slug).toBe("frontend"); - expect(projects[0].orgSlug).toBe("acme"); + expect(at(projects, 0).slug).toBe("frontend"); + expect(at(projects, 0).orgSlug).toBe("acme"); }); test("rejects non-numeric input when returned slug differs", async () => { @@ -837,7 +838,6 @@ describe("findProjectsBySlug", () => { const requests: string[] = []; - // @ts-expect-error - partial mock globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit) => { const req = new Request(input, init); const url = req.url; @@ -861,8 +861,8 @@ describe("findProjectsBySlug", () => { // Found via cached orgs expect(projects).toHaveLength(1); - expect(projects[0].slug).toBe("frontend"); - expect(projects[0].orgSlug).toBe("acme"); + expect(at(projects, 0).slug).toBe("frontend"); + expect(at(projects, 0).orgSlug).toBe("acme"); // The expensive listOrganizations API calls were skipped expect(requests.some((r) => r.includes("/users/me/regions/"))).toBe(false); @@ -1555,7 +1555,7 @@ describe("listTraceLogs", () => { ); expect(Array.isArray(result)).toBe(true); expect(result).toHaveLength(1); - expect(result[0].severity).toBe("info"); + expect(at(result, 0).severity).toBe("info"); }); test("passes traceId, statsPeriod, limit, and query as params", async () => { @@ -1642,11 +1642,11 @@ describe("listTraceLogs", () => { "aaaa1111bbbb2222cccc3333dddd4444", ); expect(result).toHaveLength(1); - expect(typeof result[0]["project.id"]).toBe("number"); - expect(result[0]["project.id"]).toBe(123); - expect(typeof result[0].severity_number).toBe("number"); - expect(result[0].severity_number).toBe(9); - expect(typeof result[0].timestamp_precise).toBe("number"); + expect(typeof at(result, 0)["project.id"]).toBe("number"); + expect(at(result, 0)["project.id"]).toBe(123); + expect(typeof at(result, 0).severity_number).toBe("number"); + expect(at(result, 0).severity_number).toBe(9); + expect(typeof at(result, 0).timestamp_precise).toBe("number"); }); test("accepts responses with missing optional fields", async () => { @@ -1679,9 +1679,9 @@ describe("listTraceLogs", () => { "aaaa1111bbbb2222cccc3333dddd4444", ); expect(result).toHaveLength(1); - expect(result[0].severity_number).toBeUndefined(); - expect(result[0].timestamp_precise).toBeUndefined(); - expect(result[0].severity).toBe("info"); + expect(at(result, 0).severity_number).toBeUndefined(); + expect(at(result, 0).timestamp_precise).toBeUndefined(); + expect(at(result, 0).severity).toBe("info"); }); }); @@ -1735,7 +1735,7 @@ describe("getLogs", () => { const result = await getLogs("my-org", "my-project", [LOG_ID_1]); expect(result).toHaveLength(1); - expect(result[0]["sentry.item_id"]).toBe(LOG_ID_1); + expect(at(result, 0)["sentry.item_id"]).toBe(LOG_ID_1); }); test("passes bracket syntax and per_page in query", async () => { @@ -1793,10 +1793,10 @@ describe("getLogs", () => { const url = new URL(req.url); const query = url.searchParams.get("query") ?? ""; const bracketMatch = query.match(/sentry\.item_id:\[([^\]]+)\]/); - const batchIds = bracketMatch ? bracketMatch[1].split(",") : []; + const batchIds = bracketMatch ? must(bracketMatch[1]).split(",") : []; return new Response( JSON.stringify({ - data: [makeLogEntry(batchIds[0])], + data: [makeLogEntry(at(batchIds, 0))], meta: { fields: {} }, }), { status: 200, headers: { "Content-Type": "application/json" } }, diff --git a/packages/cli/test/lib/api/alerts.test.ts b/packages/cli/test/lib/api/alerts.test.ts index 6a28d368cc..4539d6552f 100644 --- a/packages/cli/test/lib/api/alerts.test.ts +++ b/packages/cli/test/lib/api/alerts.test.ts @@ -350,7 +350,7 @@ describe("createIssueAlertRule", () => { name: "New", detectorIds: [7], }); - expect(created.id).toBe("5"); + expect(created["id"]).toBe("5"); }); }); @@ -477,7 +477,7 @@ describe("createMetricAlertRule", () => { triggers: [{ alertThreshold: 500 }], projects: ["backend"], }); - expect(created.id).toBe("77"); + expect(created["id"]).toBe("77"); }); test("maps error-like datasets to queryType 0 and error eventTypes", async () => { @@ -500,11 +500,11 @@ describe("createMetricAlertRule", () => { projects: ["backend"], }); - const source = (sentBody.dataSources as Record[])[0]; - expect(source?.dataset).toBe("events"); - expect(source?.queryType).toBe(0); - expect(source?.eventTypes).toEqual(["error", "default"]); - expect(source?.timeWindow).toBe(900); + const source = (sentBody["dataSources"] as Record[])[0]; + expect(source?.["dataset"]).toBe("events"); + expect(source?.["queryType"]).toBe(0); + expect(source?.["eventTypes"]).toEqual(["error", "default"]); + expect(source?.["timeWindow"]).toBe(900); }); test("maps logs to the EAP dataset with trace_item_log and connects workflows", async () => { @@ -528,7 +528,7 @@ describe("createMetricAlertRule", () => { workflowIds: [42], }); - expect(sentBody.dataSources).toEqual([ + expect(sentBody["dataSources"]).toEqual([ { aggregate: "count()", dataset: "events_analytics_platform", @@ -538,14 +538,14 @@ describe("createMetricAlertRule", () => { timeWindow: 300, }, ]); - expect(sentBody.conditionGroup).toEqual({ + expect(sentBody["conditionGroup"]).toEqual({ logicType: "any", conditions: [ { type: "gt", comparison: 0, conditionResult: 75 }, { type: "lte", comparison: 0, conditionResult: 0 }, ], }); - expect(sentBody.workflowIds).toEqual([42]); + expect(sentBody["workflowIds"]).toEqual([42]); }); test("maps sessions to the crash-rate metrics dataset", async () => { @@ -569,10 +569,10 @@ describe("createMetricAlertRule", () => { projects: ["backend"], }); - const source = (sentBody.dataSources as Record[])[0]; - expect(source?.dataset).toBe("metrics"); - expect(source?.queryType).toBe(2); - expect(source?.eventTypes).toEqual([]); + const source = (sentBody["dataSources"] as Record[])[0]; + expect(source?.["dataset"]).toBe("metrics"); + expect(source?.["queryType"]).toBe(2); + expect(source?.["eventTypes"]).toEqual([]); }); test("translates warning and below-threshold triggers", async () => { @@ -599,7 +599,7 @@ describe("createMetricAlertRule", () => { }); expect( - (sentBody.conditionGroup as Record).conditions, + (sentBody["conditionGroup"] as Record)["conditions"], ).toEqual([ { type: "lt", comparison: 10, conditionResult: 75 }, { type: "lt", comparison: 50, conditionResult: 50 }, @@ -631,7 +631,7 @@ describe("createMetricAlertRule", () => { }); expect( - (sentBody.conditionGroup as Record).conditions, + (sentBody["conditionGroup"] as Record)["conditions"], ).toEqual([ { type: "gt", comparison: 11, conditionResult: 75 }, { type: "gt", comparison: 5, conditionResult: 50 }, @@ -664,7 +664,7 @@ describe("createMetricAlertRule", () => { }); expect( - (sentBody.conditionGroup as Record).conditions, + (sentBody["conditionGroup"] as Record)["conditions"], ).toEqual(conditions); }); @@ -721,7 +721,7 @@ describe("metric alert edit round-trip", () => { const req = new Request(input, init); if (req.method === "PUT") { const body = (await req.json()) as Record; - putSource = (body.dataSources as Record[])[0]; + putSource = (body["dataSources"] as Record[])[0]; } return Response.json(metricDetector({ dataSources: [storedSource] })); }); @@ -762,13 +762,13 @@ describe("metric alert edit round-trip without event types", () => { const req = new Request(input, init); if (req.method === "PUT") { const body = (await req.json()) as Record; - putSource = (body.dataSources as Record[])[0]; + putSource = (body["dataSources"] as Record[])[0]; } return Response.json(metricDetector({ dataSources: [storedSource] })); }); const doc = await getMetricAlertRuleDocument("test-org", "9"); - expect(doc.dataset).toBe("events_analytics_platform"); + expect(doc["dataset"]).toBe("events_analytics_platform"); await putMetricAlertRule("test-org", "9", { ...doc, name: "Renamed" }); expect(putSource).toMatchObject({ @@ -788,7 +788,7 @@ describe("metric alert edit round-trip of detector config", () => { const req = new Request(input, init); if (req.method === "PUT") { const body = (await req.json()) as Record; - putConfig = body.config; + putConfig = body["config"]; } return Response.json(metricDetector({ config: storedConfig })); }); @@ -810,7 +810,7 @@ describe("metric alert edit round-trip of detector config", () => { const req = new Request(input, init); if (req.method === "PUT") { const body = (await req.json()) as Record; - putConfig = body.config; + putConfig = body["config"]; } return Response.json(metricDetector({ config: storedConfig })); }); @@ -832,7 +832,7 @@ describe("metric alert edit round-trip of detector config", () => { const req = new Request(input, init); if (req.method === "PUT") { const body = (await req.json()) as Record; - putConfig = body.config; + putConfig = body["config"]; } return Response.json(metricDetector({ config: storedConfig })); }); @@ -855,7 +855,7 @@ describe("metric alert edit round-trip of detector config", () => { const req = new Request(input, init); if (req.method === "PUT") { const body = (await req.json()) as Record; - putConfig = body.config; + putConfig = body["config"]; } return Response.json(metricDetector({})); }); @@ -875,10 +875,10 @@ describe("putMetricAlertRule", () => { "/api/0/organizations/test-org/detectors/9/", ); const body = (await req.json()) as Record; - expect(body.name).toBe("Renamed"); - expect(body.type).toBe("metric_issue"); + expect(body["name"]).toBe("Renamed"); + expect(body["type"]).toBe("metric_issue"); // status 1 (disabled) maps onto the detector's enabled=false flag. - expect(body.enabled).toBe(false); + expect(body["enabled"]).toBe(false); return Response.json(metricDetector({ id: "9", name: "Renamed" })); }); diff --git a/packages/cli/test/lib/api/chunk-upload.test.ts b/packages/cli/test/lib/api/chunk-upload.test.ts index 0ec80e7d8c..48dd3ea2cd 100644 --- a/packages/cli/test/lib/api/chunk-upload.test.ts +++ b/packages/cli/test/lib/api/chunk-upload.test.ts @@ -194,7 +194,7 @@ describe("assemble requests", () => { assembleArtifactBundle("my-org", { checksum: "abc", chunks: [], - projects: [], + projects: ["my-project"], }), ).rejects.toThrow("Unexpected response format"); }); diff --git a/packages/cli/test/lib/api/conversations.test.ts b/packages/cli/test/lib/api/conversations.test.ts index b7c6334093..6cbc142710 100644 --- a/packages/cli/test/lib/api/conversations.test.ts +++ b/packages/cli/test/lib/api/conversations.test.ts @@ -20,7 +20,7 @@ import { } from "../../../src/lib/api/conversations.js"; import { MAX_PAGINATION_PAGES } from "../../../src/lib/api/infrastructure.js"; import type { ConversationStats } from "../../../src/types/conversation.js"; -import { mockFetch, useTestConfigDir } from "../../helpers.js"; +import { mockFetch, useTestConfigDir, at } from "../../helpers.js"; // ============================================================================ // Helpers @@ -66,7 +66,7 @@ function mockSequential( const req = new Request(input, init); capturedUrls.push(req.url); - const resp = responses[callIndex]; + const resp = at(responses, callIndex); callIndex += 1; return new Response(JSON.stringify(resp.body), { @@ -368,7 +368,7 @@ describe("getConversationSpans", () => { const result = await getConversationSpans(ORG, CONV_ID); expect(result.spans).toHaveLength(1); - expect(result.spans[0].span_id).toBe("span-1-aabb1122"); + expect(at(result.spans, 0).span_id).toBe("span-1-aabb1122"); expect(result.title).toBe("Refund flow"); expect(result.stats?.totalCost).toBe(0.0042); expect(result.stats?.totalTokens).toBe(100); @@ -398,8 +398,8 @@ describe("getConversationSpans", () => { const result = await getConversationSpans(ORG, CONV_ID); expect(result.spans).toHaveLength(2); - expect(result.spans[0].span_id).toBe("span-page-1-aa11"); - expect(result.spans[1].span_id).toBe("span-page-2-bb22"); + expect(at(result.spans, 0).span_id).toBe("span-page-1-aa11"); + expect(at(result.spans, 1).span_id).toBe("span-page-2-bb22"); // Title is taken from the first page expect(result.title).toBe("Multi-page"); expect(result.truncated).toBe(false); diff --git a/packages/cli/test/lib/api/dashboards.test.ts b/packages/cli/test/lib/api/dashboards.test.ts index 7fc4f74dfe..a2234d323a 100644 --- a/packages/cli/test/lib/api/dashboards.test.ts +++ b/packages/cli/test/lib/api/dashboards.test.ts @@ -656,11 +656,11 @@ describe("queryAllWidgets timeseries", () => { const { path, params } = lastRequest(); expect(path).toEqual({ organization_id_or_slug: ORG }); - expect(params.dataset).toBe("errors"); - expect(params.yAxis).toEqual(["count()"]); - expect(params.statsPeriod).toBe("24h"); - expect(params.groupBy).toBeUndefined(); - expect(params.topEvents).toBeUndefined(); + expect(params["dataset"]).toBe("errors"); + expect(params["yAxis"]).toEqual(["count()"]); + expect(params["statsPeriod"]).toBe("24h"); + expect(params["groupBy"]).toBeUndefined(); + expect(params["topEvents"]).toBeUndefined(); expect(results.get(0)).toEqual({ type: "timeseries", series: [ @@ -786,15 +786,15 @@ describe("queryAllWidgets timeseries", () => { await queryAllWidgets(REGION, ORG, dashboard, { period: "1h" }); const { params } = lastRequest(); - expect(params.groupBy).toEqual([ + expect(params["groupBy"]).toEqual([ "severity", "count()", "count_unique(user)", "max(timestamp)", ]); - expect(params.sort).toBe("-max(timestamp)"); - expect(params.topEvents).toBe(5); - expect(params.excludeOther).toBe("1"); + expect(params["sort"]).toBe("-max(timestamp)"); + expect(params["topEvents"]).toBe(5); + expect(params["excludeOther"]).toBe("1"); }); test("labels grouped series by group values and marks Other", async () => { diff --git a/packages/cli/test/lib/api/debug-files.test.ts b/packages/cli/test/lib/api/debug-files.test.ts index 3bfd1de3b3..f9b2b92ba6 100644 --- a/packages/cli/test/lib/api/debug-files.test.ts +++ b/packages/cli/test/lib/api/debug-files.test.ts @@ -8,17 +8,24 @@ */ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; -import { getChunkUploadOptions } from "../../../src/lib/api/chunk-upload.js"; +import { + type assembleDebugFiles, + getChunkUploadOptions, + type uploadChunkPayloads, +} from "../../../src/lib/api/chunk-upload.js"; import { ASSEMBLE_BATCH_SIZE, type DebugFileUpload, uploadDebugFiles, } from "../../../src/lib/api/debug-files.js"; import { ApiError } from "../../../src/lib/errors.js"; +import { must, at } from "../../helpers.js"; const { assembleMock, uploadChunkPayloadsMock } = vi.hoisted(() => ({ - assembleMock: vi.fn(), - uploadChunkPayloadsMock: vi.fn(() => Promise.resolve()), + assembleMock: vi.fn(), + uploadChunkPayloadsMock: vi.fn(() => + Promise.resolve(), + ), })); vi.mock("../../../src/lib/region.js", () => ({ @@ -46,6 +53,8 @@ vi.mock("../../../src/lib/api/chunk-upload.js", async (importOriginal) => { }; }); +type AssembleResponse = Awaited>; + /** Build a single debug-file upload payload. */ function makeDif( name: string, @@ -56,13 +65,8 @@ function makeDif( } /** The single checksum key from the most recent assemble body. */ -function lastAssembleBody(): Record< - string, - { name: string; debug_id?: string; chunks: string[] } -> { - const calls = assembleMock.mock.calls; - const lastCall = calls.at(-1); - return lastCall?.[2]; +function lastAssembleBody(): Parameters[2] { + return must(assembleMock.mock.calls.at(-1), "assemble was not called")[2]; } const SOLE = { @@ -117,9 +121,9 @@ describe("uploadDebugFiles", () => { // echo its keys back as "ok" — server already holds the file, so no-wait // completes on the first assemble. assembleMock.mockImplementationOnce( - async (_org: string, _project: string, assembleBody: object) => { - const body = assembleBody as Record; - const data: Record = {}; + async (_org, _project, assembleBody) => { + const body = assembleBody; + const data: AssembleResponse = {}; for (const key of Object.keys(body)) { data[key] = { state: "ok" }; } @@ -138,7 +142,7 @@ describe("uploadDebugFiles", () => { const keys = Object.keys(body); expect(keys).toHaveLength(1); expect(keys[0]).toMatch(/^[0-9a-f]{40}$/); - const entry = body[keys[0]]; + const entry = body[at(keys, 0)]; expect(entry?.name).toBe("libfoo.so"); expect(entry?.debug_id).toBe("abc123-def"); expect(Array.isArray(entry?.chunks)).toBe(true); @@ -151,9 +155,9 @@ describe("uploadDebugFiles", () => { test("omits debug_id from the body when not provided", async () => { assembleMock.mockImplementationOnce( - async (_org: string, _project: string, assembleBody: object) => { - const body = assembleBody as Record; - const data: Record = {}; + async (_org, _project, assembleBody) => { + const body = assembleBody; + const data: AssembleResponse = {}; for (const key of Object.keys(body)) { data[key] = { state: "ok" }; } @@ -179,17 +183,17 @@ describe("uploadDebugFiles", () => { // First assemble: server is missing the chunk. Second: held (created). assembleMock.mockImplementationOnce( - async (_org: string, _project: string, assembleBody: object) => { - const body = assembleBody as Record; - const key = Object.keys(body)[0]; + async (_org, _project, assembleBody) => { + const body = assembleBody; + const key = at(Object.keys(body), 0); return { [key]: { state: "not_found", missingChunks: body[key]?.chunks }, }; }, ); assembleMock.mockImplementationOnce( - async (_org: string, _project: string, assembleBody: object) => { - const key = Object.keys(assembleBody)[0]; + async (_org, _project, assembleBody) => { + const key = at(Object.keys(assembleBody), 0); return { [key]: { state: "created" } }; }, ); @@ -213,14 +217,14 @@ describe("uploadDebugFiles", () => { const dif = makeDif("libbaz.so", "debug bytes", "id-2"); assembleMock.mockImplementationOnce( - async (_org: string, _project: string, assembleBody: object) => { - const key = Object.keys(assembleBody)[0]; + async (_org, _project, assembleBody) => { + const key = at(Object.keys(assembleBody), 0); return { [key]: { state: "assembling" } }; }, ); assembleMock.mockImplementationOnce( - async (_org: string, _project: string, assembleBody: object) => { - const key = Object.keys(assembleBody)[0]; + async (_org, _project, assembleBody) => { + const key = at(Object.keys(assembleBody), 0); return { [key]: { state: "ok" } }; }, ); @@ -241,8 +245,8 @@ describe("uploadDebugFiles", () => { test("wait mode collects an 'error' state without throwing", async () => { const dif = makeDif("broken.so", "debug bytes", "id-3"); assembleMock.mockImplementationOnce( - async (_org: string, _project: string, assembleBody: object) => { - const key = Object.keys(assembleBody)[0]; + async (_org, _project, assembleBody) => { + const key = at(Object.keys(assembleBody), 0); return { [key]: { state: "error", detail: "corrupt object" } }; }, ); @@ -261,12 +265,10 @@ describe("uploadDebugFiles", () => { test("wait mode throws ApiError when assembly does not finish in time", async () => { const dif = makeDif("slow.so", "debug bytes", "id-4"); // Always "assembling" → never terminal. maxWaitMs=0 trips the deadline. - assembleMock.mockImplementation( - async (_org: string, _project: string, assembleBody: object) => { - const key = Object.keys(assembleBody)[0]; - return { [key]: { state: "assembling" } }; - }, - ); + assembleMock.mockImplementation(async (_org, _project, assembleBody) => { + const key = at(Object.keys(assembleBody), 0); + return { [key]: { state: "assembling" } }; + }); await expect( uploadDebugFiles({ @@ -280,9 +282,9 @@ describe("uploadDebugFiles", () => { test("batches multiple files into one assemble request", async () => { assembleMock.mockImplementationOnce( - async (_org: string, _project: string, assembleBody: object) => { - const body = assembleBody as Record; - const data: Record = {}; + async (_org, _project, assembleBody) => { + const body = assembleBody; + const data: AssembleResponse = {}; for (const key of Object.keys(body)) { data[key] = { state: "ok" }; } @@ -303,16 +305,14 @@ describe("uploadDebugFiles", () => { }); test("includes code_id and shader_group only when provided", async () => { - assembleMock.mockImplementation( - async (_org: string, _project: string, assembleBody: object) => { - const body = assembleBody as Record; - const data: Record = {}; - for (const key of Object.keys(body)) { - data[key] = { state: "ok" }; - } - return data; - }, - ); + assembleMock.mockImplementation(async (_org, _project, assembleBody) => { + const body = assembleBody; + const data: AssembleResponse = {}; + for (const key of Object.keys(body)) { + data[key] = { state: "ok" }; + } + return data; + }); await uploadDebugFiles({ ...SOLE, @@ -334,8 +334,8 @@ describe("uploadDebugFiles", () => { string, unknown >[]; - expect(entry?.code_id).toBe("d9a5d2fa49f0cf6c"); - expect(entry?.shader_group).toBe("Global/FSentryTestCS/0"); + expect(entry?.["code_id"]).toBe("d9a5d2fa49f0cf6c"); + expect(entry?.["shader_group"]).toBe("Global/FSentryTestCS/0"); await uploadDebugFiles({ ...SOLE, @@ -352,16 +352,14 @@ describe("uploadDebugFiles", () => { }); test("splits the assemble request into batches and merges the responses", async () => { - assembleMock.mockImplementation( - async (_org: string, _project: string, assembleBody: object) => { - const body = assembleBody as Record; - const data: Record = {}; - for (const key of Object.keys(body)) { - data[key] = { state: "ok" }; - } - return data; - }, - ); + assembleMock.mockImplementation(async (_org, _project, assembleBody) => { + const body = assembleBody; + const data: AssembleResponse = {}; + for (const key of Object.keys(body)) { + data[key] = { state: "ok" }; + } + return data; + }); const difs = Array.from({ length: ASSEMBLE_BATCH_SIZE + 1 }, (_, i) => makeDif(`f${i}.so`, `bytes ${i}`, `id-${i}`), ); @@ -375,7 +373,7 @@ describe("uploadDebugFiles", () => { expect(assembleMock).toHaveBeenCalledTimes(2); const sizes = assembleMock.mock.calls.map( - (call) => Object.keys(call[2] as object).length, + (call) => Object.keys(call[2]).length, ); expect(sizes).toEqual([ASSEMBLE_BATCH_SIZE, 1]); expect(results).toHaveLength(ASSEMBLE_BATCH_SIZE + 1); @@ -388,9 +386,9 @@ describe("uploadDebugFiles", () => { // call after the chunks are re-uploaded. assembleMock.mockImplementationOnce(async () => ({})); assembleMock.mockImplementationOnce( - async (_org: string, _project: string, assembleBody: object) => { - const body = assembleBody as Record; - const data: Record = {}; + async (_org, _project, assembleBody) => { + const body = assembleBody; + const data: AssembleResponse = {}; for (const key of Object.keys(body)) { data[key] = { state: "ok" }; } @@ -418,14 +416,14 @@ describe("uploadDebugFiles", () => { // client must still upload all chunks for that file, otherwise the loop // would poll forever without sending anything. assembleMock.mockImplementationOnce( - async (_org: string, _project: string, assembleBody: object) => { - const key = Object.keys(assembleBody)[0]; + async (_org, _project, assembleBody) => { + const key = at(Object.keys(assembleBody), 0); return { [key]: { state: "not_found" } }; }, ); assembleMock.mockImplementationOnce( - async (_org: string, _project: string, assembleBody: object) => { - const key = Object.keys(assembleBody)[0]; + async (_org, _project, assembleBody) => { + const key = at(Object.keys(assembleBody), 0); return { [key]: { state: "ok" } }; }, ); @@ -446,9 +444,9 @@ describe("uploadDebugFiles", () => { test("does not assemble oversized files but reports them as failures", async () => { setServerOptions({ maxFileSize: 5 }); assembleMock.mockImplementationOnce( - async (_org: string, _project: string, assembleBody: object) => { - const body = assembleBody as Record; - const data: Record = {}; + async (_org, _project, assembleBody) => { + const body = assembleBody; + const data: AssembleResponse = {}; for (const key of Object.keys(body)) { data[key] = { state: "ok" }; } @@ -501,12 +499,10 @@ describe("uploadDebugFiles", () => { vi.useFakeTimers(); // Always "assembling" → never terminal. The clamped 1s deadline trips // well before the requested 60s. - assembleMock.mockImplementation( - async (_org: string, _project: string, assembleBody: object) => { - const key = Object.keys(assembleBody)[0]; - return { [key]: { state: "assembling" } }; - }, - ); + assembleMock.mockImplementation(async (_org, _project, assembleBody) => { + const key = at(Object.keys(assembleBody), 0); + return { [key]: { state: "assembling" } }; + }); const promise = uploadDebugFiles({ ...SOLE, @@ -525,8 +521,8 @@ describe("uploadDebugFiles", () => { setServerOptions({ maxWait: 0 }); const dif = makeDif("ok.so", "debug bytes", "id-ok"); assembleMock.mockImplementationOnce( - async (_org: string, _project: string, assembleBody: object) => { - const key = Object.keys(assembleBody)[0]; + async (_org, _project, assembleBody) => { + const key = at(Object.keys(assembleBody), 0); return { [key]: { state: "ok" } }; }, ); diff --git a/packages/cli/test/lib/api/explore.test.ts b/packages/cli/test/lib/api/explore.test.ts index 6e25aceaee..9ffcf79f10 100644 --- a/packages/cli/test/lib/api/explore.test.ts +++ b/packages/cli/test/lib/api/explore.test.ts @@ -11,7 +11,7 @@ import { queryEventsTimeSeries, } from "../../../src/lib/api/explore.js"; import { setOrgRegion } from "../../../src/lib/db/regions.js"; -import { mockFetch, useTestConfigDir } from "../../helpers.js"; +import { mockFetch, useTestConfigDir, at } from "../../helpers.js"; describe("queryEvents", () => { useTestConfigDir("explore-test-"); @@ -252,7 +252,7 @@ describe("queryEvents", () => { const req = new Request(input, init); capturedUrls.push(req.url); - const resp = responses[callIndex]; + const resp = at(responses, callIndex); callIndex += 1; return new Response(JSON.stringify(resp.body), { @@ -445,7 +445,7 @@ describe("queryEventsTimeSeries", () => { expect(result).toEqual(response); expect(requests).toHaveLength(1); - const request = requests[0]; + const request = at(requests, 0); const url = new URL(request.url); expect(request.method).toBe("GET"); expect(url.origin).toBe("https://de.sentry.io"); @@ -509,7 +509,7 @@ describe("queryEventsTimeSeries", () => { }); expect(result).toEqual(response); - const params = new URL(requests[0].url).searchParams; + const params = new URL(at(requests, 0).url).searchParams; expect(params.getAll("yAxis")).toEqual([ "max(timestamp)", "latest_event()", @@ -532,7 +532,7 @@ describe("queryEventsTimeSeries", () => { }); expect(result).toEqual({ timeSeries: [] }); - const params = new URL(requests[0].url).searchParams; + const params = new URL(at(requests, 0).url).searchParams; expect(params.get("dataset")).toBe("tracemetrics"); expect(params.get("start")).toBe("2024-10-20T12:00:00Z"); expect(params.get("end")).toBe("2024-10-20T13:00:00Z"); diff --git a/packages/cli/test/lib/api/infrastructure.test.ts b/packages/cli/test/lib/api/infrastructure.test.ts index e8cc253b8c..0c4735dc1f 100644 --- a/packages/cli/test/lib/api/infrastructure.test.ts +++ b/packages/cli/test/lib/api/infrastructure.test.ts @@ -26,8 +26,8 @@ describe("SDK error compatibility", () => { ]); beforeEach(() => { - process.env.SENTRY_AUTH_TOKEN = "example-token"; - process.env.SENTRY_FORCE_ENV_TOKEN = "1"; + process.env["SENTRY_AUTH_TOKEN"] = "example-token"; + process.env["SENTRY_FORCE_ENV_TOKEN"] = "1"; }); test.each([ @@ -109,6 +109,7 @@ describe("SDK error compatibility", () => { baseUrl: "https://sentry.example", path: { organization_id_or_slug: "example-org" }, fetch: async () => { + // oxlint-disable-next-line typescript/only-throw-error -- the test checks that a non-Error fetch failure is preserved throw cause; }, }); @@ -199,11 +200,10 @@ describe("throwApiError", () => { } catch (thrown) { return (thrown as ApiError).detail ?? ""; } - throw new Error("expected throwApiError to throw"); } test("self-hosted ECONNREFUSED names the URL, errno, and next step", () => { - process.env.SENTRY_URL = "https://sentry.example.com"; + process.env["SENTRY_URL"] = "https://sentry.example.com"; const detail = detailFor( fetchFailed("ECONNREFUSED", "connect ECONNREFUSED 10.0.0.1:443"), ); @@ -217,8 +217,8 @@ describe("throwApiError", () => { }); test("names SENTRY_HOST as the override when it is the one set", () => { - process.env.SENTRY_HOST = "https://sentry.example.com"; - process.env.SENTRY_URL = "https://other.example.com"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; + process.env["SENTRY_URL"] = "https://other.example.com"; const detail = detailFor( fetchFailed("ECONNREFUSED", "connect ECONNREFUSED 10.0.0.1:443"), ); @@ -244,8 +244,8 @@ describe("throwApiError", () => { }); test("a proxy variable does not replace the errno hint (fetch ignores it)", () => { - process.env.SENTRY_URL = "https://sentry.example.com"; - process.env.HTTPS_PROXY = "http://user:secret@proxy.internal:3128"; + process.env["SENTRY_URL"] = "https://sentry.example.com"; + process.env["HTTPS_PROXY"] = "http://user:secret@proxy.internal:3128"; const detail = detailFor( fetchFailed("ECONNREFUSED", "connect ECONNREFUSED 10.0.0.1:443"), ); @@ -255,7 +255,7 @@ describe("throwApiError", () => { }); test("a cause without an errno still replaces 'fetch failed'", () => { - process.env.SENTRY_URL = "https://sentry.example.com:9"; + process.env["SENTRY_URL"] = "https://sentry.example.com:9"; const detail = detailFor( new TypeError("fetch failed", { cause: new Error("bad port") }), ); @@ -551,22 +551,22 @@ describe("throwApiError", () => { let savedToken: string | undefined; beforeEach(() => { - savedAuthToken = process.env.SENTRY_AUTH_TOKEN; - savedToken = process.env.SENTRY_TOKEN; - delete process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_TOKEN; + savedAuthToken = process.env["SENTRY_AUTH_TOKEN"]; + savedToken = process.env["SENTRY_TOKEN"]; + delete process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_TOKEN"]; }); afterEach(() => { if (savedAuthToken !== undefined) { - process.env.SENTRY_AUTH_TOKEN = savedAuthToken; + process.env["SENTRY_AUTH_TOKEN"] = savedAuthToken; } else { - delete process.env.SENTRY_AUTH_TOKEN; + delete process.env["SENTRY_AUTH_TOKEN"]; } if (savedToken !== undefined) { - process.env.SENTRY_TOKEN = savedToken; + process.env["SENTRY_TOKEN"] = savedToken; } else { - delete process.env.SENTRY_TOKEN; + delete process.env["SENTRY_TOKEN"]; } }); @@ -657,7 +657,7 @@ describe("throwApiError", () => { // A personal env token: the preload's `sntrys_` token gets org advice. useEnvSandbox(["SENTRY_AUTH_TOKEN"]); beforeEach(() => { - process.env.SENTRY_AUTH_TOKEN = "sntryu_test-token-for-unit-tests"; + process.env["SENTRY_AUTH_TOKEN"] = "sntryu_test-token-for-unit-tests"; }); test("uses 'not recognized or has been revoked' for invalid token", () => { @@ -772,22 +772,22 @@ describe("throwApiError", () => { let savedToken: string | undefined; beforeEach(() => { - savedAuthToken = process.env.SENTRY_AUTH_TOKEN; - savedToken = process.env.SENTRY_TOKEN; - delete process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_TOKEN; + savedAuthToken = process.env["SENTRY_AUTH_TOKEN"]; + savedToken = process.env["SENTRY_TOKEN"]; + delete process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_TOKEN"]; }); afterEach(() => { if (savedAuthToken !== undefined) { - process.env.SENTRY_AUTH_TOKEN = savedAuthToken; + process.env["SENTRY_AUTH_TOKEN"] = savedAuthToken; } else { - delete process.env.SENTRY_AUTH_TOKEN; + delete process.env["SENTRY_AUTH_TOKEN"]; } if (savedToken !== undefined) { - process.env.SENTRY_TOKEN = savedToken; + process.env["SENTRY_TOKEN"] = savedToken; } else { - delete process.env.SENTRY_TOKEN; + delete process.env["SENTRY_TOKEN"]; } }); @@ -838,8 +838,8 @@ describe("org auth token org mismatch", () => { const claim = Buffer.from( JSON.stringify({ iat: 1, url: "https://sentry.io", org: tokenOrg }), ).toString("base64"); - process.env.SENTRY_AUTH_TOKEN = `sntrys_${claim}_secret`; - process.env.SENTRY_FORCE_ENV_TOKEN = "1"; + process.env["SENTRY_AUTH_TOKEN"] = `sntrys_${claim}_secret`; + process.env["SENTRY_FORCE_ENV_TOKEN"] = "1"; resetAuthTokenCache(); const body = { detail }; const response = Response.json(body, { status }); @@ -852,7 +852,6 @@ describe("org auth token org mismatch", () => { } catch (error) { return (error as ApiError).detail; } - throw new Error("expected throwApiError to throw"); } test.each([ @@ -892,9 +891,9 @@ describe("403 scope challenge guidance", () => { if (credential === "login") { setAuthToken("oauth-access-token", 3600, "oauth-refresh-token"); } else { - process.env.SENTRY_AUTH_TOKEN = + process.env["SENTRY_AUTH_TOKEN"] = credential === "org" ? ORG_TOKEN : "sntryu_example"; - process.env.SENTRY_FORCE_ENV_TOKEN = "1"; + process.env["SENTRY_FORCE_ENV_TOKEN"] = "1"; } resetAuthTokenCache(); const body = { detail: "Denied" }; @@ -909,7 +908,6 @@ describe("403 scope challenge guidance", () => { } catch (error) { return (error as ApiError).detail; } - throw new Error("expected throwApiError to throw"); } test.each([ @@ -950,7 +948,7 @@ describe("401 guidance", () => { ])( "%s, stored login %s: %s gets %j", (envToken, storedLogin, detail, advice) => { - process.env.SENTRY_AUTH_TOKEN = envToken; + process.env["SENTRY_AUTH_TOKEN"] = envToken; if (storedLogin) { setAuthToken("oauth-access-token", 3600, "oauth-refresh-token"); } diff --git a/packages/cli/test/lib/api/integrations.test.ts b/packages/cli/test/lib/api/integrations.test.ts index b3a34444b6..0fa7cb28d1 100644 --- a/packages/cli/test/lib/api/integrations.test.ts +++ b/packages/cli/test/lib/api/integrations.test.ts @@ -15,7 +15,7 @@ import { import { setAuthToken } from "../../../src/lib/db/auth.js"; import { setOrgRegion } from "../../../src/lib/db/regions.js"; import { ApiError } from "../../../src/lib/errors.js"; -import { mockFetch, useTestConfigDir } from "../../helpers.js"; +import { mockFetch, useTestConfigDir, at } from "../../helpers.js"; const integration = { id: "42", @@ -77,7 +77,7 @@ describe("integration API", () => { expect(page.data).toEqual([integration]); expect(page.nextCursor).toBe("0:25:0"); expect(calls).toHaveLength(1); - const { url, method } = calls[0]; + const { url, method } = at(calls, 0); expect(method).toBe("GET"); expect(url.pathname).toBe("/api/0/organizations/my-org/integrations/"); expect(url.searchParams.get("includeConfig")).toBe("0"); diff --git a/packages/cli/test/lib/api/issue-app-links.test.ts b/packages/cli/test/lib/api/issue-app-links.test.ts index 0d4739c8bd..693df5d816 100644 --- a/packages/cli/test/lib/api/issue-app-links.test.ts +++ b/packages/cli/test/lib/api/issue-app-links.test.ts @@ -12,7 +12,7 @@ import { setAuthToken } from "../../../src/lib/db/auth.js"; import { setOrgRegion } from "../../../src/lib/db/regions.js"; import { ApiError, ValidationError } from "../../../src/lib/errors.js"; import { resetAuthenticatedFetch } from "../../../src/lib/sentry-client.js"; -import { mockFetch, useTestConfigDir } from "../../helpers.js"; +import { mockFetch, useTestConfigDir, at } from "../../helpers.js"; useTestConfigDir("issue-app-links-"); @@ -75,7 +75,7 @@ let actionStatus: number; let actionLink: AppIssueLink; function json(data: unknown, status = 200, headers?: HeadersInit): Response { - return Response.json(data, { status, headers }); + return Response.json(data, { status, ...(headers && { headers }) }); } beforeEach(async () => { @@ -156,7 +156,7 @@ describe("app issue-link action", () => { }); expect(writes()).toHaveLength(1); expect( - new globalThis.URL(writes()[0].url).searchParams.get( + new globalThis.URL(at(writes(), 0).url).searchParams.get( "expectedExternalIssueUrl", ), ).toBe(URL); @@ -210,10 +210,10 @@ describe("app issue-link action", () => { link: links[0], }); expect( - new globalThis.URL(writes()[0].url).searchParams.get( + new globalThis.URL(at(writes(), 0).url).searchParams.get( "expectedExternalIssueUrl", ), - ).toBe(links[0].webUrl); + ).toBe(at(links, 0).webUrl); expect(await writes()[0]?.json()).toMatchObject({ uri: FORM.uri, issueId: "linear-uuid", @@ -284,7 +284,7 @@ describe("app issue-link action", () => { }); expect(await writes()[0]?.json()).toMatchObject({ task_id: "123" }); expect( - new globalThis.URL(writes()[0].url).searchParams.get( + new globalThis.URL(at(writes(), 0).url).searchParams.get( "expectedExternalIssueUrl", ), ).toBe(url); @@ -349,9 +349,9 @@ describe("app issue-link action", () => { fields, }); await linkAppIssue(prepared); - expect(await writes()[0].json()).toMatchObject({ url }); + expect(await at(writes(), 0).json()).toMatchObject({ url }); expect( - new globalThis.URL(writes()[0].url).searchParams.get( + new globalThis.URL(at(writes(), 0).url).searchParams.get( "expectedExternalIssueUrl", ), ).toBe(url); @@ -506,7 +506,7 @@ describe("app issue-link action", () => { }); await linkAppIssue(prepared); expect( - new globalThis.URL(writes()[0].url).searchParams.get( + new globalThis.URL(at(writes(), 0).url).searchParams.get( "expectedExternalIssueUrl", ), ).toBe(URL); diff --git a/packages/cli/test/lib/api/issue-integrations.test.ts b/packages/cli/test/lib/api/issue-integrations.test.ts index bbe79128a8..07c6534916 100644 --- a/packages/cli/test/lib/api/issue-integrations.test.ts +++ b/packages/cli/test/lib/api/issue-integrations.test.ts @@ -43,7 +43,9 @@ function integration({ id = "10", name = `Example ${provider}`, externalIssues = [], -}: IntegrationFixture = {}) { +}: IntegrationFixture = {}): Parameters< + typeof selectNativeIntegration +>[0][number] { return { id, name, @@ -72,7 +74,7 @@ function integration({ } function json(data: unknown, headers?: HeadersInit): Response { - return Response.json(data, { status: 200, headers }); + return Response.json(data, { status: 200, ...(headers && { headers }) }); } describe("selectNativeIntegration", () => { diff --git a/packages/cli/test/lib/api/logs.test.ts b/packages/cli/test/lib/api/logs.test.ts index e993d50241..cdfc8e57f9 100644 --- a/packages/cli/test/lib/api/logs.test.ts +++ b/packages/cli/test/lib/api/logs.test.ts @@ -11,7 +11,7 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; import { getLogs, listLogs } from "../../../src/lib/api/logs.js"; import { setAuthToken } from "../../../src/lib/db/auth.js"; import { ApiError } from "../../../src/lib/errors.js"; -import { mockFetch, useTestConfigDir } from "../../helpers.js"; +import { mockFetch, useTestConfigDir, at } from "../../helpers.js"; useTestConfigDir("logs-api-test-"); @@ -83,7 +83,7 @@ describe("listLogs", () => { const logs = await listLogs("test-org", "test-project"); expect(logs).toHaveLength(1); - expect(logs[0]["sentry.item_id"]).toBe("log-001"); + expect(at(logs, 0)["sentry.item_id"]).toBe("log-001"); }); test("throws ApiError when API returns a string instead of object", async () => { @@ -218,7 +218,7 @@ describe("listLogs", () => { let call = 0; globalThis.fetch = mockFetch(async (input: RequestInfo | URL) => { urls.push(typeof input === "string" ? input : (input as Request).url); - const resp = responses[call]; + const resp = at(responses, call); call += 1; return new Response(JSON.stringify(resp.body), { status: 200, @@ -297,7 +297,7 @@ describe("getLogs", () => { ); expect(url.searchParams.get("project")).toBeNull(); expect(url.searchParams.getAll("field")).toEqual( - requests[0].searchParams.getAll("field"), + at(requests, 0).searchParams.getAll("field"), ); } }); @@ -332,7 +332,8 @@ describe("getLogs", () => { expect(logs).toEqual([found, missing]); expect(requests).toHaveLength(2); - const [initial, retry] = requests; + const initial = at(requests, 0); + const retry = at(requests, 1); expect(initial.searchParams.get("sampling")).toBe("NORMAL"); expect(initial.searchParams.get("start")).toBe("2026-10-08T11:55:00.000Z"); expect(initial.searchParams.get("end")).toBe("2026-10-09T12:05:00.000Z"); @@ -376,7 +377,7 @@ describe("getLogs", () => { expect(await getLogs("test-org", "test-project", [id, id])).toEqual(data); expect(requests).toHaveLength(1); - expect(requests[0].searchParams.get("sampling")).toBe("NORMAL"); + expect(at(requests, 0).searchParams.get("sampling")).toBe("NORMAL"); }); test("stops after one accuracy retry even if the scan remains partial", async () => { @@ -537,7 +538,7 @@ describe("getLogs", () => { const logs = await getLogs("test-org", "test-project", ["log-001"]); expect(logs).toHaveLength(1); - expect(logs[0]["sentry.item_id"]).toBe("log-001"); + expect(at(logs, 0)["sentry.item_id"]).toBe("log-001"); }); test("throws ApiError when API returns a string instead of object", async () => { diff --git a/packages/cli/test/lib/api/monitors.test.ts b/packages/cli/test/lib/api/monitors.test.ts index 040f89e4fe..678882830d 100644 --- a/packages/cli/test/lib/api/monitors.test.ts +++ b/packages/cli/test/lib/api/monitors.test.ts @@ -58,7 +58,7 @@ describe("SentryMonitorSchema", () => { expect(result.output.slug).toBe("nightly-job"); expect(result.output.config?.schedule).toBe("0 0 * * *"); // unknown fields are preserved via passthrough - expect((result.output as Record).isUpserting).toBe( + expect((result.output as Record)["isUpserting"]).toBe( false, ); } diff --git a/packages/cli/test/lib/api/organizations-context.focused.test.ts b/packages/cli/test/lib/api/organizations-context.focused.test.ts index ca0b66d632..afab05b0e1 100644 --- a/packages/cli/test/lib/api/organizations-context.focused.test.ts +++ b/packages/cli/test/lib/api/organizations-context.focused.test.ts @@ -129,7 +129,7 @@ describe("organization discovery credential context", () => { }); test("keeps organization pages pinned through rotating OAuth refresh tokens", async () => { - process.env.SENTRY_CLIENT_ID = "test-client-id"; + process.env["SENTRY_CLIENT_ID"] = "test-client-id"; setAuthToken("initial-access", 3600, "initial-refresh", { host: "https://sentry.io", }); @@ -360,7 +360,7 @@ describe("organization discovery credential context", () => { }); test("keeps the installation path when organization metadata omits regionUrl", async () => { - process.env.SENTRY_URL = "https://sentry.example.com/sentry"; + process.env["SENTRY_URL"] = "https://sentry.example.com/sentry"; setAuthToken("pathless-region-token", undefined, undefined, { host: "https://sentry.example.com", }); diff --git a/packages/cli/test/lib/api/organizations.test.ts b/packages/cli/test/lib/api/organizations.test.ts index 39bca5faee..3ffd034c2f 100644 --- a/packages/cli/test/lib/api/organizations.test.ts +++ b/packages/cli/test/lib/api/organizations.test.ts @@ -9,7 +9,7 @@ import { afterEach, beforeEach, describe, expect, test } from "vitest"; import { listOrganizationsPage } from "../../../src/lib/api/organizations.js"; import { setAuthToken } from "../../../src/lib/db/auth.js"; import { ApiError } from "../../../src/lib/errors.js"; -import { mockFetch, useTestConfigDir } from "../../helpers.js"; +import { mockFetch, useTestConfigDir, at } from "../../helpers.js"; useTestConfigDir("org-api-test-"); @@ -43,7 +43,7 @@ describe("listOrganizationsPage", () => { "https://sentry.example.com", ); expect(orgs).toHaveLength(1); - expect(orgs[0].slug).toBe("test-org"); + expect(at(orgs, 0).slug).toBe("test-org"); }); test("throws ApiError when API returns an empty object instead of array", async () => { diff --git a/packages/cli/test/lib/api/preprod-artifacts.test.ts b/packages/cli/test/lib/api/preprod-artifacts.test.ts index 16daff9c76..27766f5e28 100644 --- a/packages/cli/test/lib/api/preprod-artifacts.test.ts +++ b/packages/cli/test/lib/api/preprod-artifacts.test.ts @@ -177,7 +177,7 @@ describe("downloadBuildArtifact", () => { const init = customFetchMock.mock.calls.at(-1)?.[1] as { headers: Record; }; - expect(init.headers.Authorization).toBe("Bearer secret-token"); + expect(init.headers["Authorization"]).toBe("Bearer secret-token"); }); test("rejects a malformed bearer before downloading a build or snapshot", async () => { @@ -213,7 +213,7 @@ describe("downloadBuildArtifact", () => { const init = customFetchMock.mock.calls.at(-1)?.[1] as { headers: Record; }; - expect(init.headers.Authorization).toBeUndefined(); + expect(init.headers["Authorization"]).toBeUndefined(); }); test("omits auth when no token is available", async () => { @@ -229,7 +229,7 @@ describe("downloadBuildArtifact", () => { const init = customFetchMock.mock.calls.at(-1)?.[1] as { headers: Record; }; - expect(init.headers.Authorization).toBeUndefined(); + expect(init.headers["Authorization"]).toBeUndefined(); }); test("throws ApiError on a non-2xx response", async () => { @@ -304,11 +304,11 @@ describe("uploadBuild", () => { "https://us.sentry.io/api/0/projects/my-org/my-project/files/preprodartifacts/assemble/", ); const body = await lastSdkRequestBody(); - expect(body.checksum).toEqual(expect.any(String)); - expect(Array.isArray(body.chunks)).toBe(true); - expect(body.build_configuration).toBe("Release"); - expect(body.release_notes).toBe("notes"); - expect(body.install_groups).toEqual(["qa", "beta"]); + expect(body["checksum"]).toEqual(expect.any(String)); + expect(Array.isArray(body["chunks"])).toBe(true); + expect(body["build_configuration"]).toBe("Release"); + expect(body["release_notes"]).toBe("notes"); + expect(body["install_groups"]).toEqual(["qa", "beta"]); // Opted into transport retries: the poll loop re-sends the same body anyway. expect(getOrgSdkConfig).toHaveBeenCalledWith({ idempotent: true }); // No missing chunks on the first (and only) response. @@ -358,9 +358,9 @@ describe("uploadBuild", () => { const body = await lastSdkRequestBody(); // Flattened alongside checksum/chunks — not nested under a "vcs" key. - expect(body.head_sha).toBe("abc"); - expect(body.provider).toBe("github"); - expect(body.pr_number).toBe(3); + expect(body["head_sha"]).toBe("abc"); + expect(body["provider"]).toBe("github"); + expect(body["pr_number"]).toBe(3); expect(body).not.toHaveProperty("vcs"); }); diff --git a/packages/cli/test/lib/api/project-dsns.test.ts b/packages/cli/test/lib/api/project-dsns.test.ts index 8a7484797f..3ece087f44 100644 --- a/packages/cli/test/lib/api/project-dsns.test.ts +++ b/packages/cli/test/lib/api/project-dsns.test.ts @@ -13,7 +13,7 @@ import { resetCacheState, } from "../../../src/lib/response-cache.js"; import { resetAuthenticatedFetch } from "../../../src/lib/sentry-client.js"; -import { mockFetch, useTestConfigDir } from "../../helpers.js"; +import { mockFetch, useTestConfigDir, at } from "../../helpers.js"; useTestConfigDir("project-dsns-api-test-"); @@ -121,7 +121,7 @@ describe.each([ const result = await list(); expect(requests).toHaveLength(1); - const request = requests[0]; + const request = at(requests, 0); expect(request.method).toBe("GET"); expect(request.headers.get("Authorization")).toBe("Bearer test-token"); const url = new URL(request.url); diff --git a/packages/cli/test/lib/api/projects.test.ts b/packages/cli/test/lib/api/projects.test.ts index 25a9a1df80..1186dee476 100644 --- a/packages/cli/test/lib/api/projects.test.ts +++ b/packages/cli/test/lib/api/projects.test.ts @@ -112,25 +112,10 @@ function spyCaptureException(): { restore: () => void; } { const captureSpy = vi.spyOn(Sentry, "captureException"); - const withScopeSpy = vi.spyOn(Sentry, "withScope"); - withScopeSpy.mockImplementation((fn: (scope: unknown) => void) => { - fn({ - setTag() { - /* noop */ - }, - setContext() { - /* noop */ - }, - setFingerprint() { - /* noop */ - }, - }); - }); return { captureSpy, restore() { captureSpy.mockRestore(); - withScopeSpy.mockRestore(); }, }; } diff --git a/packages/cli/test/lib/api/releases.test.ts b/packages/cli/test/lib/api/releases.test.ts index a3846e7946..16764667c4 100644 --- a/packages/cli/test/lib/api/releases.test.ts +++ b/packages/cli/test/lib/api/releases.test.ts @@ -68,7 +68,7 @@ import { ValidationError, } from "../../../src/lib/errors.js"; import type { SentryDeploy, SentryRelease } from "../../../src/types/index.js"; -import { mockFetch, useTestConfigDir } from "../../helpers.js"; +import { mockFetch, useTestConfigDir, at } from "../../helpers.js"; useTestConfigDir("api-releases-"); @@ -420,8 +420,8 @@ describe("listReleaseDeploys", () => { const deploys = await listReleaseDeploys("test-org", "1.0.0"); expect(deploys).toHaveLength(1); - expect(deploys[0].environment).toBe("production"); - expect(deploys[0].id).toBe("42"); + expect(at(deploys, 0).environment).toBe("production"); + expect(at(deploys, 0).id).toBe("42"); }); }); @@ -1430,7 +1430,7 @@ describe("setCommitsLocal", () => { commits: Array<{ id: string; message: string }>; }; expect(body.commits).toHaveLength(1); - expect(body.commits[0].id).toBe("abc123"); + expect(at(body.commits, 0).id).toBe("abc123"); return new Response(JSON.stringify(withCommits), { status: 200, headers: { "Content-Type": "application/json" }, @@ -1472,7 +1472,7 @@ describe("listReleasesPaginated", () => { const result = await listReleasesPaginated("test-org", { perPage: 25 }); expect(result.data).toHaveLength(1); - expect(result.data[0].version).toBe("1.0.0"); + expect(at(result.data, 0).version).toBe("1.0.0"); expect(result.nextCursor).toBe("abc:0:0"); }); diff --git a/packages/cli/test/lib/api/replays.test.ts b/packages/cli/test/lib/api/replays.test.ts index 9855e8b02d..29828db75c 100644 --- a/packages/cli/test/lib/api/replays.test.ts +++ b/packages/cli/test/lib/api/replays.test.ts @@ -15,7 +15,7 @@ import { DEFAULT_SENTRY_URL } from "../../../src/lib/constants.js"; import { setAuthToken } from "../../../src/lib/db/auth.js"; import { setOrgRegion } from "../../../src/lib/db/regions.js"; import { ApiError } from "../../../src/lib/errors.js"; -import { mockFetch, useTestConfigDir } from "../../helpers.js"; +import { mockFetch, useTestConfigDir, at } from "../../helpers.js"; useTestConfigDir("replays-api-test-"); @@ -41,7 +41,8 @@ function recordingSegmentsResponse( }; if (nextCursor) { - headers.Link = `; rel="next"; results="true"; cursor="${nextCursor}"`; + headers["Link"] = + `; rel="next"; results="true"; cursor="${nextCursor}"`; } return new Response(JSON.stringify(body), { @@ -311,7 +312,7 @@ describe("resolveReplay", () => { expect(replay.id).toBe(REPLAY_ID); expect(capturedUrls).toHaveLength(3); - const listUrl = new URL(capturedUrls[1]); + const listUrl = new URL(at(capturedUrls, 1)); expect(listUrl.pathname).toContain( "/api/0/organizations/test-org/replays/", ); @@ -346,7 +347,7 @@ describe("resolveReplay", () => { detail: "Replay not found", }); - const listUrl = new URL(capturedUrls[1]); + const listUrl = new URL(at(capturedUrls, 1)); expect(listUrl.searchParams.get("query")).toBe(`trace:${TRACE_ID}`); expect(listUrl.searchParams.get("project")).toBe("-1"); expect(listUrl.searchParams.get("projectSlug")).toBeNull(); @@ -445,11 +446,11 @@ describe("getReplayRecordingSegments", () => { expect(segments).toHaveLength(101); expect(capturedUrls).toHaveLength(2); - const firstUrl = new URL(capturedUrls[0]); + const firstUrl = new URL(at(capturedUrls, 0)); expect(firstUrl.searchParams.get("per_page")).toBe("100"); expect(firstUrl.searchParams.get("cursor")).toBeNull(); - const secondUrl = new URL(capturedUrls[1]); + const secondUrl = new URL(at(capturedUrls, 1)); expect(secondUrl.searchParams.get("cursor")).toBe("0:100:0"); expect(secondUrl.searchParams.get("per_page")).toBe("100"); }); diff --git a/packages/cli/test/lib/api/repositories.test.ts b/packages/cli/test/lib/api/repositories.test.ts index 7fa6688f0e..5affe6ec91 100644 --- a/packages/cli/test/lib/api/repositories.test.ts +++ b/packages/cli/test/lib/api/repositories.test.ts @@ -7,7 +7,15 @@ * lore on cache-write resilience). */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { listRepositoriesCached } from "../../../src/lib/api/repositories.js"; import { setAuthToken } from "../../../src/lib/db/auth.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -35,8 +43,8 @@ function repoApiResponse(repos: { name: string }[]): Response { describe("listRepositoriesCached", () => { useTestConfigDir("repo-cache-"); let originalFetch: typeof globalThis.fetch; - let getSpy: ReturnType; - let setSpy: ReturnType; + let getSpy: MockInstance<(typeof repoCache)["getCachedRepos"]>; + let setSpy: MockInstance<(typeof repoCache)["setCachedRepos"]>; beforeEach(() => { setAuthToken("test-token", 3600, "test-refresh"); diff --git a/packages/cli/test/lib/api/traces.test.ts b/packages/cli/test/lib/api/traces.test.ts index d550e1d962..1b7b0d06a2 100644 --- a/packages/cli/test/lib/api/traces.test.ts +++ b/packages/cli/test/lib/api/traces.test.ts @@ -15,7 +15,7 @@ import { listSpans, listTransactions, } from "../../../src/lib/api/traces.js"; -import { mockFetch, useTestConfigDir } from "../../helpers.js"; +import { mockFetch, useTestConfigDir, at } from "../../helpers.js"; // --------------------------------------------------------------------------- // listTransactions @@ -64,7 +64,7 @@ describe("listTransactions", () => { const req = new Request(input, init); capturedUrls.push(req.url); - const resp = responses[callIndex]; + const resp = at(responses, callIndex); callIndex += 1; return new Response(JSON.stringify(resp.body), { @@ -325,7 +325,7 @@ describe("listSpans", () => { const req = new Request(input, init); capturedUrls.push(req.url); - const resp = responses[callIndex]; + const resp = at(responses, callIndex); callIndex += 1; return new Response(JSON.stringify(resp.body), { @@ -621,8 +621,8 @@ describe("getSpanDetails", () => { expect(capturedUrl).toContain( "/projects/my-org/my-project/trace-items/span-id-abc/", ); - expect(capturedParams.item_type).toBe("spans"); - expect(capturedParams.trace_id).toBe("trace-id-xyz"); + expect(capturedParams["item_type"]).toBe("spans"); + expect(capturedParams["trace_id"]).toBe("trace-id-xyz"); }); test("returns parsed attributes", async () => { @@ -801,9 +801,9 @@ describe("getDetailedTrace", () => { }); expect(result).toHaveLength(1); - expect(result[0].span_id).toBe("span-1"); + expect(at(result, 0).span_id).toBe("span-1"); expect(getCapturedUrls()).toHaveLength(1); - const url = new URL(getCapturedUrls()[0]); + const url = new URL(at(getCapturedUrls(), 0)); expect(url.searchParams.get("timestamp")).toBe("1700000000"); expect(url.searchParams.get("statsPeriod")).toBeNull(); expect(url.searchParams.has("limit")).toBe(false); @@ -817,7 +817,7 @@ describe("getDetailedTrace", () => { expect(result).toHaveLength(1); expect(getCapturedUrls()).toHaveLength(1); - const url = new URL(getCapturedUrls()[0]); + const url = new URL(at(getCapturedUrls(), 0)); expect(url.searchParams.get("statsPeriod")).toBe("14d"); expect(url.searchParams.get("timestamp")).toBeNull(); }); @@ -828,19 +828,19 @@ describe("getDetailedTrace", () => { const result = await getDetailedTrace("my-org", "abc123def456"); expect(result).toHaveLength(1); - expect(result[0].span_id).toBe("span-1"); + expect(at(result, 0).span_id).toBe("span-1"); expect(getCapturedUrls()).toHaveLength(2); - expect(new URL(getCapturedUrls()[0]).searchParams.get("statsPeriod")).toBe( - "14d", - ); - expect(new URL(getCapturedUrls()[1]).searchParams.get("statsPeriod")).toBe( - "90d", - ); expect( - new URL(getCapturedUrls()[0]).searchParams.get("timestamp"), + new URL(at(getCapturedUrls(), 0)).searchParams.get("statsPeriod"), + ).toBe("14d"); + expect( + new URL(at(getCapturedUrls(), 1)).searchParams.get("statsPeriod"), + ).toBe("90d"); + expect( + new URL(at(getCapturedUrls(), 0)).searchParams.get("timestamp"), ).toBeNull(); expect( - new URL(getCapturedUrls()[1]).searchParams.get("timestamp"), + new URL(at(getCapturedUrls(), 1)).searchParams.get("timestamp"), ).toBeNull(); }); @@ -853,11 +853,11 @@ describe("getDetailedTrace", () => { expect(result).toHaveLength(0); expect(getCapturedUrls()).toHaveLength(1); - expect(new URL(getCapturedUrls()[0]).searchParams.get("timestamp")).toBe( - "1700000000", - ); expect( - new URL(getCapturedUrls()[0]).searchParams.get("statsPeriod"), + new URL(at(getCapturedUrls(), 0)).searchParams.get("timestamp"), + ).toBe("1700000000"); + expect( + new URL(at(getCapturedUrls(), 0)).searchParams.get("statsPeriod"), ).toBeNull(); }); diff --git a/packages/cli/test/lib/app-identity.test.ts b/packages/cli/test/lib/app-identity.test.ts index ec42c6c5b2..aeb1a9d4e9 100644 --- a/packages/cli/test/lib/app-identity.test.ts +++ b/packages/cli/test/lib/app-identity.test.ts @@ -39,10 +39,10 @@ describe("app identity", () => { test("hints go through npx when npx launched the process", () => { setAppIdentity({ name: "sentry-mcp", packageName: "@sentry/mcp-server" }); - process.env.npm_command = "exec"; + process.env["npm_command"] = "exec"; expect(getLoginCommand()).toBe("npx -y @sentry/mcp-server auth login"); - delete process.env.npm_command; + delete process.env["npm_command"]; process.argv[1] = "/home/u/.npm/_npx/abc/node_modules/.bin/sentry-mcp"; expect(getLoginCommand()).toBe("npx -y @sentry/mcp-server auth login"); }); @@ -54,7 +54,7 @@ describe("app identity", () => { setAppIdentity({ name: "sentry-mcp", packageName: "@sentry/mcp-server" }); expect(sentry`issue list ${org}/`).toBe("sentry-mcp issue list acme/"); - process.env.npm_command = "exec"; + process.env["npm_command"] = "exec"; expect(sentry`issue list ${org}/`).toBe( "npx -y @sentry/mcp-server issue list acme/", ); @@ -81,14 +81,14 @@ describe("app identity", () => { setAppIdentity({ name: "sentry-mcp", packageName: "@sentry/mcp-server" }); expect(usageHint()).toBe("sentry-mcp org list"); - process.env.npm_command = "exec"; + process.env["npm_command"] = "exec"; const context = new ContextError("Organization", usageHint()); expect(context.command).toBe("npx -y @sentry/mcp-server org list"); expect(context.message).toContain("npx -y @sentry/mcp-server org list"); }); test("error usage lines are shown as given", () => { - process.env.npm_command = "exec"; + process.env["npm_command"] = "exec"; const resolution = new ResolutionError( "Project 'web'", "not found", diff --git a/packages/cli/test/lib/arg-parsing.test.ts b/packages/cli/test/lib/arg-parsing.test.ts index 64c0464272..eed35f6ad3 100644 --- a/packages/cli/test/lib/arg-parsing.test.ts +++ b/packages/cli/test/lib/arg-parsing.test.ts @@ -172,10 +172,10 @@ describe("parseOrgProjectArg", () => { let savedSentryHost: string | undefined; beforeEach(async () => { - savedSentryUrl = process.env.SENTRY_URL; - savedSentryHost = process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; - delete process.env.SENTRY_HOST; + savedSentryUrl = process.env["SENTRY_URL"]; + savedSentryHost = process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; + delete process.env["SENTRY_HOST"]; const { resetEnvTokenHostForTesting } = await import("../../src/lib/env-token-host.js"); resetEnvTokenHostForTesting(); @@ -183,14 +183,14 @@ describe("parseOrgProjectArg", () => { afterEach(async () => { if (savedSentryUrl !== undefined) { - process.env.SENTRY_URL = savedSentryUrl; + process.env["SENTRY_URL"] = savedSentryUrl; } else { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; } if (savedSentryHost !== undefined) { - process.env.SENTRY_HOST = savedSentryHost; + process.env["SENTRY_HOST"] = savedSentryHost; } else { - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_HOST"]; } const { resetEnvTokenHostForTesting } = await import("../../src/lib/env-token-host.js"); @@ -231,7 +231,8 @@ describe("parseOrgProjectArg", () => { test("self-hosted URL extracts org when token is scoped to that host", () => { // Pin env-token to sentry.example.com so the URL-arg's host matches. - process.env.SENTRY_HOST = "https://sentry.example.com"; + // Pin env-token to sentry.example.com so the URL-arg's host matches. + process.env["SENTRY_HOST"] = "https://sentry.example.com"; expect( parseOrgProjectArg( "https://sentry.example.com/organizations/acme-corp/issues/99/", @@ -559,22 +560,22 @@ describe("parseIssueArg", () => { let savedSentryHost: string | undefined; beforeEach(() => { - savedSentryUrl = process.env.SENTRY_URL; - savedSentryHost = process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; - delete process.env.SENTRY_HOST; + savedSentryUrl = process.env["SENTRY_URL"]; + savedSentryHost = process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; + delete process.env["SENTRY_HOST"]; }); afterEach(() => { if (savedSentryUrl !== undefined) { - process.env.SENTRY_URL = savedSentryUrl; + process.env["SENTRY_URL"] = savedSentryUrl; } else { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; } if (savedSentryHost !== undefined) { - process.env.SENTRY_HOST = savedSentryHost; + process.env["SENTRY_HOST"] = savedSentryHost; } else { - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_HOST"]; } }); @@ -613,7 +614,7 @@ describe("parseIssueArg", () => { }); test("self-hosted issue URL with query params (requires matching token host)", () => { - process.env.SENTRY_HOST = "https://sentry.example.com"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; expect( parseIssueArg( "https://sentry.example.com/organizations/acme/issues/32886/?project=2", @@ -695,7 +696,7 @@ describe("parseIssueArg", () => { }); test("self-hosted share URL returns share type (requires matching token host)", () => { - process.env.SENTRY_HOST = "https://sentry.example.com"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; expect( parseIssueArg( "https://sentry.example.com/share/issue/aabbccdd11223344aabbccdd11223344/", diff --git a/packages/cli/test/lib/argument-conventions.test.ts b/packages/cli/test/lib/argument-conventions.test.ts index 7b51cded12..b53b646377 100644 --- a/packages/cli/test/lib/argument-conventions.test.ts +++ b/packages/cli/test/lib/argument-conventions.test.ts @@ -486,7 +486,10 @@ describe.each(ID_COMMANDS)("$name", (entry) => { }); /** Commands that take one issue, through `issuePositional` or alike. */ -const ISSUE_COMMANDS: readonly (readonly [string, unknown])[] = [ +const ISSUE_COMMANDS: readonly [ + readonly [string, unknown], + ...(readonly [string, unknown])[], +] = [ ["issue resolve", issueResolveCommand], ["issue unresolve", issueUnresolveCommand], ["issue archive", archiveCommand], @@ -682,7 +685,7 @@ function parseDashboard( return { ...input, // Warnings name the command's own usage - warnings: (input.warnings as readonly string[]).map((warning) => + warnings: (input["warnings"] as readonly string[]).map((warning) => warning.replace(/ Expected: .*$/s, ""), ), }; diff --git a/packages/cli/test/lib/auth-hint.test.ts b/packages/cli/test/lib/auth-hint.test.ts index 6ac4391e9c..ad71718178 100644 --- a/packages/cli/test/lib/auth-hint.test.ts +++ b/packages/cli/test/lib/auth-hint.test.ts @@ -34,31 +34,31 @@ let savedSentryToken: string | undefined; let savedForceEnv: string | undefined; beforeEach(() => { - savedAuthToken = process.env.SENTRY_AUTH_TOKEN; - savedSentryToken = process.env.SENTRY_TOKEN; - savedForceEnv = process.env.SENTRY_FORCE_ENV_TOKEN; - delete process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_TOKEN; - delete process.env.SENTRY_FORCE_ENV_TOKEN; + savedAuthToken = process.env["SENTRY_AUTH_TOKEN"]; + savedSentryToken = process.env["SENTRY_TOKEN"]; + savedForceEnv = process.env["SENTRY_FORCE_ENV_TOKEN"]; + delete process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_TOKEN"]; + delete process.env["SENTRY_FORCE_ENV_TOKEN"]; clearSentryCliRcCache(); resetAuthHintState(); }); afterEach(() => { if (savedAuthToken !== undefined) { - process.env.SENTRY_AUTH_TOKEN = savedAuthToken; + process.env["SENTRY_AUTH_TOKEN"] = savedAuthToken; } else { - delete process.env.SENTRY_AUTH_TOKEN; + delete process.env["SENTRY_AUTH_TOKEN"]; } if (savedSentryToken !== undefined) { - process.env.SENTRY_TOKEN = savedSentryToken; + process.env["SENTRY_TOKEN"] = savedSentryToken; } else { - delete process.env.SENTRY_TOKEN; + delete process.env["SENTRY_TOKEN"]; } if (savedForceEnv !== undefined) { - process.env.SENTRY_FORCE_ENV_TOKEN = savedForceEnv; + process.env["SENTRY_FORCE_ENV_TOKEN"] = savedForceEnv; } else { - delete process.env.SENTRY_FORCE_ENV_TOKEN; + delete process.env["SENTRY_FORCE_ENV_TOKEN"]; } clearSentryCliRcCache(); }); @@ -101,7 +101,7 @@ describe("maybeWarnEnvTokenIgnored", () => { }); test("does nothing when no stored OAuth login exists", () => { - process.env.SENTRY_AUTH_TOKEN = "env_token"; + process.env["SENTRY_AUTH_TOKEN"] = "env_token"; const cap = captureStderr(); try { maybeWarnEnvTokenIgnored(); @@ -113,8 +113,8 @@ describe("maybeWarnEnvTokenIgnored", () => { test("does nothing when SENTRY_FORCE_ENV_TOKEN is set", () => { setAuthToken("stored_oauth", 3600, "refresh_a"); - process.env.SENTRY_AUTH_TOKEN = "env_token"; - process.env.SENTRY_FORCE_ENV_TOKEN = "1"; + process.env["SENTRY_AUTH_TOKEN"] = "env_token"; + process.env["SENTRY_FORCE_ENV_TOKEN"] = "1"; const cap = captureStderr(); try { maybeWarnEnvTokenIgnored(); @@ -131,7 +131,7 @@ describe("maybeWarnEnvTokenIgnored", () => { username: "alice", email: "alice@example.com", }); - process.env.SENTRY_AUTH_TOKEN = "env_token"; + process.env["SENTRY_AUTH_TOKEN"] = "env_token"; const cap = captureStderr(); try { @@ -171,7 +171,7 @@ describe("maybeWarnEnvTokenIgnored", () => { test("is silent on repeat calls within the same process", () => { setAuthToken("stored_oauth", 3600, "refresh_a"); - process.env.SENTRY_AUTH_TOKEN = "env_token"; + process.env["SENTRY_AUTH_TOKEN"] = "env_token"; const cap = captureStderr(); try { @@ -186,7 +186,7 @@ describe("maybeWarnEnvTokenIgnored", () => { test("uses SENTRY_TOKEN when only that legacy var is set", () => { setAuthToken("stored_oauth", 3600, "refresh_a"); - process.env.SENTRY_TOKEN = "legacy_token"; + process.env["SENTRY_TOKEN"] = "legacy_token"; const cap = captureStderr(); try { @@ -204,7 +204,7 @@ describe("maybeWarnEnvTokenIgnored", () => { userId: "u-1", email: "alice@example.com", }); - process.env.SENTRY_AUTH_TOKEN = "env_token"; + process.env["SENTRY_AUTH_TOKEN"] = "env_token"; const cap = captureStderr(); try { @@ -218,7 +218,7 @@ describe("maybeWarnEnvTokenIgnored", () => { test("falls back to name when username and email are unavailable", () => { setAuthToken("stored_oauth", 3600, "refresh_a"); setUserInfo({ userId: "u-1", name: "Alice Wonderland" }); - process.env.SENTRY_AUTH_TOKEN = "env_token"; + process.env["SENTRY_AUTH_TOKEN"] = "env_token"; const cap = captureStderr(); try { @@ -232,7 +232,8 @@ describe("maybeWarnEnvTokenIgnored", () => { test("uses a neutral label when no user info is cached", () => { setAuthToken("stored_oauth", 3600, "refresh_a"); // No setUserInfo — user_info table is empty. - process.env.SENTRY_AUTH_TOKEN = "env_token"; + // No setUserInfo — user_info table is empty. + process.env["SENTRY_AUTH_TOKEN"] = "env_token"; const cap = captureStderr(); try { diff --git a/packages/cli/test/lib/auto-auth.test.ts b/packages/cli/test/lib/auto-auth.test.ts index 4719330f59..2560d47332 100644 --- a/packages/cli/test/lib/auto-auth.test.ts +++ b/packages/cli/test/lib/auto-auth.test.ts @@ -78,18 +78,18 @@ describe("assertAutoLoginHostTrusted", () => { }); test("throws for an unconfirmed self-hosted host", () => { - process.env.SENTRY_HOST = "https://sentry.example.com"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; expect(() => assertAutoLoginHostTrusted()).toThrow(HostScopeError); }); test("passes for a self-hosted host confirmed via default URL", () => { - process.env.SENTRY_HOST = "https://sentry.example.com"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; setDefaultUrl("https://sentry.example.com"); expect(() => assertAutoLoginHostTrusted()).not.toThrow(); }); test("passes for a self-hosted host with a process trust anchor", () => { - process.env.SENTRY_HOST = "https://sentry.example.com"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; registerLoginTrustAnchor("https://sentry.example.com"); expect(() => assertAutoLoginHostTrusted()).not.toThrow(); }); @@ -135,7 +135,7 @@ describe("recoverWithAutoLogin", () => { }); test("refuses an unconfirmed self-hosted host (the #1121 gate)", async () => { - process.env.SENTRY_HOST = "https://sentry.example.com"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; const runInteractiveLogin = vi.fn(); const writes: string[] = []; @@ -206,7 +206,7 @@ describe("recoverWithAutoLogin", () => { }); test("self-hosted host confirmed via persisted default URL proceeds", async () => { - process.env.SENTRY_HOST = "https://sentry.example.com"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; setDefaultUrl("https://sentry.example.com"); const runInteractiveLogin = vi.fn().mockResolvedValue(true); const retry = vi.fn().mockResolvedValue(undefined); diff --git a/packages/cli/test/lib/auto-paginate.property.test.ts b/packages/cli/test/lib/auto-paginate.property.test.ts index c5e4995f36..89d14a5048 100644 --- a/packages/cli/test/lib/auto-paginate.property.test.ts +++ b/packages/cli/test/lib/auto-paginate.property.test.ts @@ -41,7 +41,10 @@ function makePagedFetcher(total: number, pageSize: number) { ); const nextOffset = offset + data.length; const nextCursor = nextOffset < total ? String(nextOffset) : undefined; - return Promise.resolve({ data, nextCursor }); + return Promise.resolve({ + data, + ...(nextCursor !== undefined && { nextCursor }), + }); }; } diff --git a/packages/cli/test/lib/bench/generate.test.ts b/packages/cli/test/lib/bench/generate.test.ts index 3d002a2aaa..7ab2ff2ede 100644 --- a/packages/cli/test/lib/bench/generate.test.ts +++ b/packages/cli/test/lib/bench/generate.test.ts @@ -143,8 +143,8 @@ describe("generateFixture", () => { describe("hashSpec", () => { test("is stable regardless of extension ordering", () => { const base = PRESETS.small; - const a = hashSpec({ ...base, fileExtensions: [".ts", ".js"] }); - const b = hashSpec({ ...base, fileExtensions: [".js", ".ts"] }); + const a = hashSpec({ ...base, seed: 1, fileExtensions: [".ts", ".js"] }); + const b = hashSpec({ ...base, seed: 1, fileExtensions: [".js", ".ts"] }); expect(a).toBe(b); }); }); diff --git a/packages/cli/test/lib/bench/helpers.test.ts b/packages/cli/test/lib/bench/helpers.test.ts index 53fe9fbe82..15139898d4 100644 --- a/packages/cli/test/lib/bench/helpers.test.ts +++ b/packages/cli/test/lib/bench/helpers.test.ts @@ -14,6 +14,7 @@ import { measure, summarize, } from "../../fixtures/bench/helpers.js"; +import { at } from "../../helpers.js"; describe("summarize", () => { test("computes p50 and p95 via nearest-rank on sorted samples", () => { @@ -171,10 +172,10 @@ describe("compareReports", () => { ...baseline, entries: [ { - ...baseline.entries[0], - stats: { ...baseline.entries[0].stats, p50: 15 }, + ...at(baseline.entries, 0), + stats: { ...at(baseline.entries, 0).stats, p50: 15 }, }, - baseline.entries[1], + at(baseline.entries, 1), ], }; const rows = compareReports(baseline, current, 0.2); @@ -189,10 +190,10 @@ describe("compareReports", () => { ...baseline, entries: [ { - ...baseline.entries[0], - stats: { ...baseline.entries[0].stats, p50: 7 }, + ...at(baseline.entries, 0), + stats: { ...at(baseline.entries, 0).stats, p50: 7 }, }, - baseline.entries[1], + at(baseline.entries, 1), ], }; const rows = compareReports(baseline, current, 0.2); @@ -203,7 +204,7 @@ describe("compareReports", () => { test("reports missing current entry when op disappears", () => { const current: BenchReport = { ...baseline, - entries: [baseline.entries[1]], + entries: [at(baseline.entries, 1)], }; const rows = compareReports(baseline, current, 0.2); const cold = rows.find((r) => r.operation === "detectDsn.cold"); diff --git a/packages/cli/test/lib/binary.test.ts b/packages/cli/test/lib/binary.test.ts index 7504f515ff..3cfb4e35de 100644 --- a/packages/cli/test/lib/binary.test.ts +++ b/packages/cli/test/lib/binary.test.ts @@ -464,6 +464,7 @@ describe("fetchWithUpgradeError", () => { signal: controller.signal, fetch: async () => { controller.abort(reason); + // oxlint-disable-next-line typescript/only-throw-error -- the test rethrows the abort reason unchanged throw reason; }, }); @@ -489,6 +490,7 @@ describe("fetchWithUpgradeError", () => { test("wraps non-Error thrown values as UpgradeError", async () => { globalThis.fetch = async () => { // intentionally testing non-Error throw + // oxlint-disable-next-line typescript/only-throw-error -- the test covers non-Error thrown values throw { code: "ECONNRESET", reason: "connection reset" }; }; diff --git a/packages/cli/test/lib/bootstrap-auth.test.ts b/packages/cli/test/lib/bootstrap-auth.test.ts index 538a84ddba..518c8087dc 100644 --- a/packages/cli/test/lib/bootstrap-auth.test.ts +++ b/packages/cli/test/lib/bootstrap-auth.test.ts @@ -9,7 +9,7 @@ import { } from "../../src/lib/env-token-host.js"; import { bootstrapAuthentication } from "../../src/lib/setup-code.js"; import { resetLoginTrustAnchorForTesting } from "../../src/lib/token-host.js"; -import { useEnvSandbox, useTestConfigDir } from "../helpers.js"; +import { useEnvSandbox, useTestConfigDir, at } from "../helpers.js"; useTestConfigDir("bootstrap-"); useEnvSandbox([ @@ -122,7 +122,7 @@ test("uses explicit proxy headers for a new server while preserving the old logi await expect( bootstrapAuthentication({ force: true, url: host }), ).rejects.toThrow(/Setup-code/); - expect(fetch.mock.calls[0][1].headers.get("X-IAP-Token")).toBe( + expect(at(fetch.mock.calls, 0)[1].headers.get("X-IAP-Token")).toBe( "proxy-secret", ); expect(getAuthConfig()?.token).toBe("old-server-token"); @@ -189,12 +189,12 @@ test.each([ ); vi.stubGlobal("fetch", fetch); - await expect(bootstrapAuthentication({ url })).rejects.toThrow( - /Setup-code/, - ); + await expect( + bootstrapAuthentication(url === undefined ? {} : { url }), + ).rejects.toThrow(/Setup-code/); expect(fetch).toHaveBeenCalledOnce(); - expect(fetch.mock.calls[0][1].headers.get("X-IAP-Token")).toBe( + expect(at(fetch.mock.calls, 0)[1].headers.get("X-IAP-Token")).toBe( trusted ? "proxy-secret" : null, ); }, diff --git a/packages/cli/test/lib/bspatch.property.test.ts b/packages/cli/test/lib/bspatch.property.test.ts index 9e6bfb3a54..ec67dabc7f 100644 --- a/packages/cli/test/lib/bspatch.property.test.ts +++ b/packages/cli/test/lib/bspatch.property.test.ts @@ -9,6 +9,7 @@ import { offtin, parsePatchHeader } from "binpatch"; import { assert as fcAssert, integer, property, uint8Array } from "fast-check"; import { describe, expect, test } from "vitest"; import { DEFAULT_NUM_RUNS } from "../model-based/helpers.js"; +import { at } from "../helpers.js"; describe("property: offtin", () => { test("magnitude is always non-negative", () => { @@ -33,12 +34,12 @@ describe("property: offtin", () => { property(uint8Array({ minLength: 8, maxLength: 8 }), (buf) => { // Clear sign bit and read const cleared = new Uint8Array(buf); - cleared[7] %= 128; // Clear bit 7 + cleared[7] = at(cleared, 7) % 128; // Clear bit 7 const positive = offtin(cleared, 0); // Set sign bit and read const negated = new Uint8Array(buf); - negated[7] = (negated[7] % 128) + 128; // Set bit 7 (can't use %= here) + negated[7] = (at(negated, 7) % 128) + 128; // Set bit 7 (can't use %= here) const negative = offtin(negated, 0); // Magnitude should be the same @@ -67,7 +68,7 @@ describe("property: offtin", () => { expect(result).toBe(magnitude); // Now test negative - buf[7] += 128; // Set sign bit + buf[7] = at(buf, 7) + 128; // Set sign bit const negResult = offtin(buf, 0); if (magnitude === 0) { expect(negResult).toBe(0); // -0 === 0 @@ -112,9 +113,9 @@ describe("property: parsePatchHeader", () => { const patched = new Uint8Array(buf); patched.set(new TextEncoder().encode("TRDIFF10"), 0); // Clear sign bits in header fields - patched[15] %= 128; // controlLen sign - patched[23] %= 128; // diffLen sign - patched[31] %= 128; // newSize sign + patched[15] = at(patched, 15) % 128; // controlLen sign + patched[23] = at(patched, 23) % 128; // diffLen sign + patched[31] = at(patched, 31) % 128; // newSize sign try { const header = parsePatchHeader(patched); diff --git a/packages/cli/test/lib/build/car-extract.integration.test.ts b/packages/cli/test/lib/build/car-extract.integration.test.ts index 72bbe7b193..0c31d46fd8 100644 --- a/packages/cli/test/lib/build/car-extract.integration.test.ts +++ b/packages/cli/test/lib/build/car-extract.integration.test.ts @@ -250,11 +250,11 @@ describe.skipIf(process.platform !== "darwin" || process.arch !== "arm64")( }, 30_000); test - .runIf(Boolean(process.env.SENTRY_CAR_TEST_BINARY)) + .runIf(Boolean(process.env["SENTRY_CAR_TEST_BINARY"])) .each(CATALOG_IDIOMS)( "uploads %s images through the helper embedded in the standalone binary", async (idiom) => { - const binary = process.env.SENTRY_CAR_TEST_BINARY; + const binary = process.env["SENTRY_CAR_TEST_BINARY"]; if (!binary) { throw new Error("Missing native test binary"); } @@ -270,6 +270,7 @@ describe.skipIf(process.platform !== "darwin" || process.arch !== "arm64")( const uploaded: Uint8Array[] = []; const unexpected: string[] = []; const fixtureState = { origin: "", errors: 0 }; + // oxlint-disable-next-line typescript/no-misused-promises -- node:http ignores the handler's promise; the handler catches its own errors const server = createServer(async (request, response) => { response.setHeader("Content-Type", "application/json"); response.setHeader("Connection", "close"); @@ -370,7 +371,7 @@ describe.skipIf(process.platform !== "darwin" || process.arch !== "arm64")( { timeout: 120_000, env: { - PATH: process.env.PATH, + PATH: process.env["PATH"], HOME: home, XDG_CONFIG_HOME: join(home, "config"), SENTRY_CONFIG_DIR: join(home, "sentry"), diff --git a/packages/cli/test/lib/build/dsyms.test.ts b/packages/cli/test/lib/build/dsyms.test.ts index 815fc02750..266acbe389 100644 --- a/packages/cli/test/lib/build/dsyms.test.ts +++ b/packages/cli/test/lib/build/dsyms.test.ts @@ -12,6 +12,7 @@ import { strToU8, zipSync } from "fflate"; import { afterEach, beforeEach, describe, expect, test } from "vitest"; import { collectDsymEntries } from "../../../src/lib/build/dsyms.js"; import { ValidationError } from "../../../src/lib/errors.js"; +import { at } from "../../helpers.js"; const SYMBOL_PATH = "Contents/Resources/DWARF/MyApp"; const ZIP_SYMBOL_PATH = `MyApp.app.dSYM/${SYMBOL_PATH}`; @@ -60,7 +61,7 @@ describe("collectDsymEntries", () => { test("collects a direct bundle's files for streaming", async () => { const entries = await collect([await bundle()]); expect(entries.map((entry) => entry.relPath)).toEqual([ZIP_SYMBOL_PATH]); - expect(await readFile(entries[0].sourcePath, "utf8")).toBe("symbols"); + expect(await readFile(at(entries, 0).sourcePath, "utf8")).toBe("symbols"); }); test("recognizes a direct bundle with trailing slashes", async () => { @@ -96,7 +97,9 @@ describe("collectDsymEntries", () => { ); const entries = await collect([path]); expect(entries.map((entry) => entry.relPath)).toEqual([ZIP_SYMBOL_PATH]); - expect(await readFile(entries[0].sourcePath, "utf8")).toBe("zip symbols"); + expect(await readFile(at(entries, 0).sourcePath, "utf8")).toBe( + "zip symbols", + ); }, ); @@ -143,7 +146,7 @@ describe("collectDsymEntries", () => { zipSync({ [ZIP_SYMBOL_PATH]: symbols }, { level }), ); const entries = await collect([path]); - expect(await readFile(entries[0].sourcePath)).toEqual( + expect(await readFile(at(entries, 0).sourcePath)).toEqual( Buffer.from(symbols), ); }, diff --git a/packages/cli/test/lib/build/zip-writer.mocked.test.ts b/packages/cli/test/lib/build/zip-writer.mocked.test.ts index 5026fea52a..767beaee5e 100644 --- a/packages/cli/test/lib/build/zip-writer.mocked.test.ts +++ b/packages/cli/test/lib/build/zip-writer.mocked.test.ts @@ -17,6 +17,7 @@ vi.mock("node:zlib", async (importOriginal) => { // Import after the mock so crc32.ts selects its portable implementation. import { DeterministicZipWriter } from "../../../src/lib/build/zip-writer.js"; +import { must } from "../../helpers.js"; test("writes valid CRCs when zlib.crc32 is unavailable", async () => { const tmpDir = await mkdtemp(join(tmpdir(), "zip-writer-no-crc32-")); @@ -31,10 +32,10 @@ test("writes valid CRCs when zlib.crc32 is unavailable", async () => { await zip.finalize(); const entries = unzipSync(await readFile(outputPath)); - expect(Buffer.from(entries["memory.txt"])).toEqual( + expect(Buffer.from(must(entries["memory.txt"]))).toEqual( Buffer.from("in-memory contents"), ); - expect(Buffer.from(entries["streamed.txt"])).toEqual( + expect(Buffer.from(must(entries["streamed.txt"]))).toEqual( Buffer.from("streamed contents"), ); } finally { diff --git a/packages/cli/test/lib/build/zip-writer.test.ts b/packages/cli/test/lib/build/zip-writer.test.ts index 2a364b16ec..bccaff7722 100644 --- a/packages/cli/test/lib/build/zip-writer.test.ts +++ b/packages/cli/test/lib/build/zip-writer.test.ts @@ -19,6 +19,7 @@ import { DeterministicZipWriter, FIXED_MTIME, } from "../../../src/lib/build/zip-writer.js"; +import { must } from "../../helpers.js"; type Entry = { name: string; @@ -59,8 +60,8 @@ function referenceZip(entries: Entry[]): Buffer { async function writeWithData(entries: Entry[]): Promise { const out = join(makeTmpDir(), "out.zip"); const zip = await DeterministicZipWriter.create(out); - for (const e of entries) { - await zip.addData(e.name, e.data, { os: e.os, attrs: e.attrs }); + for (const { name, data, ...options } of entries) { + await zip.addData(name, data, options); } await zip.finalize(); return readFileSync(out); @@ -72,10 +73,10 @@ async function writeWithFiles(entries: Entry[]): Promise { const out = join(dir, "out.zip"); const zip = await DeterministicZipWriter.create(out); let i = 0; - for (const e of entries) { + for (const { name, data, ...options } of entries) { const src = join(dir, `src-${i++}`); - writeFileSync(src, Buffer.from(e.data)); - await zip.addFile(e.name, src, { os: e.os, attrs: e.attrs }); + writeFileSync(src, Buffer.from(data)); + await zip.addFile(name, src, options); } await zip.finalize(); return readFileSync(out); @@ -166,7 +167,7 @@ describe("DeterministicZipWriter round-trips", () => { // Both entry paths must agree and extract to the original bytes. expect(fileZip.equals(dataZip)).toBe(true); expect( - Buffer.from(unzipSync(fileZip)["big.bin"]).equals(Buffer.from(big)), + Buffer.from(must(unzipSync(fileZip)["big.bin"])).equals(Buffer.from(big)), ).toBe(true); }); }); diff --git a/packages/cli/test/lib/bytes.test.ts b/packages/cli/test/lib/bytes.test.ts new file mode 100644 index 0000000000..ad6ea17276 --- /dev/null +++ b/packages/cli/test/lib/bytes.test.ts @@ -0,0 +1,20 @@ +import { describe, expect, test } from "vitest"; +import { toArrayBufferBytes } from "../../src/lib/bytes.js"; + +describe("toArrayBufferBytes", () => { + test("returns a view over a plain ArrayBuffer unchanged", () => { + const bytes = new Uint8Array([1, 2, 3]); + expect(toArrayBufferBytes(bytes)).toBe(bytes); + }); + + test("copies a view over shared memory", () => { + const shared = new Uint8Array(new SharedArrayBuffer(4), 1, 2); + shared.set([7, 9]); + + const result = toArrayBufferBytes(shared); + + expect(result).not.toBe(shared); + expect(result.buffer).toBeInstanceOf(ArrayBuffer); + expect([...result]).toEqual([7, 9]); + }); +}); diff --git a/packages/cli/test/lib/chunk-loader.test.ts b/packages/cli/test/lib/chunk-loader.test.ts index 15bce9e144..f8d302eb90 100644 --- a/packages/cli/test/lib/chunk-loader.test.ts +++ b/packages/cli/test/lib/chunk-loader.test.ts @@ -206,12 +206,12 @@ describe("createChunkLoader", () => { "chunk-A.cjs": "exports.v = 1;", }; runToExit(chunks, cacheDir); - process.env.__CHUNK_LOADER_A = "1"; + process.env["__CHUNK_LOADER_A"] = "1"; try { expect(runToExit(chunks, cacheDir).wroteCache).toBe(true); expect(runToExit(chunks, cacheDir).wroteCache).toBe(false); } finally { - delete process.env.__CHUNK_LOADER_A; + delete process.env["__CHUNK_LOADER_A"]; } }); diff --git a/packages/cli/test/lib/command-api-references.test.ts b/packages/cli/test/lib/command-api-references.test.ts index f92a3a8e1b..b33782ed97 100644 --- a/packages/cli/test/lib/command-api-references.test.ts +++ b/packages/cli/test/lib/command-api-references.test.ts @@ -13,7 +13,7 @@ function command() { docs: { brief: "Example command" }, auth: false, async *func() { - yield; + // no-op }, }); } diff --git a/packages/cli/test/lib/command-examples.test.ts b/packages/cli/test/lib/command-examples.test.ts index 756c434972..fe183b008b 100644 --- a/packages/cli/test/lib/command-examples.test.ts +++ b/packages/cli/test/lib/command-examples.test.ts @@ -30,7 +30,7 @@ function helpText(): string { docs: { brief: "Test command", examples }, parameters: {}, async *func() { - yield null; + // no-op }, }); return (command as unknown as { fullDescription: string }).fullDescription; @@ -59,7 +59,7 @@ describe("command examples", () => { test("--help goes through npx when npx launched the process", () => { setAppIdentity({ name: "sentry-mcp", packageName: "@sentry/mcp-server" }); - process.env.npm_command = "exec"; + process.env["npm_command"] = "exec"; expect(helpText()).toContain( " npx -y @sentry/mcp-server issue list my-org/frontend # List issues", ); diff --git a/packages/cli/test/lib/command.test.ts b/packages/cli/test/lib/command.test.ts index 31d9d778e7..6d106e1db4 100644 --- a/packages/cli/test/lib/command.test.ts +++ b/packages/cli/test/lib/command.test.ts @@ -15,7 +15,15 @@ import { run, text_en, } from "@stricli/core"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { applyLoggingFlags, applyOrgProjectFlags, @@ -193,7 +201,7 @@ describe("buildCommand", () => { }, }, async *func() { - yield null; + // no-op }, }); @@ -209,8 +217,8 @@ describe("buildCommand", () => { }); describe("buildCommand telemetry integration", () => { - let setTagSpy: ReturnType; - let setContextSpy: ReturnType; + let setTagSpy: MockInstance<(typeof Sentry)["setTag"]>; + let setContextSpy: MockInstance<(typeof Sentry)["setContext"]>; beforeEach(() => { setTagSpy = vi.spyOn(Sentry, "setTag"); @@ -303,8 +311,8 @@ describe("buildCommand telemetry integration", () => { expect(receivedFlags).not.toBeNull(); // Critical: must be number 10, not string "10" - expect(receivedFlags!.limit).toBe(10); - expect(typeof receivedFlags!.limit).toBe("number"); + expect(receivedFlags!["limit"]).toBe(10); + expect(typeof receivedFlags!["limit"]).toBe("number"); }); test("skips false boolean flags in telemetry", async () => { @@ -569,8 +577,8 @@ describe("buildCommand", () => { // Original func receives json flag but NOT verbose/log-level expect(calledFlags).toBeDefined(); - expect(calledFlags!.json).toBe(true); - expect(calledFlags!.verbose).toBeUndefined(); + expect(calledFlags!["json"]).toBe(true); + expect(calledFlags!["verbose"]).toBeUndefined(); expect(calledFlags!["log-level"]).toBeUndefined(); }); @@ -676,9 +684,9 @@ describe("buildCommand", () => { ); expect(receivedFlags).toBeDefined(); - expect(receivedFlags!.limit).toBe(50); + expect(receivedFlags!["limit"]).toBe(50); // Logging flags must be stripped - expect(receivedFlags!.verbose).toBeUndefined(); + expect(receivedFlags!["verbose"]).toBeUndefined(); expect(receivedFlags!["log-level"]).toBeUndefined(); }); @@ -731,8 +739,8 @@ describe("buildCommand", () => { // Command's own --verbose is passed through (not stripped) expect(receivedFlags).toBeDefined(); - expect(receivedFlags!.verbose).toBe(true); - expect(receivedFlags!.silent).toBe(false); + expect(receivedFlags!["verbose"]).toBe(true); + expect(receivedFlags!["silent"]).toBe(false); // --log-level is always stripped (it's ours) expect(receivedFlags!["log-level"]).toBeUndefined(); // --verbose also sets debug-level logging as a side-effect @@ -854,7 +862,7 @@ describe("buildCommand output config", () => { await run(app, ["test", "--json"], ctx as TestContext); expect(receivedFlags).toBeDefined(); - expect(receivedFlags!.json).toBe(true); + expect(receivedFlags!["json"]).toBe(true); }); test("injects --fields flag when output: 'json'", async () => { @@ -892,9 +900,9 @@ describe("buildCommand output config", () => { ); expect(receivedFlags).toBeDefined(); - expect(receivedFlags!.json).toBe(true); + expect(receivedFlags!["json"]).toBe(true); // --fields is pre-parsed from comma-string to string[] - expect(receivedFlags!.fields).toEqual(["id", "title", "status"]); + expect(receivedFlags!["fields"]).toEqual(["id", "title", "status"]); }); test("pre-parses --fields with whitespace and deduplication", async () => { @@ -933,7 +941,7 @@ describe("buildCommand output config", () => { expect(receivedFlags).toBeDefined(); // Whitespace trimmed, duplicates removed - expect(receivedFlags!.fields).toEqual(["id", "title"]); + expect(receivedFlags!["fields"]).toEqual(["id", "title"]); }); test("fields is undefined when --fields not passed", async () => { @@ -967,8 +975,8 @@ describe("buildCommand output config", () => { await run(app, ["test", "--json"], ctx as TestContext); expect(receivedFlags).toBeDefined(); - expect(receivedFlags!.json).toBe(true); - expect(receivedFlags!.fields).toBeUndefined(); + expect(receivedFlags!["json"]).toBe(true); + expect(receivedFlags!["fields"]).toBeUndefined(); }); test("does not inject --json/--fields without output: 'json'", async () => { @@ -1041,9 +1049,9 @@ describe("buildCommand output config", () => { await run(app, ["test", "--json", "--fields", "id"], ctx as TestContext); expect(receivedFlags).toBeDefined(); - expect(receivedFlags!.json).toBe(true); + expect(receivedFlags!["json"]).toBe(true); // --fields is still injected and pre-parsed even when command owns --json - expect(receivedFlags!.fields).toEqual(["id"]); + expect(receivedFlags!["fields"]).toEqual(["id"]); }); test("supports dot-notation in --fields", async () => { @@ -1081,7 +1089,7 @@ describe("buildCommand output config", () => { ); expect(receivedFlags).toBeDefined(); - expect(receivedFlags!.fields).toEqual([ + expect(receivedFlags!["fields"]).toEqual([ "id", "metadata.value", "contexts.trace.traceId", @@ -1132,11 +1140,11 @@ describe("buildCommand output config", () => { ); expect(receivedFlags).toBeDefined(); - expect(receivedFlags!.json).toBe(true); - expect(receivedFlags!.fields).toEqual(["id"]); - expect(receivedFlags!.limit).toBe(50); + expect(receivedFlags!["json"]).toBe(true); + expect(receivedFlags!["fields"]).toEqual(["id"]); + expect(receivedFlags!["limit"]).toBe(50); // --verbose is stripped (we injected it) - expect(receivedFlags!.verbose).toBeUndefined(); + expect(receivedFlags!["verbose"]).toBeUndefined(); }); }); @@ -1149,7 +1157,8 @@ describe("buildCommand return-based output", () => { const command = buildCommand< { json: boolean; fields?: string[] }, [], - TestContext + TestContext, + { name: string; role: string } >({ auth: false, docs: { brief: "Test" }, @@ -1178,7 +1187,8 @@ describe("buildCommand return-based output", () => { const command = buildCommand< { json: boolean; fields?: string[] }, [], - TestContext + TestContext, + { name: string; role: string } >({ auth: false, docs: { brief: "Test" }, @@ -1208,7 +1218,8 @@ describe("buildCommand return-based output", () => { const command = buildCommand< { json: boolean; fields?: string[] }, [], - TestContext + TestContext, + { id: number; name: string; role: string } >({ auth: false, docs: { brief: "Test" }, @@ -1241,7 +1252,12 @@ describe("buildCommand return-based output", () => { test("shows hint in human mode, suppresses in JSON mode", async () => { const makeCommand = () => - buildCommand<{ json: boolean; fields?: string[] }, [], TestContext>({ + buildCommand< + { json: boolean; fields?: string[] }, + [], + TestContext, + { value: number } + >({ auth: false, docs: { brief: "Test" }, output: { @@ -1286,7 +1302,8 @@ describe("buildCommand return-based output", () => { const command = buildCommand< { json: boolean; fields?: string[] }, [], - TestContext + TestContext, + { value: number } >({ auth: false, docs: { brief: "Test" }, @@ -1357,7 +1374,12 @@ describe("buildCommand return-based output", () => { }); test("data return is ignored without output config", async () => { - const command = buildCommand, [], TestContext>({ + const command = buildCommand< + Record, + [], + TestContext, + { value: number } + >({ auth: false, docs: { brief: "Test" }, // Deliberately no output config @@ -1365,7 +1387,7 @@ describe("buildCommand return-based output", () => { async *func(this: TestContext) { // This returns data, but without output config // the wrapper should NOT render it - yield { value: 42 }; + yield new CommandOutput({ value: 42 }); }, }); @@ -1386,7 +1408,8 @@ describe("buildCommand return-based output", () => { const command = buildCommand< { json: boolean; fields?: string[] }, [], - TestContext + TestContext, + { name: string } >({ auth: false, docs: { brief: "Test" }, @@ -1417,12 +1440,13 @@ describe("buildCommand return-based output", () => { const command = buildCommand< { json: boolean; fields?: string[] }, [], - TestContext + TestContext, + Array<{ id: number }> >({ auth: false, docs: { brief: "Test" }, output: { - human: (d: Array<{ id: number }>) => d.map(((x) => x.id).join(", ")), + human: (d: Array<{ id: number }>) => d.map((x) => x.id).join(", "), }, parameters: {}, async *func(this: TestContext) { @@ -1448,7 +1472,12 @@ describe("buildCommand return-based output", () => { test("hint shown in human mode only", async () => { const makeCommand = () => - buildCommand<{ json: boolean; fields?: string[] }, [], TestContext>({ + buildCommand< + { json: boolean; fields?: string[] }, + [], + TestContext, + { org: string } + >({ auth: false, docs: { brief: "Test" }, output: { @@ -1590,79 +1619,79 @@ describe("applyOrgProjectFlags", () => { let savedProject: string | undefined; beforeEach(() => { - savedOrg = process.env.SENTRY_ORG; - savedProject = process.env.SENTRY_PROJECT; - delete process.env.SENTRY_ORG; - delete process.env.SENTRY_PROJECT; + savedOrg = process.env["SENTRY_ORG"]; + savedProject = process.env["SENTRY_PROJECT"]; + delete process.env["SENTRY_ORG"]; + delete process.env["SENTRY_PROJECT"]; }); afterEach(() => { if (savedOrg !== undefined) { - process.env.SENTRY_ORG = savedOrg; + process.env["SENTRY_ORG"] = savedOrg; } else { - delete process.env.SENTRY_ORG; + delete process.env["SENTRY_ORG"]; } if (savedProject !== undefined) { - process.env.SENTRY_PROJECT = savedProject; + process.env["SENTRY_PROJECT"] = savedProject; } else { - delete process.env.SENTRY_PROJECT; + delete process.env["SENTRY_PROJECT"]; } }); test("sets both env vars when flags provided", () => { applyOrgProjectFlags("my-org", "my-proj", false, false); - expect(process.env.SENTRY_ORG).toBe("my-org"); - expect(process.env.SENTRY_PROJECT).toBe("my-proj"); + expect(process.env["SENTRY_ORG"]).toBe("my-org"); + expect(process.env["SENTRY_PROJECT"]).toBe("my-proj"); }); test("skips when command owns the flag", () => { applyOrgProjectFlags("my-org", "my-proj", true, true); - expect(process.env.SENTRY_ORG).toBeUndefined(); - expect(process.env.SENTRY_PROJECT).toBeUndefined(); + expect(process.env["SENTRY_ORG"]).toBeUndefined(); + expect(process.env["SENTRY_PROJECT"]).toBeUndefined(); }); test("sets only org when project is undefined", () => { applyOrgProjectFlags("my-org", undefined, false, false); - expect(process.env.SENTRY_ORG).toBe("my-org"); - expect(process.env.SENTRY_PROJECT).toBeUndefined(); + expect(process.env["SENTRY_ORG"]).toBe("my-org"); + expect(process.env["SENTRY_PROJECT"]).toBeUndefined(); }); test("sets only project when org is undefined", () => { applyOrgProjectFlags(undefined, "my-proj", false, false); - expect(process.env.SENTRY_ORG).toBeUndefined(); - expect(process.env.SENTRY_PROJECT).toBe("my-proj"); + expect(process.env["SENTRY_ORG"]).toBeUndefined(); + expect(process.env["SENTRY_PROJECT"]).toBe("my-proj"); }); test("overwrites existing env var", () => { - process.env.SENTRY_ORG = "old"; + process.env["SENTRY_ORG"] = "old"; applyOrgProjectFlags("new", undefined, false, false); - expect(process.env.SENTRY_ORG).toBe("new"); + expect(process.env["SENTRY_ORG"]).toBe("new"); }); test("does nothing when both flags are undefined", () => { applyOrgProjectFlags(undefined, undefined, false, false); - expect(process.env.SENTRY_ORG).toBeUndefined(); - expect(process.env.SENTRY_PROJECT).toBeUndefined(); + expect(process.env["SENTRY_ORG"]).toBeUndefined(); + expect(process.env["SENTRY_PROJECT"]).toBeUndefined(); }); test("trims whitespace from flag values before writing", () => { applyOrgProjectFlags(" my-org ", " my-proj ", false, false); - expect(process.env.SENTRY_ORG).toBe("my-org"); - expect(process.env.SENTRY_PROJECT).toBe("my-proj"); + expect(process.env["SENTRY_ORG"]).toBe("my-org"); + expect(process.env["SENTRY_PROJECT"]).toBe("my-proj"); }); test("treats empty string as not provided — preserves existing env var", () => { - process.env.SENTRY_ORG = "preserved-org"; + process.env["SENTRY_ORG"] = "preserved-org"; applyOrgProjectFlags("", undefined, false, false); // Empty string must NOT clobber a real pre-existing env var - expect(process.env.SENTRY_ORG).toBe("preserved-org"); + expect(process.env["SENTRY_ORG"]).toBe("preserved-org"); }); test("treats whitespace-only as not provided — preserves existing env var", () => { - process.env.SENTRY_PROJECT = "preserved-proj"; + process.env["SENTRY_PROJECT"] = "preserved-proj"; applyOrgProjectFlags(undefined, " ", false, false); // Whitespace-only must NOT clobber a real pre-existing env var - expect(process.env.SENTRY_PROJECT).toBe("preserved-proj"); + expect(process.env["SENTRY_PROJECT"]).toBe("preserved-proj"); }); }); @@ -1675,22 +1704,22 @@ describe("buildCommand --org/--project compat flags", () => { let savedProject: string | undefined; beforeEach(() => { - savedOrg = process.env.SENTRY_ORG; - savedProject = process.env.SENTRY_PROJECT; - delete process.env.SENTRY_ORG; - delete process.env.SENTRY_PROJECT; + savedOrg = process.env["SENTRY_ORG"]; + savedProject = process.env["SENTRY_PROJECT"]; + delete process.env["SENTRY_ORG"]; + delete process.env["SENTRY_PROJECT"]; }); afterEach(() => { if (savedOrg !== undefined) { - process.env.SENTRY_ORG = savedOrg; + process.env["SENTRY_ORG"] = savedOrg; } else { - delete process.env.SENTRY_ORG; + delete process.env["SENTRY_ORG"]; } if (savedProject !== undefined) { - process.env.SENTRY_PROJECT = savedProject; + process.env["SENTRY_PROJECT"] = savedProject; } else { - delete process.env.SENTRY_PROJECT; + delete process.env["SENTRY_PROJECT"]; } }); @@ -1713,7 +1742,7 @@ describe("buildCommand --org/--project compat flags", () => { await run(app, ["test", "--org", "my-org"], ctx as TestContext); - expect(process.env.SENTRY_ORG).toBe("my-org"); + expect(process.env["SENTRY_ORG"]).toBe("my-org"); }); test("--project sets SENTRY_PROJECT env var", async () => { @@ -1735,11 +1764,11 @@ describe("buildCommand --org/--project compat flags", () => { await run(app, ["test", "--project", "my-project"], ctx as TestContext); - expect(process.env.SENTRY_PROJECT).toBe("my-project"); + expect(process.env["SENTRY_PROJECT"]).toBe("my-project"); }); test("--org overwrites existing SENTRY_ORG", async () => { - process.env.SENTRY_ORG = "original-org"; + process.env["SENTRY_ORG"] = "original-org"; const command = buildCommand, [], TestContext>({ auth: false, @@ -1759,7 +1788,7 @@ describe("buildCommand --org/--project compat flags", () => { await run(app, ["test", "--org", "new-org"], ctx as TestContext); - expect(process.env.SENTRY_ORG).toBe("new-org"); + expect(process.env["SENTRY_ORG"]).toBe("new-org"); }); test("--org and --project are stripped from func flags", async () => { @@ -1798,12 +1827,12 @@ describe("buildCommand --org/--project compat flags", () => { ); expect(receivedFlags).toBeDefined(); - expect(receivedFlags!.limit).toBe(50); - expect(receivedFlags!.org).toBeUndefined(); - expect(receivedFlags!.project).toBeUndefined(); + expect(receivedFlags!["limit"]).toBe(50); + expect(receivedFlags!["org"]).toBeUndefined(); + expect(receivedFlags!["project"]).toBeUndefined(); // Both env vars set - expect(process.env.SENTRY_ORG).toBe("sentry"); - expect(process.env.SENTRY_PROJECT).toBe("cli"); + expect(process.env["SENTRY_ORG"]).toBe("sentry"); + expect(process.env["SENTRY_PROJECT"]).toBe("cli"); }); test("command-owned --project is preserved and NOT written to env", async () => { @@ -1840,9 +1869,9 @@ describe("buildCommand --org/--project compat flags", () => { // Command's own --project is passed through (not stripped) expect(receivedFlags).toBeDefined(); - expect(receivedFlags!.project).toBe("my-project"); + expect(receivedFlags!["project"]).toBe("my-project"); // Should NOT be written to env (command owns the flag) - expect(process.env.SENTRY_PROJECT).toBeUndefined(); + expect(process.env["SENTRY_PROJECT"]).toBeUndefined(); }); test("--org=value equals form works", async () => { @@ -1864,11 +1893,11 @@ describe("buildCommand --org/--project compat flags", () => { await run(app, ["test", "--org=my-org"], ctx as TestContext); - expect(process.env.SENTRY_ORG).toBe("my-org"); + expect(process.env["SENTRY_ORG"]).toBe("my-org"); }); test("--project overwrites existing SENTRY_PROJECT", async () => { - process.env.SENTRY_PROJECT = "original-proj"; + process.env["SENTRY_PROJECT"] = "original-proj"; const command = buildCommand, [], TestContext>({ auth: false, @@ -1888,7 +1917,7 @@ describe("buildCommand --org/--project compat flags", () => { await run(app, ["test", "--project", "new-proj"], ctx as TestContext); - expect(process.env.SENTRY_PROJECT).toBe("new-proj"); + expect(process.env["SENTRY_PROJECT"]).toBe("new-proj"); }); test("--org/--project values flow into resolveOrgAndProject (end-to-end)", async () => { @@ -1897,7 +1926,11 @@ describe("buildCommand --org/--project compat flags", () => { // contract this PR exists to deliver: LLM-generated `--org foo --project // bar` should make org/project resolution succeed without an explicit // positional arg. - let resolved: Awaited> = null; + // A holder object, so the assignment inside the command stays visible + // to the assertions below. + const captured: { + resolved: Awaited>; + } = { resolved: null }; const command = buildCommand, [], TestContext>({ auth: false, @@ -1905,7 +1938,7 @@ describe("buildCommand --org/--project compat flags", () => { parameters: {}, // oxlint-disable-next-line require-yield -- test command — no output to yield async *func(this: TestContext) { - resolved = await resolveOrgAndProject({ cwd: "/tmp" }); + captured.resolved = await resolveOrgAndProject({ cwd: "/tmp" }); }, }); @@ -1922,6 +1955,7 @@ describe("buildCommand --org/--project compat flags", () => { ctx as TestContext, ); + const { resolved } = captured; expect(resolved).not.toBeNull(); expect(resolved?.org).toBe("flag-org"); expect(resolved?.project).toBe("flag-proj"); diff --git a/packages/cli/test/lib/complete.test.ts b/packages/cli/test/lib/complete.test.ts index 3e49fc306a..0b747fc602 100644 --- a/packages/cli/test/lib/complete.test.ts +++ b/packages/cli/test/lib/complete.test.ts @@ -33,7 +33,7 @@ import { type OrgRegionEntry, setOrgRegions, } from "../../src/lib/db/regions.js"; -import { useTestConfigDir } from "../helpers.js"; +import { useTestConfigDir, at } from "../helpers.js"; useTestConfigDir("test-complete-"); @@ -82,14 +82,14 @@ describe("getCompletions: context detection", () => { await seedOrgs([{ slug: "my-org", name: "My Organization" }]); const result = await getCompletions(["issue", "list"], ""); expect(result.length).toBeGreaterThan(0); - expect(result[0].value).toBe("my-org/"); + expect(at(result, 0).value).toBe("my-org/"); }); test("returns org-only completions for org view", async () => { await seedOrgs([{ slug: "my-org", name: "My Organization" }]); const result = await getCompletions(["org", "view"], ""); expect(result.length).toBeGreaterThan(0); - expect(result[0].value).toBe("my-org"); // no trailing slash + expect(at(result, 0).value).toBe("my-org"); // no trailing slash }); test("still provides completions after boolean flags", async () => { @@ -301,8 +301,8 @@ describe("completeOrgSlugs", () => { ]); const result = completeOrgSlugs("sen"); expect(result).toHaveLength(1); - expect(result[0].value).toBe("sentry"); - expect(result[0].description).toBe("Sentry"); + expect(at(result, 0).value).toBe("sentry"); + expect(at(result, 0).description).toBe("Sentry"); }); test("fuzzy matches", async () => { @@ -372,7 +372,7 @@ describe("completeOrgSlashProject", () => { // "senry/" has a typo in the org — should fuzzy-resolve to "sentry" const result = completeOrgSlashProject("senry/"); expect(result).toHaveLength(1); - expect(result[0].value).toBe("sentry/cli"); + expect(at(result, 0).value).toBe("sentry/cli"); }); test("with unresolvable org slug before slash returns empty", async () => { @@ -417,7 +417,7 @@ describe("completeOrgSlashProject", () => { const result = completeOrgSlashProject("my-org/fro"); expect(result).toHaveLength(1); - expect(result[0].value).toBe("my-org/frontend"); + expect(at(result, 0).value).toBe("my-org/frontend"); }); }); @@ -447,8 +447,8 @@ describe("completeProjectSlugs", () => { const result = completeProjectSlugs("we", "my-org"); expect(result).toHaveLength(1); - expect(result[0].value).toBe("my-org/web"); - expect(result[0].description).toBe("Web App"); + expect(at(result, 0).value).toBe("my-org/web"); + expect(at(result, 0).description).toBe("Web App"); }); test("tolerates a typo in an unfinished project name", async () => { diff --git a/packages/cli/test/lib/completion-warmup.test.ts b/packages/cli/test/lib/completion-warmup.test.ts index a674ead025..600ab4172a 100644 --- a/packages/cli/test/lib/completion-warmup.test.ts +++ b/packages/cli/test/lib/completion-warmup.test.ts @@ -236,6 +236,7 @@ describe("warmAttributeCompletions", () => { new Promise((_resolve, reject) => { init?.signal?.addEventListener("abort", () => { aborted.push(true); + // oxlint-disable-next-line typescript/prefer-promise-reject-errors -- fetch rejects with the signal's abort reason, like the platform reject(init.signal?.reason); }); }), diff --git a/packages/cli/test/lib/completions.property.test.ts b/packages/cli/test/lib/completions.property.test.ts index 024c0999c0..7f446e912a 100644 --- a/packages/cli/test/lib/completions.property.test.ts +++ b/packages/cli/test/lib/completions.property.test.ts @@ -18,6 +18,7 @@ import { proposeCompletions } from "@stricli/core"; import { constantFrom, assert as fcAssert, property } from "fast-check"; import { afterAll, beforeAll, describe, expect, test } from "vitest"; import { app, routes } from "../../src/app.js"; +import { buildContext } from "../../src/context.js"; import generatedTargets from "../../src/generated/completion-targets.json"; import { COMPLETION_VALUES, @@ -38,6 +39,7 @@ import { type RouteMap, } from "../../src/lib/introspect.js"; import { DEFAULT_NUM_RUNS } from "../model-based/helpers.js"; +import { at } from "../helpers.js"; const generatedCommands: CommandCompletions = generatedTargets.commands; @@ -66,7 +68,8 @@ const completionContext = { }, stdin: process.stdin, }, - forCommand: () => ({}), + // Route completion never runs a command; the real builder only types it. + forCommand: buildContext(process).forCommand, }; // -- Tests -- @@ -253,7 +256,7 @@ describe("proposeCompletions: Stricli integration", () => { continue; } // Pick the first subcommand's first character as prefix - const prefix = group.subcommands[0].name[0]; + const prefix = at(group.subcommands, 0).name.charAt(0); const completions = await proposeCompletions( app, [group.name, prefix], @@ -419,7 +422,7 @@ describe( ); env = { ...process.env, - PATH: `${binDir}:${process.env.PATH}`, + PATH: `${binDir}:${process.env["PATH"]}`, SENTRY_CONFIG_DIR: join(root, "config"), }; }); diff --git a/packages/cli/test/lib/config.test.ts b/packages/cli/test/lib/config.test.ts index 4c0dfac1ba..22f10b7a29 100644 --- a/packages/cli/test/lib/config.test.ts +++ b/packages/cli/test/lib/config.test.ts @@ -53,12 +53,12 @@ const getConfigDir = useTestConfigDir("test-config-"); let savedAuthToken: string | undefined; beforeEach(() => { - savedAuthToken = process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_AUTH_TOKEN; + savedAuthToken = process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_AUTH_TOKEN"]; }); afterEach(() => { if (savedAuthToken !== undefined) { - process.env.SENTRY_AUTH_TOKEN = savedAuthToken; + process.env["SENTRY_AUTH_TOKEN"] = savedAuthToken; } }); @@ -174,7 +174,8 @@ describe("refreshToken error handling", () => { setAuthToken("still-valid-token", -1, "my-refresh-token"); // Expired // Set required env var for OAuth - process.env.SENTRY_CLIENT_ID = "test-client-id"; + // Set required env var for OAuth + process.env["SENTRY_CLIENT_ID"] = "test-client-id"; // Mock fetch to simulate network error const originalFetch = globalThis.fetch; @@ -203,7 +204,7 @@ describe("refreshToken error handling", () => { // Set up a token that needs refresh setAuthToken("revoked-token", -1, "invalid-refresh-token"); // Expired - process.env.SENTRY_CLIENT_ID = "test-client-id"; + process.env["SENTRY_CLIENT_ID"] = "test-client-id"; // Mock fetch to simulate server rejecting refresh token const originalFetch = globalThis.fetch; @@ -330,7 +331,7 @@ describe("project aliases", () => { expect(aliases).toEqual({ new: { orgSlug: "org2", projectSlug: "project2" }, }); - expect(aliases?.old).toBeUndefined(); + expect(aliases?.["old"]).toBeUndefined(); }); }); diff --git a/packages/cli/test/lib/constants.test.ts b/packages/cli/test/lib/constants.test.ts index 5fce7714bb..c8eef8525b 100644 --- a/packages/cli/test/lib/constants.test.ts +++ b/packages/cli/test/lib/constants.test.ts @@ -110,55 +110,55 @@ describe("getConfiguredSentryUrl", () => { let originalUrl: string | undefined; beforeEach(() => { - originalHost = process.env.SENTRY_HOST; - originalUrl = process.env.SENTRY_URL; + originalHost = process.env["SENTRY_HOST"]; + originalUrl = process.env["SENTRY_URL"]; }); afterEach(() => { // Restore original values (set or delete) if (originalHost !== undefined) { - process.env.SENTRY_HOST = originalHost; + process.env["SENTRY_HOST"] = originalHost; } else { - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_HOST"]; } if (originalUrl !== undefined) { - process.env.SENTRY_URL = originalUrl; + process.env["SENTRY_URL"] = originalUrl; } else { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; } }); test("returns undefined when no env vars set", () => { - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; expect(getConfiguredSentryUrl()).toBeUndefined(); }); test("normalizes bare SENTRY_HOST", () => { - process.env.SENTRY_HOST = "sentry.example.com"; - delete process.env.SENTRY_URL; + process.env["SENTRY_HOST"] = "sentry.example.com"; + delete process.env["SENTRY_URL"]; expect(getConfiguredSentryUrl()).toBe("https://sentry.example.com"); }); test("normalizes bare SENTRY_URL", () => { - delete process.env.SENTRY_HOST; - process.env.SENTRY_URL = "sentry.example.com"; + delete process.env["SENTRY_HOST"]; + process.env["SENTRY_URL"] = "sentry.example.com"; expect(getConfiguredSentryUrl()).toBe("https://sentry.example.com"); }); test("SENTRY_HOST takes precedence over SENTRY_URL", () => { - process.env.SENTRY_HOST = "host.example.com"; - process.env.SENTRY_URL = "url.example.com"; + process.env["SENTRY_HOST"] = "host.example.com"; + process.env["SENTRY_URL"] = "url.example.com"; expect(getConfiguredSentryUrl()).toBe("https://host.example.com"); }); test("preserves protocol when already present", () => { - process.env.SENTRY_HOST = "https://sentry.example.com"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; expect(getConfiguredSentryUrl()).toBe("https://sentry.example.com"); }); test("preserves http:// for local development", () => { - process.env.SENTRY_HOST = "http://localhost:8000"; + process.env["SENTRY_HOST"] = "http://localhost:8000"; expect(getConfiguredSentryUrl()).toBe("http://localhost:8000"); }); }); diff --git a/packages/cli/test/lib/context-recovery.test.ts b/packages/cli/test/lib/context-recovery.test.ts index a5f515a4f2..1643016d93 100644 --- a/packages/cli/test/lib/context-recovery.test.ts +++ b/packages/cli/test/lib/context-recovery.test.ts @@ -36,8 +36,13 @@ import { resetHostScopingState, useEnvSandbox, useTestConfigDir, + at, } from "../helpers.js"; -import { createMockServer, type MockServer } from "../mocks/server.js"; +import { + createMockServer, + type MockServer, + routeParam, +} from "../mocks/server.js"; const TOKEN = "context-recovery-test-token"; const QUERY = `is:unresolved message:"can't read 'name'"`; @@ -76,34 +81,32 @@ beforeAll(async () => { { method: "GET", path: "/api/0/organizations/:orgSlug/projects/", - response: ( - _request: Request, - { orgSlug }: Record, - serverUrl: string, - ) => { + response: (_request, params, serverUrl) => { + const orgSlug = routeParam(params, "orgSlug"); if (failedOrgs.has(orgSlug)) { return { status: 403, body: { detail: "Not permitted" } }; } + const body = projectsByOrg.get(orgSlug) ?? []; + if (!paginatedOrgs.has(orgSlug)) { + return { body }; + } return { - body: projectsByOrg.get(orgSlug) ?? [], - headers: paginatedOrgs.has(orgSlug) - ? { - Link: `<${serverUrl}/api/0/organizations/${orgSlug}/projects/>; rel="next"; results="true"; cursor="next-page"`, - } - : undefined, + body, + headers: { + Link: `<${serverUrl}/api/0/organizations/${orgSlug}/projects/>; rel="next"; results="true"; cursor="next-page"`, + }, }; }, }, { method: "GET", path: "/api/0/projects/:orgSlug/:projectSlug/", - response: ( - _request: Request, - { orgSlug, projectSlug }: Record, - ) => ({ + response: (_request, params) => ({ body: projectsByOrg - .get(orgSlug) - ?.find((project) => project.slug === projectSlug), + .get(routeParam(params, "orgSlug")) + ?.find( + (project) => project.slug === routeParam(params, "projectSlug"), + ), }), }, { @@ -133,8 +136,8 @@ beforeEach(async () => { failedOrgs = new Set(); paginatedOrgs = new Set(); requests = []; - process.env.SENTRY_URL = server.url; - process.env.SENTRY_NO_CACHE = "1"; + process.env["SENTRY_URL"] = server.url; + process.env["SENTRY_NO_CACHE"] = "1"; setAuthToken(TOKEN, undefined, undefined, { host: server.url }); const realFetch = (globalThis as { __originalFetch?: typeof fetch }) @@ -326,7 +329,9 @@ describe.skipIf(process.platform === "win32")( const retry = await runCommand(args); expect(retry.exitCode, retry.stderr).toBe(0); expect(JSON.parse(retry.stdout)).toEqual({ - data: [{ id: issuesFixture[0].id, title: issuesFixture[0].title }], + data: [ + { id: at(issuesFixture, 0).id, title: at(issuesFixture, 0).title }, + ], hasMore: false, hasPrev: false, }); @@ -334,9 +339,11 @@ describe.skipIf(process.platform === "win32")( url.pathname.endsWith("/issues/"), ); expect(issueRequests).toHaveLength(1); - const request = issueRequests[0]; + const request = at(issueRequests, 0); expect(request.pathname).toBe("/api/0/organizations/test-org/issues/"); - expect(request.searchParams.get("project")).toBe(projectsFixture[0].id); + expect(request.searchParams.get("project")).toBe( + at(projectsFixture, 0).id, + ); expect(request.searchParams.get("query")).toBe(query || null); expect(request.searchParams.get("limit")).toBe("7"); expect(request.searchParams.get("sort")).toBe("freq"); @@ -359,7 +366,7 @@ describe("bounded target guidance", () => { "keeps candidates within the %s organization without changing defaults", async (source) => { if (source === "environment") { - process.env.SENTRY_ORG = "test-org-2"; + process.env["SENTRY_ORG"] = "test-org-2"; } else { setDefaultOrganization("test-org-2"); } @@ -391,7 +398,7 @@ describe("bounded target guidance", () => { test("bounds discovery and still suggests accessible projects when one org fails", async () => { organizations = Array.from({ length: 4 }, (_, index) => ({ - ...organizationsFixture[0], + ...at(organizationsFixture, 0), id: String(100_010 + index), slug: `candidate-org-${index}`, })); @@ -399,7 +406,7 @@ describe("bounded target guidance", () => { organizations.map((org) => [ org.slug, Array.from({ length: 5 }, (_, index) => ({ - ...projectsFixture[0], + ...at(projectsFixture, 0), id: String(300_010 + index), slug: `candidate-project-${index}`, })), @@ -452,7 +459,7 @@ describe("bounded target guidance", () => { test("shows one retry without an empty alternatives list for a single project", async () => { organizations = organizationsFixture.slice(0, 1); projectsByOrg = new Map([ - [organizations[0].slug, projectsFixture.slice(0, 1)], + [at(organizations, 0).slug, projectsFixture.slice(0, 1)], ]); const error = await failure(guide()); @@ -523,7 +530,7 @@ describe.skipIf(process.platform === "win32")( ]); expect(result.exitCode, result.stderr).toBe(0); expect(JSON.parse(result.stdout).data).toEqual([ - { id: issuesFixture[0].id }, + { id: at(issuesFixture, 0).id }, ]); const issueRequests = requests.filter((url) => url.pathname.endsWith("/issues/"), diff --git a/packages/cli/test/lib/custom-ca.test.ts b/packages/cli/test/lib/custom-ca.test.ts index 06fff7ac2a..78cc90c8a7 100644 --- a/packages/cli/test/lib/custom-ca.test.ts +++ b/packages/cli/test/lib/custom-ca.test.ts @@ -140,15 +140,15 @@ describe("custom CA loading", () => { beforeEach(() => { __resetForTests(); - savedNodeExtra = process.env.NODE_EXTRA_CA_CERTS; - delete process.env.NODE_EXTRA_CA_CERTS; + savedNodeExtra = process.env["NODE_EXTRA_CA_CERTS"]; + delete process.env["NODE_EXTRA_CA_CERTS"]; }); afterEach(() => { if (savedNodeExtra !== undefined) { - process.env.NODE_EXTRA_CA_CERTS = savedNodeExtra; + process.env["NODE_EXTRA_CA_CERTS"] = savedNodeExtra; } else { - delete process.env.NODE_EXTRA_CA_CERTS; + delete process.env["NODE_EXTRA_CA_CERTS"]; } }); @@ -174,7 +174,7 @@ describe("custom CA loading", () => { test("loads CA from NODE_EXTRA_CA_CERTS", () => { const certPath = join(getConfigDir(), "extra-ca.pem"); writeFileSync(certPath, CERT_PEM); - process.env.NODE_EXTRA_CA_CERTS = certPath; + process.env["NODE_EXTRA_CA_CERTS"] = certPath; const result = getCustomTlsOptions(); expect(result).toBeDefined(); @@ -190,7 +190,7 @@ describe("custom CA loading", () => { writeFileSync(defaultPath, CERT_PEM); writeFileSync(envPath, ENV_PEM); setDefaultCaCert(defaultPath); - process.env.NODE_EXTRA_CA_CERTS = envPath; + process.env["NODE_EXTRA_CA_CERTS"] = envPath; const result = getCustomTlsOptions(); expect(result?.tls.ca).toContain(CERT_PEM); @@ -199,7 +199,7 @@ describe("custom CA loading", () => { }); test("returns undefined when cert file does not exist", () => { - process.env.NODE_EXTRA_CA_CERTS = "/nonexistent/path/ca.pem"; + process.env["NODE_EXTRA_CA_CERTS"] = "/nonexistent/path/ca.pem"; const result = getCustomTlsOptions(); expect(result).toBeUndefined(); @@ -209,7 +209,7 @@ describe("custom CA loading", () => { test("returns undefined when cert file is not valid PEM", () => { const certPath = join(getConfigDir(), "not-pem.txt"); writeFileSync(certPath, "this is not a PEM file"); - process.env.NODE_EXTRA_CA_CERTS = certPath; + process.env["NODE_EXTRA_CA_CERTS"] = certPath; const result = getCustomTlsOptions(); expect(result).toBeUndefined(); @@ -219,11 +219,12 @@ describe("custom CA loading", () => { test("caches result across calls", () => { const certPath = join(getConfigDir(), "cached.pem"); writeFileSync(certPath, CERT_PEM); - process.env.NODE_EXTRA_CA_CERTS = certPath; + process.env["NODE_EXTRA_CA_CERTS"] = certPath; const first = getCustomTlsOptions(); // Even if env var changes, cached result stays - process.env.NODE_EXTRA_CA_CERTS = "/different/path"; + // Even if env var changes, cached result stays + process.env["NODE_EXTRA_CA_CERTS"] = "/different/path"; const second = getCustomTlsOptions(); expect(first).toBe(second); }); @@ -244,15 +245,15 @@ describe("warnIfSaasWithEnvCa", () => { beforeEach(() => { __resetForTests(); - savedNodeExtra = process.env.NODE_EXTRA_CA_CERTS; - delete process.env.NODE_EXTRA_CA_CERTS; + savedNodeExtra = process.env["NODE_EXTRA_CA_CERTS"]; + delete process.env["NODE_EXTRA_CA_CERTS"]; }); afterEach(() => { if (savedNodeExtra !== undefined) { - process.env.NODE_EXTRA_CA_CERTS = savedNodeExtra; + process.env["NODE_EXTRA_CA_CERTS"] = savedNodeExtra; } else { - delete process.env.NODE_EXTRA_CA_CERTS; + delete process.env["NODE_EXTRA_CA_CERTS"]; } }); @@ -270,7 +271,7 @@ describe("warnIfSaasWithEnvCa", () => { test("does not warn for env CAs targeting self-hosted", () => { const certPath = join(getConfigDir(), "ca.pem"); writeFileSync(certPath, CERT_PEM); - process.env.NODE_EXTRA_CA_CERTS = certPath; + process.env["NODE_EXTRA_CA_CERTS"] = certPath; getCustomTlsOptions(); // Self-hosted URL — no warning @@ -281,7 +282,7 @@ describe("warnIfSaasWithEnvCa", () => { test("warning names @sentry/mcp-server's own ca-cert command", () => { const certPath = join(getConfigDir(), "ca.pem"); writeFileSync(certPath, CERT_PEM); - process.env.NODE_EXTRA_CA_CERTS = certPath; + process.env["NODE_EXTRA_CA_CERTS"] = certPath; const stderr = vi .spyOn(process.stderr, "write") .mockImplementation(() => true); @@ -325,15 +326,15 @@ describe("getCustomCaCerts", () => { beforeEach(() => { __resetForTests(); - savedNodeExtra = process.env.NODE_EXTRA_CA_CERTS; - delete process.env.NODE_EXTRA_CA_CERTS; + savedNodeExtra = process.env["NODE_EXTRA_CA_CERTS"]; + delete process.env["NODE_EXTRA_CA_CERTS"]; }); afterEach(() => { if (savedNodeExtra !== undefined) { - process.env.NODE_EXTRA_CA_CERTS = savedNodeExtra; + process.env["NODE_EXTRA_CA_CERTS"] = savedNodeExtra; } else { - delete process.env.NODE_EXTRA_CA_CERTS; + delete process.env["NODE_EXTRA_CA_CERTS"]; } }); @@ -344,7 +345,7 @@ describe("getCustomCaCerts", () => { test("returns PEM string when CA is loaded", () => { const certPath = join(getConfigDir(), "ca.pem"); writeFileSync(certPath, CERT_PEM); - process.env.NODE_EXTRA_CA_CERTS = certPath; + process.env["NODE_EXTRA_CA_CERTS"] = certPath; const caCerts = getCustomCaCerts(); expect(caCerts).toBeDefined(); @@ -354,7 +355,7 @@ describe("getCustomCaCerts", () => { test("returns same value as getCustomTlsOptions().tls.ca", () => { const certPath = join(getConfigDir(), "ca.pem"); writeFileSync(certPath, CERT_PEM); - process.env.NODE_EXTRA_CA_CERTS = certPath; + process.env["NODE_EXTRA_CA_CERTS"] = certPath; const caCerts = getCustomCaCerts(); const tlsOpts = getCustomTlsOptions(); @@ -376,17 +377,17 @@ describe("customFetch", () => { beforeEach(() => { __resetForTests(); - savedNodeExtra = process.env.NODE_EXTRA_CA_CERTS; - delete process.env.NODE_EXTRA_CA_CERTS; + savedNodeExtra = process.env["NODE_EXTRA_CA_CERTS"]; + delete process.env["NODE_EXTRA_CA_CERTS"]; originalFetch = globalThis.fetch; }); afterEach(() => { globalThis.fetch = originalFetch; if (savedNodeExtra !== undefined) { - process.env.NODE_EXTRA_CA_CERTS = savedNodeExtra; + process.env["NODE_EXTRA_CA_CERTS"] = savedNodeExtra; } else { - delete process.env.NODE_EXTRA_CA_CERTS; + delete process.env["NODE_EXTRA_CA_CERTS"]; } }); @@ -400,13 +401,13 @@ describe("customFetch", () => { await customFetch("https://example.com", { headers: { "X-Test": "1" } }); expect(capturedInit).toBeDefined(); expect(capturedInit?.headers).toEqual({ "X-Test": "1" }); - expect((capturedInit as Record).tls).toBeUndefined(); + expect((capturedInit as Record)["tls"]).toBeUndefined(); }); test("spreads tls options when custom CA is loaded", async () => { const certPath = join(getConfigDir(), "ca.pem"); writeFileSync(certPath, CERT_PEM); - process.env.NODE_EXTRA_CA_CERTS = certPath; + process.env["NODE_EXTRA_CA_CERTS"] = certPath; let capturedInit: Record | undefined; globalThis.fetch = (_input: unknown, init?: RequestInit) => { @@ -416,15 +417,15 @@ describe("customFetch", () => { await customFetch("https://example.com", { headers: { "X-Test": "1" } }); expect(capturedInit).toBeDefined(); - expect(capturedInit?.tls).toBeDefined(); + expect(capturedInit?.["tls"]).toBeDefined(); // oxlint-disable-next-line no-unsafe-optional-chaining -- Existing test assumes the optional fixture is present. - expect((capturedInit?.tls as { ca: string }).ca).toContain(CERT_PEM); + expect((capturedInit?.["tls"] as { ca: string }).ca).toContain(CERT_PEM); }); test("preserves caller init options alongside tls", async () => { const certPath = join(getConfigDir(), "ca.pem"); writeFileSync(certPath, CERT_PEM); - process.env.NODE_EXTRA_CA_CERTS = certPath; + process.env["NODE_EXTRA_CA_CERTS"] = certPath; let capturedInit: Record | undefined; globalThis.fetch = (_input: unknown, init?: RequestInit) => { @@ -436,10 +437,10 @@ describe("customFetch", () => { method: "POST", headers: { "Content-Type": "application/json" }, }); - expect(capturedInit?.method).toBe("POST"); - expect(capturedInit?.headers).toEqual({ + expect(capturedInit?.["method"]).toBe("POST"); + expect(capturedInit?.["headers"]).toEqual({ "Content-Type": "application/json", }); - expect(capturedInit?.tls).toBeDefined(); + expect(capturedInit?.["tls"]).toBeDefined(); }); }); diff --git a/packages/cli/test/lib/custom-headers.test.ts b/packages/cli/test/lib/custom-headers.test.ts index 18cb7a10c8..581289cad8 100644 --- a/packages/cli/test/lib/custom-headers.test.ts +++ b/packages/cli/test/lib/custom-headers.test.ts @@ -187,30 +187,30 @@ describe("getCustomHeaders", () => { let savedUrl: string | undefined; beforeEach(() => { - savedHeaders = process.env.SENTRY_CUSTOM_HEADERS; - savedHost = process.env.SENTRY_HOST; - savedUrl = process.env.SENTRY_URL; - delete process.env.SENTRY_CUSTOM_HEADERS; - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + savedHeaders = process.env["SENTRY_CUSTOM_HEADERS"]; + savedHost = process.env["SENTRY_HOST"]; + savedUrl = process.env["SENTRY_URL"]; + delete process.env["SENTRY_CUSTOM_HEADERS"]; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; _resetCustomHeadersCache(); }); afterEach(() => { if (savedHeaders !== undefined) { - process.env.SENTRY_CUSTOM_HEADERS = savedHeaders; + process.env["SENTRY_CUSTOM_HEADERS"] = savedHeaders; } else { - delete process.env.SENTRY_CUSTOM_HEADERS; + delete process.env["SENTRY_CUSTOM_HEADERS"]; } if (savedHost !== undefined) { - process.env.SENTRY_HOST = savedHost; + process.env["SENTRY_HOST"] = savedHost; } else { - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_HOST"]; } if (savedUrl !== undefined) { - process.env.SENTRY_URL = savedUrl; + process.env["SENTRY_URL"] = savedUrl; } else { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; } _resetCustomHeadersCache(); }); @@ -220,41 +220,41 @@ describe("getCustomHeaders", () => { }); test("returns empty array when headers set but no SENTRY_HOST (SaaS mode)", () => { - process.env.SENTRY_CUSTOM_HEADERS = "X-Test: value"; + process.env["SENTRY_CUSTOM_HEADERS"] = "X-Test: value"; expect(getCustomHeaders()).toEqual([]); }); test("returns empty array when SENTRY_HOST is sentry.io", () => { - process.env.SENTRY_CUSTOM_HEADERS = "X-Test: value"; - process.env.SENTRY_HOST = "sentry.io"; + process.env["SENTRY_CUSTOM_HEADERS"] = "X-Test: value"; + process.env["SENTRY_HOST"] = "sentry.io"; expect(getCustomHeaders()).toEqual([]); }); test("returns empty array when SENTRY_HOST is subdomain of sentry.io", () => { - process.env.SENTRY_CUSTOM_HEADERS = "X-Test: value"; - process.env.SENTRY_HOST = "us.sentry.io"; + process.env["SENTRY_CUSTOM_HEADERS"] = "X-Test: value"; + process.env["SENTRY_HOST"] = "us.sentry.io"; expect(getCustomHeaders()).toEqual([]); }); test("returns parsed headers when SENTRY_HOST is self-hosted", () => { - process.env.SENTRY_CUSTOM_HEADERS = "X-IAP-Token: abc123"; - process.env.SENTRY_HOST = "https://sentry.example.com"; + process.env["SENTRY_CUSTOM_HEADERS"] = "X-IAP-Token: abc123"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; expect(getCustomHeaders()).toEqual([["X-IAP-Token", "abc123"]]); }); test("returns parsed headers when SENTRY_URL is self-hosted", () => { - process.env.SENTRY_CUSTOM_HEADERS = "X-IAP-Token: abc123"; - process.env.SENTRY_URL = "https://sentry.example.com"; + process.env["SENTRY_CUSTOM_HEADERS"] = "X-IAP-Token: abc123"; + process.env["SENTRY_URL"] = "https://sentry.example.com"; expect(getCustomHeaders()).toEqual([["X-IAP-Token", "abc123"]]); }); test("sends custom headers to a claim-routed self-hosted instance", () => { - const previousToken = process.env.SENTRY_AUTH_TOKEN; - process.env.SENTRY_AUTH_TOKEN = mintSntrysToken({ + const previousToken = process.env["SENTRY_AUTH_TOKEN"]; + process.env["SENTRY_AUTH_TOKEN"] = mintSntrysToken({ iat: 1, url: "https://sentry.example.com", }); - process.env.SENTRY_CUSTOM_HEADERS = "X-IAP-Token: scoped-value"; + process.env["SENTRY_CUSTOM_HEADERS"] = "X-IAP-Token: scoped-value"; resetEnvTokenHostForTesting(); try { const trusted = new Headers(); @@ -266,30 +266,30 @@ describe("getCustomHeaders", () => { expect(other.get("X-IAP-Token")).toBeNull(); } finally { if (previousToken === undefined) { - delete process.env.SENTRY_AUTH_TOKEN; + delete process.env["SENTRY_AUTH_TOKEN"]; } else { - process.env.SENTRY_AUTH_TOKEN = previousToken; + process.env["SENTRY_AUTH_TOKEN"] = previousToken; } resetEnvTokenHostForTesting(); } }); test("env var takes priority over SQLite defaults", () => { - process.env.SENTRY_HOST = "https://sentry.example.com"; - process.env.SENTRY_CUSTOM_HEADERS = "X-Env: from-env"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; + process.env["SENTRY_CUSTOM_HEADERS"] = "X-Env: from-env"; setDefaultHeaders("X-Db: from-db"); expect(getCustomHeaders()).toEqual([["X-Env", "from-env"]]); }); test("falls back to SQLite defaults when env var not set", () => { - process.env.SENTRY_HOST = "https://sentry.example.com"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; setDefaultHeaders("X-Db: from-db"); expect(getCustomHeaders()).toEqual([["X-Db", "from-db"]]); }); test("caches parsed result across calls", () => { - process.env.SENTRY_CUSTOM_HEADERS = "X-Cache: test"; - process.env.SENTRY_HOST = "https://sentry.example.com"; + process.env["SENTRY_CUSTOM_HEADERS"] = "X-Cache: test"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; const first = getCustomHeaders(); const second = getCustomHeaders(); // Same reference (cached) @@ -310,23 +310,23 @@ describe("setCustomHeadersOverride", () => { let savedHost: string | undefined; beforeEach(() => { - savedHeaders = process.env.SENTRY_CUSTOM_HEADERS; - savedHost = process.env.SENTRY_HOST; - delete process.env.SENTRY_CUSTOM_HEADERS; - process.env.SENTRY_HOST = "https://sentry.example.com"; + savedHeaders = process.env["SENTRY_CUSTOM_HEADERS"]; + savedHost = process.env["SENTRY_HOST"]; + delete process.env["SENTRY_CUSTOM_HEADERS"]; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; _resetCustomHeadersCache(); }); afterEach(() => { if (savedHeaders !== undefined) { - process.env.SENTRY_CUSTOM_HEADERS = savedHeaders; + process.env["SENTRY_CUSTOM_HEADERS"] = savedHeaders; } else { - delete process.env.SENTRY_CUSTOM_HEADERS; + delete process.env["SENTRY_CUSTOM_HEADERS"]; } if (savedHost !== undefined) { - process.env.SENTRY_HOST = savedHost; + process.env["SENTRY_HOST"] = savedHost; } else { - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_HOST"]; } _resetCustomHeadersCache(); }); @@ -343,26 +343,26 @@ describe("setCustomHeadersOverride", () => { }); test("takes precedence over SENTRY_CUSTOM_HEADERS", () => { - process.env.SENTRY_CUSTOM_HEADERS = "X-Env: from-env"; + process.env["SENTRY_CUSTOM_HEADERS"] = "X-Env: from-env"; setCustomHeadersOverride({ "X-Option": "from-option" }); expect(getCustomHeaders()).toEqual([["X-Option", "from-option"]]); }); test("an empty map disables inherited env headers", () => { - process.env.SENTRY_CUSTOM_HEADERS = "X-Env: from-env"; + process.env["SENTRY_CUSTOM_HEADERS"] = "X-Env: from-env"; setCustomHeadersOverride({}); expect(getCustomHeaders()).toEqual([]); }); test("clearing falls back to SENTRY_CUSTOM_HEADERS", () => { - process.env.SENTRY_CUSTOM_HEADERS = "X-Env: from-env"; + process.env["SENTRY_CUSTOM_HEADERS"] = "X-Env: from-env"; setCustomHeadersOverride({ "X-Option": "from-option" }); setCustomHeadersOverride(undefined); expect(getCustomHeaders()).toEqual([["X-Env", "from-env"]]); }); test("is ignored when targeting SaaS", () => { - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_HOST"]; setCustomHeadersOverride({ "X-IAP-Token": "abc123" }); expect(getCustomHeaders()).toEqual([]); }); @@ -410,31 +410,32 @@ describe("applyCustomHeaders", () => { let savedHost: string | undefined; beforeEach(async () => { - savedHeaders = process.env.SENTRY_CUSTOM_HEADERS; - savedHost = process.env.SENTRY_HOST; + savedHeaders = process.env["SENTRY_CUSTOM_HEADERS"]; + savedHost = process.env["SENTRY_HOST"]; _resetCustomHeadersCache(); resetEnvTokenHostForTesting(); }); afterEach(async () => { if (savedHeaders !== undefined) { - process.env.SENTRY_CUSTOM_HEADERS = savedHeaders; + process.env["SENTRY_CUSTOM_HEADERS"] = savedHeaders; } else { - delete process.env.SENTRY_CUSTOM_HEADERS; + delete process.env["SENTRY_CUSTOM_HEADERS"]; } if (savedHost !== undefined) { - process.env.SENTRY_HOST = savedHost; + process.env["SENTRY_HOST"] = savedHost; } else { - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_HOST"]; } _resetCustomHeadersCache(); resetEnvTokenHostForTesting(); }); test("applies custom headers to Headers instance when request host matches", () => { - process.env.SENTRY_CUSTOM_HEADERS = "X-Test: hello; X-Other: world"; + process.env["SENTRY_CUSTOM_HEADERS"] = "X-Test: hello; X-Other: world"; // Pin env-token scope to the self-hosted instance so headers apply. - process.env.SENTRY_HOST = "https://sentry.example.com"; + // Pin env-token scope to the self-hosted instance so headers apply. + process.env["SENTRY_HOST"] = "https://sentry.example.com"; const headers = new Headers({ Accept: "application/json" }); applyCustomHeaders( @@ -447,8 +448,8 @@ describe("applyCustomHeaders", () => { }); test("does not clobber unrelated existing headers", () => { - process.env.SENTRY_CUSTOM_HEADERS = "X-Test: hello"; - process.env.SENTRY_HOST = "https://sentry.example.com"; + process.env["SENTRY_CUSTOM_HEADERS"] = "X-Test: hello"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; const headers = new Headers({ Accept: "application/json" }); applyCustomHeaders( @@ -461,8 +462,8 @@ describe("applyCustomHeaders", () => { }); test("no-op when no custom headers configured", () => { - delete process.env.SENTRY_CUSTOM_HEADERS; - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_CUSTOM_HEADERS"]; + delete process.env["SENTRY_HOST"]; const headers = new Headers({ Accept: "application/json" }); applyCustomHeaders(headers, "https://sentry.io/api/0/"); @@ -474,8 +475,9 @@ describe("applyCustomHeaders", () => { test("skips custom headers when request URL host does not match trusted host (CVE defense)", () => { // Self-hosted user has IAP token configured for their proxy: - process.env.SENTRY_CUSTOM_HEADERS = "X-IAP-Token: secret"; - process.env.SENTRY_HOST = "https://sentry.example.com"; + // Self-hosted user has IAP token configured for their proxy: + process.env["SENTRY_CUSTOM_HEADERS"] = "X-IAP-Token: secret"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; // A share URL from an attacker resolves to evil.example.com. Even though // applyCustomHeaders is on a non-SaaS codepath (isSelfHosted()==true for diff --git a/packages/cli/test/lib/db/account-routing.test.ts b/packages/cli/test/lib/db/account-routing.test.ts index a67e56957a..988fa2cf1c 100644 --- a/packages/cli/test/lib/db/account-routing.test.ts +++ b/packages/cli/test/lib/db/account-routing.test.ts @@ -118,7 +118,7 @@ describe("server-based selection", () => { login("acme-token", ACME, "acme-user"); const saas = login("saas-token", SAAS, "saas-user"); - process.env.SENTRY_URL = ACME; + process.env["SENTRY_URL"] = ACME; expect(getAuthToken()).toBe("acme-token"); expect(getUserInfo()?.userId).toBe("acme-user"); @@ -128,7 +128,7 @@ describe("server-based selection", () => { test("keeps the active account when no stored account is on that server", () => { login("saas-token", SAAS, "saas-user"); - process.env.SENTRY_URL = "https://sentry.other.com"; + process.env["SENTRY_URL"] = "https://sentry.other.com"; expect(getAuthToken()).toBe("saas-token"); }); @@ -137,7 +137,7 @@ describe("server-based selection", () => { login("saas-token", SAAS, "saas-user"); login("acme-token", ACME, "acme-user"); - process.env.SENTRY_URL = "https://us.sentry.io"; + process.env["SENTRY_URL"] = "https://us.sentry.io"; expect(getAuthToken()).toBe("saas-token"); }); @@ -255,11 +255,11 @@ describe("organization-based selection", () => { login("saas-token", SAAS, "saas"); seeOrgList(SAAS, ["saas-org"]); - process.env.SENTRY_HOST = SAAS; + process.env["SENTRY_HOST"] = SAAS; selectAccountForOrg("acme-org"); expect(getAuthToken()).toBe("saas-token"); - expect(process.env.SENTRY_HOST).toBe(SAAS); + expect(process.env["SENTRY_HOST"]).toBe(SAAS); }); test("the persisted default URL yields to the org's account server", () => { @@ -267,13 +267,13 @@ describe("organization-based selection", () => { seeOrg("saas-org", SAAS); login("acme-token", ACME, "acme"); seeOrgList(ACME, ["acme-org"]); - process.env.SENTRY_URL = ACME; + process.env["SENTRY_URL"] = ACME; markPersistedDefaultUrl(ACME); selectAccountForOrg("saas-org"); expect(getAuthToken()).toBe("saas-token"); - expect(process.env.SENTRY_URL).toBe(SAAS); + expect(process.env["SENTRY_URL"]).toBe(SAAS); }); test("a self-hosted org's account brings its server along", () => { @@ -285,7 +285,7 @@ describe("organization-based selection", () => { selectAccountForOrg("acme-org"); expect(getAuthToken()).toBe("acme-token"); - expect(process.env.SENTRY_URL).toBe(ACME); + expect(process.env["SENTRY_URL"]).toBe(ACME); }); test("a forced env token is never overridden", () => { @@ -293,8 +293,8 @@ describe("organization-based selection", () => { seeOrg("work-org", SAAS); login("personal-token", SAAS, "personal"); seeOrgList(SAAS, ["personal-org"]); - process.env.SENTRY_AUTH_TOKEN = "env-token"; - process.env.SENTRY_FORCE_ENV_TOKEN = "1"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; + process.env["SENTRY_FORCE_ENV_TOKEN"] = "1"; selectAccountForOrg("work-org"); @@ -305,8 +305,8 @@ describe("organization-based selection", () => { "SENTRY_FORCE_ENV_TOKEN=%s doesn't force the env token", (value) => { login("work-token", SAAS, "work"); - process.env.SENTRY_AUTH_TOKEN = "env-token"; - process.env.SENTRY_FORCE_ENV_TOKEN = value; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; + process.env["SENTRY_FORCE_ENV_TOKEN"] = value; expect(getAuthToken()).toBe("work-token"); }, @@ -391,7 +391,7 @@ describe("organization-based selection", () => { ); setLastUsed.run(1000, peer); setLastUsed.run(2000, other); - process.env.SENTRY_URL = ACME; + process.env["SENTRY_URL"] = ACME; expect(getAuthToken()).toBe("other-token"); selectAccountForOrg("acme-org"); @@ -568,7 +568,7 @@ describe("requests whose path names an organization", () => { seeOrg("acme-org", ACME); login("saas-token", SAAS, "saas"); seeOrgList(SAAS, ["saas-org"]); - process.env.SENTRY_URL = SAAS; + process.env["SENTRY_URL"] = SAAS; await rawApiRequest("organizations/acme-org/"); @@ -605,7 +605,7 @@ describe("the env token as an account", () => { } test("is an account on SaaS when no server is configured", () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; expect(getEnvAccount()).toEqual({ envVar: "SENTRY_AUTH_TOKEN", @@ -615,8 +615,8 @@ describe("the env token as an account", () => { }); test("is an account on its org auth token's server", () => { - process.env.SENTRY_TOKEN = ACME_ORG_TOKEN; - process.env.SENTRY_URL = ACME; + process.env["SENTRY_TOKEN"] = ACME_ORG_TOKEN; + process.env["SENTRY_URL"] = ACME; expect(getEnvAccount()?.host).toBe(ACME); expect(getEnvAccount()?.envVar).toBe("SENTRY_TOKEN"); @@ -625,15 +625,17 @@ describe("the env token as an account", () => { test("is no account on a self-hosted server only the env names", () => { // In layered CI, SENTRY_URL can be injected without access to the // token: it alone must not make the token an account sent there. - process.env.SENTRY_TOKEN = "env-token"; - process.env.SENTRY_URL = ACME; + // In layered CI, SENTRY_URL can be injected without access to the + // token: it alone must not make the token an account sent there. + process.env["SENTRY_TOKEN"] = "env-token"; + process.env["SENTRY_URL"] = ACME; expect(getEnvAccount()).toBeUndefined(); }); test("is an account on a SaaS server named by the env", () => { - process.env.SENTRY_TOKEN = "env-token"; - process.env.SENTRY_URL = "https://us.sentry.io"; + process.env["SENTRY_TOKEN"] = "env-token"; + process.env["SENTRY_URL"] = "https://us.sentry.io"; expect(getEnvAccount()?.host).toBe("https://us.sentry.io"); }); @@ -642,7 +644,7 @@ describe("the env token as an account", () => { login("saas-token", SAAS, "saas"); // The boot snapshot saw no env token. getEnvTokenHost(); - process.env.SENTRY_AUTH_TOKEN = "rc-token"; + process.env["SENTRY_AUTH_TOKEN"] = "rc-token"; envSeesOrg("rc-token", "rc-org", SAAS); selectAccountForOrg("rc-org"); @@ -652,7 +654,7 @@ describe("the env token as an account", () => { }); test("wins over the active account for an org both know", () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; const saas = login("saas-token", SAAS, "saas"); seeOrgList(SAAS, ["shared"]); envSeesOrg("env-token", "shared", SAAS); @@ -665,7 +667,7 @@ describe("the env token as an account", () => { }); test("wins over another stored account that knows the org", () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; login("work-token", SAAS, "work"); seeOrg("env-org", SAAS); login("personal-token", SAAS, "personal"); @@ -677,7 +679,7 @@ describe("the env token as an account", () => { }); test("matches DSN-style numeric org ids", () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; login("saas-token", SAAS, "saas"); setOrgRegions([ { @@ -696,8 +698,8 @@ describe("the env token as an account", () => { }); test("ignores orgs it saw while scoped to another server", () => { - process.env.SENTRY_AUTH_TOKEN = ACME_ORG_TOKEN; - process.env.SENTRY_URL = ACME; + process.env["SENTRY_AUTH_TOKEN"] = ACME_ORG_TOKEN; + process.env["SENTRY_URL"] = ACME; login("acme-token", ACME, "acme"); seeOrg("shared", ACME); // Cached under the same identity on SaaS: ACME's `shared` is a @@ -711,7 +713,7 @@ describe("the env token as an account", () => { }); test("matches orgs it saw on a SaaS region of its SaaS server", () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; login("saas-token", SAAS, "saas"); envSeesOrg("env-token", "eu-org", "https://de.sentry.io"); @@ -721,7 +723,7 @@ describe("the env token as an account", () => { }); test("ignores orgs it saw on look-alike SaaS servers", () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; login("saas-token", SAAS, "saas"); envSeesOrg("env-token", "lookalike", "https://sentry.io.example.com"); envSeesOrg("env-token", "lookalike", "https://notsentry.io"); @@ -733,7 +735,7 @@ describe("the env token as an account", () => { }); test("leaves orgs it doesn't know to the stored login", () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; login("saas-token", SAAS, "saas"); envSeesOrg("env-token", "env-org", SAAS); @@ -743,14 +745,14 @@ describe("the env token as an account", () => { }); test("an explicit server set after boot on another server rules it out", () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; // Boot: the env token is scoped to SaaS before `--url` or // `.sentryclirc` point the invocation at ACME. getEnvTokenHost(); login("acme-token", ACME, "acme"); seeOrg("shared", ACME); envSeesOrg("env-token", "shared", SAAS); - process.env.SENTRY_URL = ACME; + process.env["SENTRY_URL"] = ACME; selectAccountForOrg("shared"); @@ -758,22 +760,22 @@ describe("the env token as an account", () => { }); test("brings its server along when the persisted default URL is another", () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; // Boot: the persisted default URL is applied after the snapshot. getEnvTokenHost(); login("acme-token", ACME, "acme"); envSeesOrg("env-token", "env-org", SAAS); - process.env.SENTRY_URL = ACME; + process.env["SENTRY_URL"] = ACME; markPersistedDefaultUrl(ACME); selectAccountForOrg("env-org"); - expect(process.env.SENTRY_URL).toBe(SAAS); + expect(process.env["SENTRY_URL"]).toBe(SAAS); expect(getAuthToken()).toBe("env-token"); }); test("never mixes with a stored account within one invocation", () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; login("work-token", SAAS, "work"); seeOrg("work-org", SAAS); login("personal-token", SAAS, "personal"); @@ -786,7 +788,7 @@ describe("the env token as an account", () => { }); test("a login during the invocation takes over from it", () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; login("saas-token", SAAS, "saas"); envSeesOrg("env-token", "env-org", SAAS); selectAccountForOrg("env-org"); @@ -797,24 +799,24 @@ describe("the env token as an account", () => { }); test("serves its configured server when no stored account is on it", () => { - process.env.SENTRY_AUTH_TOKEN = ACME_ORG_TOKEN; - process.env.SENTRY_URL = ACME; + process.env["SENTRY_AUTH_TOKEN"] = ACME_ORG_TOKEN; + process.env["SENTRY_URL"] = ACME; login("saas-token", SAAS, "saas"); expect(getAuthToken()).toBe(ACME_ORG_TOKEN); }); test("never serves a self-hosted server only the env names", () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; - process.env.SENTRY_URL = ACME; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; + process.env["SENTRY_URL"] = ACME; login("saas-token", SAAS, "saas"); expect(getAuthToken()).not.toBe("env-token"); }); test("yields its configured server to a stored account on it", () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; - process.env.SENTRY_URL = ACME; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; + process.env["SENTRY_URL"] = ACME; login("acme-token", ACME, "acme"); login("saas-token", SAAS, "saas"); @@ -822,7 +824,7 @@ describe("the env token as an account", () => { }); test("still yields to the active stored login by default", () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; login("saas-token", SAAS, "saas"); expect(getAuthToken()).toBe("saas-token"); @@ -883,7 +885,7 @@ describe("logging in after an org picked the account", () => { test("a configured server never redirects re-authentication to its account", () => { const acme = login("acme-token", ACME, "acme"); const saas = login("saas-token", SAAS, "saas"); - process.env.SENTRY_URL = ACME; + process.env["SENTRY_URL"] = ACME; expect(getAuthToken()).toBe("acme-token"); // A SaaS login replaces the SaaS account, whatever SENTRY_URL says. @@ -1015,7 +1017,7 @@ describe("pasted Sentry URLs", () => { test("a SaaS URL selects the SaaS account when self-hosted is active", () => { login("saas-token", SAAS, "saas"); login("acme-token", ACME, "acme"); - process.env.SENTRY_URL = ACME; + process.env["SENTRY_URL"] = ACME; applySentryUrlContext("https://acme-org.sentry.io"); @@ -1033,7 +1035,7 @@ describe("pasted Sentry URLs", () => { applySentryUrlContext("https://shared.sentry.io"); selectAccountForOrg("shared"); - expect(process.env.SENTRY_URL).toBe(SAAS); + expect(process.env["SENTRY_URL"]).toBe(SAAS); expect(getAuthToken()).toBe("saas-token"); }); @@ -1043,13 +1045,14 @@ describe("pasted Sentry URLs", () => { login("saas-token", SAAS, "saas"); seeOrgList(SAAS, ["alpha"]); // `defaults.url` is SaaS and was applied at startup. - process.env.SENTRY_URL = SAAS; + // `defaults.url` is SaaS and was applied at startup. + process.env["SENTRY_URL"] = SAAS; markPersistedDefaultUrl(SAAS); applySentryUrlContext("https://shared.sentry.io"); selectAccountForOrg("shared"); - expect(process.env.SENTRY_URL).toBe(SAAS); + expect(process.env["SENTRY_URL"]).toBe(SAAS); expect(getAuthToken()).toBe("saas-token"); }); @@ -1064,7 +1067,7 @@ describe("pasted Sentry URLs", () => { applySentryUrlContext("https://shared.sentry.io"); selectAccountForOrg("shared"); - expect(process.env.SENTRY_URL).toBe(SAAS); + expect(process.env["SENTRY_URL"]).toBe(SAAS); expect(getAuthToken()).not.toBe("acme-token"); }); @@ -1080,31 +1083,33 @@ describe("pasted Sentry URLs", () => { // Pinned to SaaS: the self-hosted account that knows the slug is never // picked; the active one stays and the SaaS host check refuses it. - expect(process.env.SENTRY_URL).toBe(SAAS); + expect(process.env["SENTRY_URL"]).toBe(SAAS); expect(getAuthToken()).toBe("acme-token"); }); test("a SaaS URL with a single self-hosted login keeps using that login", () => { login("acme-token", ACME, "acme"); - process.env.SENTRY_URL = ACME; + process.env["SENTRY_URL"] = ACME; applySentryUrlContext("https://acme-org.sentry.io"); - expect(process.env.SENTRY_URL).toBeUndefined(); + expect(process.env["SENTRY_URL"]).toBeUndefined(); expect(getAuthToken()).toBe("acme-token"); }); test("a SaaS URL never snapshots an env token's host", () => { login("saas-token", SAAS, "saas"); - process.env.SENTRY_AUTH_TOKEN = "env-token"; - process.env.SENTRY_FORCE_ENV_TOKEN = "1"; - process.env.SENTRY_URL = ACME; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; + process.env["SENTRY_FORCE_ENV_TOKEN"] = "1"; + process.env["SENTRY_URL"] = ACME; applySentryUrlContext("https://acme-org.sentry.io"); // Had the URL handling read the env token's host after clearing the // URL, it would be pinned to SaaS; captured now, it is still ACME. - process.env.SENTRY_URL = ACME; + // Had the URL handling read the env token's host after clearing the + // URL, it would be pinned to SaaS; captured now, it is still ACME. + process.env["SENTRY_URL"] = ACME; expect(getEnvTokenHost()).toBe(ACME); }); diff --git a/packages/cli/test/lib/db/accounts.test.ts b/packages/cli/test/lib/db/accounts.test.ts index 60e86f01fd..e04c68161b 100644 --- a/packages/cli/test/lib/db/accounts.test.ts +++ b/packages/cli/test/lib/db/accounts.test.ts @@ -185,8 +185,8 @@ describe("legacy accounts without a host", () => { test("switching to one backfills its host before it is used", async () => { const { resetEnvTokenHostForTesting } = await import("../../../src/lib/env-token-host.js"); - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; resetEnvTokenHostForTesting(); getDatabase() .query( diff --git a/packages/cli/test/lib/db/auth-concurrency.focused.test.ts b/packages/cli/test/lib/db/auth-concurrency.focused.test.ts index 907bbbb0db..e1e1f3f885 100644 --- a/packages/cli/test/lib/db/auth-concurrency.focused.test.ts +++ b/packages/cli/test/lib/db/auth-concurrency.focused.test.ts @@ -7,7 +7,7 @@ import { setAuthToken, } from "../../../src/lib/db/auth.js"; import { ConfigError } from "../../../src/lib/errors.js"; -import { useEnvSandbox, useTestConfigDir } from "../../helpers.js"; +import { useEnvSandbox, useTestConfigDir, must } from "../../helpers.js"; useTestConfigDir("auth-refresh-cas-"); useEnvSandbox([ @@ -27,10 +27,10 @@ function deferred() { } beforeEach(async () => { - process.env.SENTRY_CLIENT_ID = "test-client-id"; - delete process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_TOKEN; - delete process.env.SENTRY_FORCE_ENV_TOKEN; + process.env["SENTRY_CLIENT_ID"] = "test-client-id"; + delete process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_TOKEN"]; + delete process.env["SENTRY_FORCE_ENV_TOKEN"]; await clearAuth(); }); afterEach(async () => { @@ -55,8 +55,7 @@ describe("OAuth refresh compare-and-swap", () => { setAuthToken("first-access", 3600, "first-refresh", { host: "https://control.example.com", }); - const pinned = getCredentialContext(); - expect(pinned).toBeDefined(); + const pinned = must(getCredentialContext(), "the credential context"); const requests = { count: 0 }; globalThis.fetch = async () => { requests.count += 1; diff --git a/packages/cli/test/lib/db/auth.host.test.ts b/packages/cli/test/lib/db/auth.host.test.ts index 5f35623792..8cdda4e117 100644 --- a/packages/cli/test/lib/db/auth.host.test.ts +++ b/packages/cli/test/lib/db/auth.host.test.ts @@ -39,34 +39,34 @@ describe("db/auth host scoping", () => { }); test("setAuthToken without host explicit uses configured host", () => { - const prevHost = process.env.SENTRY_HOST; - process.env.SENTRY_HOST = "https://env-host.example.com"; + const prevHost = process.env["SENTRY_HOST"]; + process.env["SENTRY_HOST"] = "https://env-host.example.com"; try { setAuthToken("tok-2"); expect(getStoredAuthHost()).toBe("https://env-host.example.com"); } finally { if (prevHost === undefined) { - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_HOST"]; } else { - process.env.SENTRY_HOST = prevHost; + process.env["SENTRY_HOST"] = prevHost; } } }); test("setAuthToken without host falls back to DEFAULT_SENTRY_URL", () => { - const prevHost = process.env.SENTRY_HOST; - const prevUrl = process.env.SENTRY_URL; - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + const prevHost = process.env["SENTRY_HOST"]; + const prevUrl = process.env["SENTRY_URL"]; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; try { setAuthToken("tok-3"); expect(getStoredAuthHost()).toBe("https://sentry.io"); } finally { if (prevHost !== undefined) { - process.env.SENTRY_HOST = prevHost; + process.env["SENTRY_HOST"] = prevHost; } if (prevUrl !== undefined) { - process.env.SENTRY_URL = prevUrl; + process.env["SENTRY_URL"] = prevUrl; } } }); @@ -95,8 +95,8 @@ describe("db/auth host scoping", () => { const { captureEnvTokenHost, resetEnvTokenHostForTesting } = await import("../../../src/lib/env-token-host.js"); resetEnvTokenHostForTesting(); - const prevHost = process.env.SENTRY_HOST; - process.env.SENTRY_HOST = "https://legacy-configured.example.com"; + const prevHost = process.env["SENTRY_HOST"]; + process.env["SENTRY_HOST"] = "https://legacy-configured.example.com"; captureEnvTokenHost(); try { @@ -112,9 +112,9 @@ describe("db/auth host scoping", () => { expect(row.host).toBe("https://legacy-configured.example.com"); } finally { if (prevHost === undefined) { - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_HOST"]; } else { - process.env.SENTRY_HOST = prevHost; + process.env["SENTRY_HOST"] = prevHost; } resetEnvTokenHostForTesting(); } @@ -129,20 +129,20 @@ describe("db/auth host scoping", () => { const { captureEnvTokenHost, resetEnvTokenHostForTesting } = await import("../../../src/lib/env-token-host.js"); resetEnvTokenHostForTesting(); - const prevHost = process.env.SENTRY_HOST; - const prevUrl = process.env.SENTRY_URL; - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + const prevHost = process.env["SENTRY_HOST"]; + const prevUrl = process.env["SENTRY_URL"]; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; captureEnvTokenHost(); // captures DEFAULT_SENTRY_URL (SaaS) try { expect(getStoredAuthHost()).toBe("https://sentry.io"); } finally { if (prevHost !== undefined) { - process.env.SENTRY_HOST = prevHost; + process.env["SENTRY_HOST"] = prevHost; } if (prevUrl !== undefined) { - process.env.SENTRY_URL = prevUrl; + process.env["SENTRY_URL"] = prevUrl; } resetEnvTokenHostForTesting(); } @@ -162,28 +162,29 @@ describe("db/auth host scoping", () => { const { captureEnvTokenHost, resetEnvTokenHostForTesting } = await import("../../../src/lib/env-token-host.js"); resetEnvTokenHostForTesting(); - const prevHost = process.env.SENTRY_HOST; - const prevUrl = process.env.SENTRY_URL; - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + const prevHost = process.env["SENTRY_HOST"]; + const prevUrl = process.env["SENTRY_URL"]; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; captureEnvTokenHost(); // snapshots SaaS default // Simulate rc shim writing env.SENTRY_URL AFTER boot - process.env.SENTRY_URL = "https://rc-sourced.example.com"; + // Simulate rc shim writing env.SENTRY_URL AFTER boot + process.env["SENTRY_URL"] = "https://rc-sourced.example.com"; try { // Must migrate to the BOOT snapshot (SaaS), not the rc-sourced URL expect(getStoredAuthHost()).toBe("https://sentry.io"); } finally { if (prevHost !== undefined) { - process.env.SENTRY_HOST = prevHost; + process.env["SENTRY_HOST"] = prevHost; } else { - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_HOST"]; } if (prevUrl !== undefined) { - process.env.SENTRY_URL = prevUrl; + process.env["SENTRY_URL"] = prevUrl; } else { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; } resetEnvTokenHostForTesting(); } diff --git a/packages/cli/test/lib/db/auth.property.test.ts b/packages/cli/test/lib/db/auth.property.test.ts index b21935e0af..df5cf1e916 100644 --- a/packages/cli/test/lib/db/auth.property.test.ts +++ b/packages/cli/test/lib/db/auth.property.test.ts @@ -52,8 +52,8 @@ describe("property: env var priority", () => { fcAssert( property(tokenArb, tokenArb, (authToken, sentryToken) => { resetAuthCaches(); - process.env.SENTRY_AUTH_TOKEN = authToken; - process.env.SENTRY_TOKEN = sentryToken; + process.env["SENTRY_AUTH_TOKEN"] = authToken; + process.env["SENTRY_TOKEN"] = sentryToken; expect(getAuthToken()).toBe(authToken.trim()); expect(getAuthConfig()?.source).toBe( @@ -69,7 +69,7 @@ describe("property: env var priority", () => { property(tokenArb, storedTokenArb, (envToken, storedToken) => { resetAuthCaches(); setAuthToken(storedToken); - process.env.SENTRY_AUTH_TOKEN = envToken; + process.env["SENTRY_AUTH_TOKEN"] = envToken; // Stored OAuth takes priority — env token is for build tooling expect(getAuthToken()).toBe(storedToken); @@ -85,16 +85,16 @@ describe("property: env var priority", () => { property(tokenArb, storedTokenArb, (envToken, storedToken) => { resetAuthCaches(); setAuthToken(storedToken); - process.env.SENTRY_AUTH_TOKEN = envToken; + process.env["SENTRY_AUTH_TOKEN"] = envToken; try { - process.env.SENTRY_FORCE_ENV_TOKEN = "1"; + process.env["SENTRY_FORCE_ENV_TOKEN"] = "1"; resetAuthCaches(); expect(getAuthToken()).toBe(envToken.trim()); expect(getAuthConfig()?.source).toBe( "env:SENTRY_AUTH_TOKEN" satisfies AuthSource, ); } finally { - delete process.env.SENTRY_FORCE_ENV_TOKEN; + delete process.env["SENTRY_FORCE_ENV_TOKEN"]; resetAuthCaches(); } }), @@ -121,7 +121,7 @@ describe("property: env tokens never trigger refresh", () => { await fcAssert( asyncProperty(tokenArb, async (envToken) => { resetAuthCaches(); - process.env.SENTRY_AUTH_TOKEN = envToken; + process.env["SENTRY_AUTH_TOKEN"] = envToken; const result = await refreshToken(); expect(result.token).toBe(envToken.trim()); @@ -137,7 +137,7 @@ describe("property: env tokens never trigger refresh", () => { await fcAssert( asyncProperty(tokenArb, async (envToken) => { resetAuthCaches(); - process.env.SENTRY_AUTH_TOKEN = envToken; + process.env["SENTRY_AUTH_TOKEN"] = envToken; const result = await refreshToken({ force: true }); expect(result.token).toBe(envToken.trim()); @@ -154,8 +154,8 @@ describe("property: isEnvTokenActive consistency", () => { property(option(storedTokenArb), (storedTokenOpt) => { resetAuthCaches(); // Clean slate — no env tokens - delete process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_TOKEN; + delete process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_TOKEN"]; if (storedTokenOpt !== null) { setAuthToken(storedTokenOpt); @@ -179,7 +179,7 @@ describe("property: source round-trip", () => { fcAssert( property(tokenArb, (token) => { resetAuthCaches(); - process.env.SENTRY_AUTH_TOKEN = token; + process.env["SENTRY_AUTH_TOKEN"] = token; const config = getAuthConfig(); expect(config?.source).toBe("env:SENTRY_AUTH_TOKEN"); // Verify we can extract the env var name @@ -193,7 +193,7 @@ describe("property: source round-trip", () => { fcAssert( property(tokenArb, (token) => { resetAuthCaches(); - process.env.SENTRY_TOKEN = token; + process.env["SENTRY_TOKEN"] = token; const config = getAuthConfig(); expect(config?.source).toBe("env:SENTRY_TOKEN"); expect(config?.source.slice(4)).toBe("SENTRY_TOKEN"); diff --git a/packages/cli/test/lib/db/auth.test.ts b/packages/cli/test/lib/db/auth.test.ts index 37740e0859..0190bd1ad7 100644 --- a/packages/cli/test/lib/db/auth.test.ts +++ b/packages/cli/test/lib/db/auth.test.ts @@ -37,26 +37,26 @@ useEnvSandbox(["SENTRY_AUTH_TOKEN", "SENTRY_TOKEN", "SENTRY_FORCE_ENV_TOKEN"]); describe("env var auth: getAuthToken edge cases", () => { test("ignores empty SENTRY_AUTH_TOKEN", () => { - process.env.SENTRY_AUTH_TOKEN = ""; + process.env["SENTRY_AUTH_TOKEN"] = ""; setAuthToken("stored_token"); expect(getAuthToken()).toBe("stored_token"); }); test("ignores whitespace-only SENTRY_AUTH_TOKEN", () => { - process.env.SENTRY_AUTH_TOKEN = " "; + process.env["SENTRY_AUTH_TOKEN"] = " "; setAuthToken("stored_token"); expect(getAuthToken()).toBe("stored_token"); }); test("trims whitespace from env var", () => { - process.env.SENTRY_AUTH_TOKEN = " token_with_spaces "; + process.env["SENTRY_AUTH_TOKEN"] = " token_with_spaces "; expect(getAuthToken()).toBe("token_with_spaces"); }); }); describe("env var auth: getAuthConfig shape", () => { test("env config has no refreshToken or expiry", () => { - process.env.SENTRY_AUTH_TOKEN = "test_token"; + process.env["SENTRY_AUTH_TOKEN"] = "test_token"; const config = getAuthConfig(); expect(config?.refreshToken).toBeUndefined(); expect(config?.expiresAt).toBeUndefined(); @@ -66,7 +66,7 @@ describe("env var auth: getAuthConfig shape", () => { describe("env var auth: isAuthenticated", () => { test("returns true when env var is set", async () => { - process.env.SENTRY_AUTH_TOKEN = "test_token"; + process.env["SENTRY_AUTH_TOKEN"] = "test_token"; expect(isAuthenticated()).toBe(true); }); @@ -77,15 +77,15 @@ describe("env var auth: isAuthenticated", () => { describe("env var auth: isEnvTokenActive edge case", () => { test("returns false for empty env var", () => { - process.env.SENTRY_AUTH_TOKEN = ""; + process.env["SENTRY_AUTH_TOKEN"] = ""; expect(isEnvTokenActive()).toBe(false); }); }); describe("env var auth: getActiveEnvVarName", () => { test("prefers SENTRY_AUTH_TOKEN when both are set", () => { - process.env.SENTRY_AUTH_TOKEN = "primary"; - process.env.SENTRY_TOKEN = "secondary"; + process.env["SENTRY_AUTH_TOKEN"] = "primary"; + process.env["SENTRY_TOKEN"] = "secondary"; expect(getActiveEnvVarName()).toBe("SENTRY_AUTH_TOKEN"); }); @@ -96,7 +96,7 @@ describe("env var auth: getActiveEnvVarName", () => { describe("env var auth: refreshToken edge cases", () => { test("env token used when no stored OAuth exists", async () => { - process.env.SENTRY_AUTH_TOKEN = "env_token"; + process.env["SENTRY_AUTH_TOKEN"] = "env_token"; const result = await refreshToken(); expect(result.token).toBe("env_token"); expect(result.refreshed).toBe(false); @@ -104,7 +104,7 @@ describe("env var auth: refreshToken edge cases", () => { test("stored OAuth preferred over env token", async () => { setAuthToken("stored_token", 3600); - process.env.SENTRY_AUTH_TOKEN = "env_token"; + process.env["SENTRY_AUTH_TOKEN"] = "env_token"; const result = await refreshToken(); expect(result.token).toBe("stored_token"); expect(result.refreshed).toBe(false); @@ -112,19 +112,19 @@ describe("env var auth: refreshToken edge cases", () => { test("SENTRY_FORCE_ENV_TOKEN overrides stored OAuth in refreshToken", async () => { setAuthToken("stored_token", 3600); - process.env.SENTRY_AUTH_TOKEN = "env_token"; + process.env["SENTRY_AUTH_TOKEN"] = "env_token"; try { - process.env.SENTRY_FORCE_ENV_TOKEN = "1"; + process.env["SENTRY_FORCE_ENV_TOKEN"] = "1"; const result = await refreshToken(); expect(result.token).toBe("env_token"); expect(result.refreshed).toBe(false); } finally { - delete process.env.SENTRY_FORCE_ENV_TOKEN; + delete process.env["SENTRY_FORCE_ENV_TOKEN"]; } }); test("has no expiresAt or expiresIn for env tokens", async () => { - process.env.SENTRY_AUTH_TOKEN = "env_token"; + process.env["SENTRY_AUTH_TOKEN"] = "env_token"; const result = await refreshToken(); expect(result.expiresAt).toBeUndefined(); expect(result.expiresIn).toBeUndefined(); @@ -147,8 +147,8 @@ describe("env var auth: getRawEnvToken", () => { ); test("keeps a control-only primary credential selected over the alias", () => { - process.env.SENTRY_AUTH_TOKEN = "\x01\x7f"; - process.env.SENTRY_TOKEN = "secondary-token"; + process.env["SENTRY_AUTH_TOKEN"] = "\x01\x7f"; + process.env["SENTRY_TOKEN"] = "secondary-token"; expect(getRawEnvToken()).toBe("\x01\x7f"); expect(getAuthConfig()).toMatchObject({ token: "\x01\x7f", @@ -158,8 +158,8 @@ describe("env var auth: getRawEnvToken", () => { }); test("still selects the alias when the primary is only whitespace", () => { - process.env.SENTRY_AUTH_TOKEN = " \t\n\u00a0"; - process.env.SENTRY_TOKEN = "\x01secondary-token\x7f"; + process.env["SENTRY_AUTH_TOKEN"] = " \t\n\u00a0"; + process.env["SENTRY_TOKEN"] = "\x01secondary-token\x7f"; expect(getRawEnvToken()).toBe("secondary-token"); expect(getActiveEnvVarName()).toBe("SENTRY_TOKEN"); }); @@ -197,14 +197,14 @@ describe("stored credential validation", () => { describe("OAuth-preferred auth (#646)", () => { test("getAuthConfig prefers stored OAuth over env token", () => { setAuthToken("stored_oauth", 3600); - process.env.SENTRY_AUTH_TOKEN = "env_token"; + process.env["SENTRY_AUTH_TOKEN"] = "env_token"; const config = getAuthConfig(); expect(config?.source).toBe("oauth"); expect(config?.token).toBe("stored_oauth"); }); test("getAuthConfig falls back to env token when no stored OAuth", () => { - process.env.SENTRY_AUTH_TOKEN = "env_token"; + process.env["SENTRY_AUTH_TOKEN"] = "env_token"; const config = getAuthConfig(); expect(config?.source).toBe("env:SENTRY_AUTH_TOKEN"); expect(config?.token).toBe("env_token"); @@ -212,20 +212,20 @@ describe("OAuth-preferred auth (#646)", () => { test("getAuthToken skips expired stored token and falls to env", () => { setAuthToken("expired_token", -1); - process.env.SENTRY_AUTH_TOKEN = "env_token"; + process.env["SENTRY_AUTH_TOKEN"] = "env_token"; expect(getAuthToken()).toBe("env_token"); }); test("SENTRY_FORCE_ENV_TOKEN makes getAuthConfig prefer env token", () => { setAuthToken("stored_oauth", 3600); - process.env.SENTRY_AUTH_TOKEN = "env_token"; + process.env["SENTRY_AUTH_TOKEN"] = "env_token"; try { - process.env.SENTRY_FORCE_ENV_TOKEN = "1"; + process.env["SENTRY_FORCE_ENV_TOKEN"] = "1"; const config = getAuthConfig(); expect(config?.source).toBe("env:SENTRY_AUTH_TOKEN"); expect(config?.token).toBe("env_token"); } finally { - delete process.env.SENTRY_FORCE_ENV_TOKEN; + delete process.env["SENTRY_FORCE_ENV_TOKEN"]; } }); }); @@ -270,7 +270,7 @@ describe("getIdentityFingerprint", () => { }); test("returns a stable full SHA-256 fingerprint for a given env token", () => { - process.env.SENTRY_AUTH_TOKEN = "sntrys_alice"; + process.env["SENTRY_AUTH_TOKEN"] = "sntrys_alice"; const fp1 = getIdentityFingerprint(); const fp2 = getIdentityFingerprint(); expect(fp1).toMatch(/^[0-9a-f]{64}$/); @@ -278,9 +278,9 @@ describe("getIdentityFingerprint", () => { }); test("different env tokens produce different fingerprints", () => { - process.env.SENTRY_AUTH_TOKEN = "sntrys_alice"; + process.env["SENTRY_AUTH_TOKEN"] = "sntrys_alice"; const aliceFp = getIdentityFingerprint(); - process.env.SENTRY_AUTH_TOKEN = "sntrys_bob"; + process.env["SENTRY_AUTH_TOKEN"] = "sntrys_bob"; resetIdentityFingerprintCache(); const bobFp = getIdentityFingerprint(); expect(aliceFp).not.toBe(bobFp); @@ -289,10 +289,12 @@ describe("getIdentityFingerprint", () => { test("SENTRY_AUTH_TOKEN and SENTRY_TOKEN produce the same fingerprint", () => { // Same secret value → same fingerprint regardless of which env var // holds it (the variable name is not part of the identity). - process.env.SENTRY_AUTH_TOKEN = "same_token"; + // Same secret value → same fingerprint regardless of which env var + // holds it (the variable name is not part of the identity). + process.env["SENTRY_AUTH_TOKEN"] = "same_token"; const authFp = getIdentityFingerprint(); - delete process.env.SENTRY_AUTH_TOKEN; - process.env.SENTRY_TOKEN = "same_token"; + delete process.env["SENTRY_AUTH_TOKEN"]; + process.env["SENTRY_TOKEN"] = "same_token"; resetIdentityFingerprintCache(); const legacyFp = getIdentityFingerprint(); expect(authFp).toBe(legacyFp); @@ -318,24 +320,26 @@ describe("getIdentityFingerprint", () => { test("SENTRY_FORCE_ENV_TOKEN switches the fingerprint source to the env token", () => { setAuthToken("stored_oauth", 3600, "stored_refresh"); - process.env.SENTRY_AUTH_TOKEN = "env_token"; + process.env["SENTRY_AUTH_TOKEN"] = "env_token"; const storedFp = getIdentityFingerprint(); try { - process.env.SENTRY_FORCE_ENV_TOKEN = "1"; + process.env["SENTRY_FORCE_ENV_TOKEN"] = "1"; resetIdentityFingerprintCache(); const envFp = getIdentityFingerprint(); expect(envFp).not.toBe(storedFp); } finally { - delete process.env.SENTRY_FORCE_ENV_TOKEN; + delete process.env["SENTRY_FORCE_ENV_TOKEN"]; } }); test("env and OAuth fingerprints with the same secret value are distinct", () => { // The `kind` prefix in hashIdentity keeps env/oauth namespaces // distinct even when secrets happen to collide. - process.env.SENTRY_AUTH_TOKEN = "shared_secret"; + // The `kind` prefix in hashIdentity keeps env/oauth namespaces + // distinct even when secrets happen to collide. + process.env["SENTRY_AUTH_TOKEN"] = "shared_secret"; const envFp = getIdentityFingerprint(); - delete process.env.SENTRY_AUTH_TOKEN; + delete process.env["SENTRY_AUTH_TOKEN"]; setAuthToken("shared_secret", 3600, "shared_secret"); const oauthFp = getIdentityFingerprint(); expect(envFp).not.toBe(oauthFp); @@ -346,7 +350,7 @@ describe("getIdentityFingerprint", () => { // refresh_token is unusable — the API client sends the env token, // so the fingerprint must match. setAuthToken("expired_access", -1); - process.env.SENTRY_AUTH_TOKEN = "env_token"; + process.env["SENTRY_AUTH_TOKEN"] = "env_token"; resetIdentityFingerprintCache(); const fp = getIdentityFingerprint(); @@ -424,7 +428,8 @@ describe("getAuthToken memoization", () => { expect(getAuthToken()).toBeUndefined(); // Env mutation without reset: cache stays stale (by design). - process.env.SENTRY_AUTH_TOKEN = "env_token"; + // Env mutation without reset: cache stays stale (by design). + process.env["SENTRY_AUTH_TOKEN"] = "env_token"; expect(getAuthToken()).toBeUndefined(); resetAuthTokenCache(); @@ -462,7 +467,7 @@ describe("refreshToken: corrupt issued_at", () => { // lifetime used to read as an Infinity ratio and skip the refresh path. setAuthToken("corrupt_access", 120); getDatabase().query("UPDATE accounts SET issued_at = expires_at").run(); - process.env.SENTRY_AUTH_TOKEN = "env_token"; + process.env["SENTRY_AUTH_TOKEN"] = "env_token"; const result = await refreshToken(); expect(result.token).toBe("env_token"); diff --git a/packages/cli/test/lib/db/concurrent-worker.ts b/packages/cli/test/lib/db/concurrent-worker.ts index bb8da799f6..62fdd9b31e 100644 --- a/packages/cli/test/lib/db/concurrent-worker.ts +++ b/packages/cli/test/lib/db/concurrent-worker.ts @@ -14,23 +14,31 @@ import { mkdirSync } from "node:fs"; import { logger } from "../../../src/lib/logger.js"; -// Set config dir from CLI arg before importing db modules -const configDir = process.argv[2]; -const workerId = process.argv[3]; -const operation = process.argv[4]; - -if (!(configDir && workerId && operation)) { - logger.error( - "Usage: pnpm ts concurrent-worker.ts ", - ); - process.exit(1); +/** Read the worker's CLI arguments, exiting with usage help when one is missing. */ +function readWorkerArgs(): { + configDir: string; + workerId: string; + operation: string; +} { + const [configDir, workerId, operation] = process.argv.slice(2); + if (!(configDir && workerId && operation)) { + logger.error( + "Usage: pnpm ts concurrent-worker.ts ", + ); + process.exit(1); + } + return { configDir, workerId, operation }; } +// Set config dir from CLI arg before importing db modules +const { configDir, workerId, operation } = readWorkerArgs(); + // Ensure config dir exists mkdirSync(configDir, { recursive: true }); // Set env var before importing db modules -process.env.SENTRY_CONFIG_DIR = configDir; +// Set env var before importing db modules +process.env["SENTRY_CONFIG_DIR"] = configDir; // Now import db modules (they'll use the env var) const { setCachedDsn, getCachedDsn } = @@ -57,7 +65,7 @@ async function writeDsn(): Promise { dsn, projectId: `123${workerId}`, orgId: "456", - source: "env-file", + source: "env_file", }); // Verify write @@ -121,7 +129,7 @@ async function readWrite(): Promise { setCachedDsn(directory, { dsn, projectId: `${workerId}${i}`, - source: "env-file", + source: "env_file", }); const cached = getCachedDsn(directory); diff --git a/packages/cli/test/lib/db/dsn-cache.model-based.test.ts b/packages/cli/test/lib/db/dsn-cache.model-based.test.ts index b9a2d5bbf6..e14ddb6832 100644 --- a/packages/cli/test/lib/db/dsn-cache.model-based.test.ts +++ b/packages/cli/test/lib/db/dsn-cache.model-based.test.ts @@ -165,17 +165,17 @@ class SetCachedDsnCommand implements AsyncCommand { setCachedDsn(directory, { dsn, projectId, - orgId, + ...(orgId !== undefined && { orgId }), source, - sourcePath, + ...(sourcePath !== undefined && { sourcePath }), }); model.dsnCache.entries.set(directory, { dsn, projectId, - orgId, + ...(orgId !== undefined && { orgId }), source, - sourcePath, + ...(sourcePath !== undefined && { sourcePath }), }); } diff --git a/packages/cli/test/lib/db/dsn-cache.test.ts b/packages/cli/test/lib/db/dsn-cache.test.ts index e0932073e9..dd9fd21d93 100644 --- a/packages/cli/test/lib/db/dsn-cache.test.ts +++ b/packages/cli/test/lib/db/dsn-cache.test.ts @@ -18,7 +18,7 @@ import { updateCachedResolution, } from "../../../src/lib/db/dsn-cache.js"; import type { DetectedDsn } from "../../../src/lib/dsn/types.js"; -import { useTestConfigDir } from "../../helpers.js"; +import { useTestConfigDir, at, must } from "../../helpers.js"; const getConfigDir = useTestConfigDir("test-dsn-cache-"); let testProjectDir: string; @@ -312,7 +312,7 @@ describe("getCachedDetection", () => { expect(result).toBeDefined(); expect(result?.fingerprint).toBe("test-fingerprint"); expect(result?.allDsns).toHaveLength(1); - expect(result?.allDsns[0].raw).toBe(testDsn.raw); + expect(at(must(result?.allDsns), 0).raw).toBe(testDsn.raw); }); test("invalidates cache when source file mtime changes", async () => { @@ -557,6 +557,8 @@ describe("setCachedDetection", () => { const result = await getCachedDetection(testProjectDir); expect(result?.fingerprint).toBe("fp-second"); - expect(result?.allDsns[0].raw).toBe("https://second@o2.ingest.sentry.io/2"); + expect(at(must(result?.allDsns), 0).raw).toBe( + "https://second@o2.ingest.sentry.io/2", + ); }); }); diff --git a/packages/cli/test/lib/db/migration.test.ts b/packages/cli/test/lib/db/migration.test.ts index efb9257c41..3ea677720a 100644 --- a/packages/cli/test/lib/db/migration.test.ts +++ b/packages/cli/test/lib/db/migration.test.ts @@ -2,7 +2,15 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs"; import { join } from "node:path"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + type MockInstance, + test, + vi, +} from "vitest"; import { clearAuth, getAuthConfig, @@ -19,7 +27,7 @@ import { useEnvSandbox, useTestConfigDir } from "../../helpers.js"; const getConfigDir = useTestConfigDir("json-auth-migration-"); useEnvSandbox(["SENTRY_AUTH_TOKEN", "SENTRY_TOKEN", "SENTRY_FORCE_ENV_TOKEN"]); -let stderr: ReturnType>; +let stderr: MockInstance; beforeEach(() => { stderr = vi.spyOn(process.stderr, "write").mockImplementation(() => true); diff --git a/packages/cli/test/lib/db/model-based.test.ts b/packages/cli/test/lib/db/model-based.test.ts index a8ccc21219..5f5223574b 100644 --- a/packages/cli/test/lib/db/model-based.test.ts +++ b/packages/cli/test/lib/db/model-based.test.ts @@ -303,7 +303,7 @@ class SetEnvAuthTokenCommand implements AsyncCommand { check = () => true; async run(model: DbModel, _real: RealDb): Promise { - process.env.SENTRY_AUTH_TOKEN = this.token; + process.env["SENTRY_AUTH_TOKEN"] = this.token; // Env mutation bypasses setAuthToken's invalidation. resetAuthTokenCache(); resetAuthRowCache(); @@ -320,7 +320,7 @@ class ClearEnvAuthTokenCommand implements AsyncCommand { check = () => true; async run(model: DbModel, _real: RealDb): Promise { - delete process.env.SENTRY_AUTH_TOKEN; + delete process.env["SENTRY_AUTH_TOKEN"]; resetAuthTokenCache(); resetAuthRowCache(); resetIdentityFingerprintCache(); @@ -340,7 +340,7 @@ class SetEnvSentryTokenCommand implements AsyncCommand { check = () => true; async run(model: DbModel, _real: RealDb): Promise { - process.env.SENTRY_TOKEN = this.token; + process.env["SENTRY_TOKEN"] = this.token; resetAuthTokenCache(); resetAuthRowCache(); resetIdentityFingerprintCache(); @@ -356,7 +356,7 @@ class ClearEnvSentryTokenCommand implements AsyncCommand { check = () => true; async run(model: DbModel, _real: RealDb): Promise { - delete process.env.SENTRY_TOKEN; + delete process.env["SENTRY_TOKEN"]; resetAuthTokenCache(); resetAuthRowCache(); resetIdentityFingerprintCache(); @@ -799,10 +799,10 @@ describe("model-based: database layer", () => { asyncProperty(commands(allCommands, { size: "+1" }), async (cmds) => { const cleanup = createIsolatedDbContext(); // Save env vars so model commands that set them don't leak across runs - const savedAuthToken = process.env.SENTRY_AUTH_TOKEN; - const savedSentryToken = process.env.SENTRY_TOKEN; - delete process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_TOKEN; + const savedAuthToken = process.env["SENTRY_AUTH_TOKEN"]; + const savedSentryToken = process.env["SENTRY_TOKEN"]; + delete process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_TOKEN"]; resetAuthTokenCache(); resetAuthRowCache(); resetIdentityFingerprintCache(); @@ -816,14 +816,14 @@ describe("model-based: database layer", () => { } finally { // Restore env vars before DB cleanup if (savedAuthToken !== undefined) { - process.env.SENTRY_AUTH_TOKEN = savedAuthToken; + process.env["SENTRY_AUTH_TOKEN"] = savedAuthToken; } else { - delete process.env.SENTRY_AUTH_TOKEN; + delete process.env["SENTRY_AUTH_TOKEN"]; } if (savedSentryToken !== undefined) { - process.env.SENTRY_TOKEN = savedSentryToken; + process.env["SENTRY_TOKEN"] = savedSentryToken; } else { - delete process.env.SENTRY_TOKEN; + delete process.env["SENTRY_TOKEN"]; } cleanup(); } @@ -938,8 +938,8 @@ describe("model-based: database layer", () => { fcAssert( property(storedTokenArb, (token) => { const cleanup = createIsolatedDbContext(); - const savedAuthToken = process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_AUTH_TOKEN; + const savedAuthToken = process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_AUTH_TOKEN"]; resetAuthTokenCache(); resetAuthRowCache(); try { @@ -955,7 +955,7 @@ describe("model-based: database layer", () => { expect(config).toBeUndefined(); } finally { if (savedAuthToken !== undefined) { - process.env.SENTRY_AUTH_TOKEN = savedAuthToken; + process.env["SENTRY_AUTH_TOKEN"] = savedAuthToken; } cleanup(); } diff --git a/packages/cli/test/lib/db/resilient.test.ts b/packages/cli/test/lib/db/resilient.test.ts index dcca01b7a3..33ec073935 100644 --- a/packages/cli/test/lib/db/resilient.test.ts +++ b/packages/cli/test/lib/db/resilient.test.ts @@ -25,7 +25,7 @@ describe("getDatabase with telemetry off", () => { // getDatabase() used to return the raw connection, so schema errors threw // instead of being repaired. beforeEach(() => { - expect(process.env.SENTRY_CLI_NO_TELEMETRY).toBe("1"); + expect(process.env["SENTRY_CLI_NO_TELEMETRY"]).toBe("1"); }); test("repairs a missing table and retries the query", () => { @@ -117,8 +117,8 @@ describe("createResilientDatabase: readonly database", () => { // values() is bun:sqlite-specific; skip on Node.js const stmt = wrappedDb.query("INSERT INTO test (id, name) VALUES (?, ?)"); - if (typeof stmt.values === "function") { - const valuesResult = stmt.values(3, "Charlie"); + if (typeof stmt["values"] === "function") { + const valuesResult = stmt["values"](3, "Charlie"); expect(valuesResult).toEqual([]); } diff --git a/packages/cli/test/lib/db/schema-downgrade.focused.test.ts b/packages/cli/test/lib/db/schema-downgrade.focused.test.ts index 2f87be416b..99905423fa 100644 --- a/packages/cli/test/lib/db/schema-downgrade.focused.test.ts +++ b/packages/cli/test/lib/db/schema-downgrade.focused.test.ts @@ -28,7 +28,7 @@ import { tableExists, } from "../../../src/lib/db/schema.js"; import { setUserInfo } from "../../../src/lib/db/user.js"; -import { useEnvSandbox, useTestConfigDir } from "../../helpers.js"; +import { useEnvSandbox, useTestConfigDir, must } from "../../helpers.js"; useTestConfigDir("schema-downgrade-"); useEnvSandbox([ @@ -115,7 +115,7 @@ describe("database written by a newer CLI", () => { test("only reports the mismatch when auto-repair is disabled", () => { writeAsNewerCli(); - process.env.SENTRY_CLI_NO_AUTO_REPAIR = "1"; + process.env["SENTRY_CLI_NO_AUTO_REPAIR"] = "1"; reopen(); @@ -135,7 +135,7 @@ describe("database written by a newer CLI", () => { test("@sentry/mcp-server's mismatch warning names its own cli fix", () => { writeAsNewerCli(); - process.env.SENTRY_CLI_NO_AUTO_REPAIR = "1"; + process.env["SENTRY_CLI_NO_AUTO_REPAIR"] = "1"; const stderr = vi .spyOn(process.stderr, "write") .mockImplementation(() => true); @@ -253,7 +253,7 @@ describe("prepareDatabaseForDowngrade", () => { const db = getRawDatabase(); prepareDatabaseForDowngrade(db); // An older CLI between schema 16 and this one migrates forward on setup. - db.exec(EXPECTED_TABLES.org_regions); + db.exec(must(EXPECTED_TABLES["org_regions"])); db.query("UPDATE schema_version SET version = ?").run( CURRENT_SCHEMA_VERSION - 1, ); diff --git a/packages/cli/test/lib/db/schema.test.ts b/packages/cli/test/lib/db/schema.test.ts index 9c5b829d68..a7345eb4c5 100644 --- a/packages/cli/test/lib/db/schema.test.ts +++ b/packages/cli/test/lib/db/schema.test.ts @@ -30,9 +30,9 @@ function createDatabaseWithMissingTables( missingTables: string[], ): void { const statements: string[] = []; - for (const tableName of Object.keys(EXPECTED_TABLES)) { + for (const [tableName, ddl] of Object.entries(EXPECTED_TABLES)) { if (missingTables.includes(tableName)) continue; - statements.push(EXPECTED_TABLES[tableName]); + statements.push(ddl); } db.exec(statements.join(";\n")); db.query("INSERT INTO schema_version (version) VALUES (?)").run( @@ -49,11 +49,11 @@ function createPreMigrationDatabase( preMigrationTables: string[], ): void { const statements: string[] = []; - for (const tableName of Object.keys(EXPECTED_TABLES)) { + for (const [tableName, ddl] of Object.entries(EXPECTED_TABLES)) { if (preMigrationTables.includes(tableName)) { statements.push(generatePreMigrationTableDDL(tableName)); } else { - statements.push(EXPECTED_TABLES[tableName]); + statements.push(ddl); } } db.exec(statements.join(";\n")); @@ -267,7 +267,7 @@ describe("TABLE_SCHEMAS persistence", () => { describe("EXPECTED_COLUMNS", () => { test("dsn_cache includes v4 columns", () => { - const dsnCacheColumns = EXPECTED_COLUMNS.dsn_cache; + const dsnCacheColumns = EXPECTED_COLUMNS["dsn_cache"]; const columnNames = dsnCacheColumns?.map((c) => c.name) ?? []; expect(columnNames).toContain("fingerprint"); diff --git a/packages/cli/test/lib/db/utils.test.ts b/packages/cli/test/lib/db/utils.test.ts index c08315d616..34e725b8b3 100644 --- a/packages/cli/test/lib/db/utils.test.ts +++ b/packages/cli/test/lib/db/utils.test.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from "vitest"; -import { upsert } from "../../../src/lib/db/utils.js"; +import { type SqlValue, upsert } from "../../../src/lib/db/utils.js"; describe("upsert", () => { test("generates basic UPSERT statement", () => { @@ -85,7 +85,7 @@ describe("upsert", () => { }); test("throws error for empty data object", () => { - expect(() => upsert("auth", {}, ["id"])).toThrow( + expect(() => upsert>("auth", {}, ["id"])).toThrow( "upsert: data object must have at least one column", ); }); diff --git a/packages/cli/test/lib/detect-agent.test.ts b/packages/cli/test/lib/detect-agent.test.ts index d6456a88a0..358635861c 100644 --- a/packages/cli/test/lib/detect-agent.test.ts +++ b/packages/cli/test/lib/detect-agent.test.ts @@ -425,6 +425,7 @@ describe("detectAgentFromProcessTree", () => { if (pid === process.ppid) { return { name: "cursor", ppid: 1 }; } + return undefined; }); expect(await detectAgentFromProcessTree()).toEqual(named("cursor")); }); @@ -439,6 +440,7 @@ describe("detectAgentFromProcessTree", () => { if (pid === shellPid) { return { name: "Cursor", ppid: 1 }; } + return undefined; }); expect(await detectAgentFromProcessTree()).toEqual(named("cursor")); }); @@ -448,6 +450,7 @@ describe("detectAgentFromProcessTree", () => { if (pid === process.ppid) { return { name: "Claude", ppid: 1 }; } + return undefined; }); expect(await detectAgentFromProcessTree()).toEqual(named("claude")); }); @@ -457,6 +460,7 @@ describe("detectAgentFromProcessTree", () => { if (pid === process.ppid) { return { name: "bash", ppid: 1 }; } + return undefined; }); expect(await detectAgentFromProcessTree()).toBeUndefined(); }); @@ -470,6 +474,7 @@ describe("detectAgentFromProcessTree", () => { if (pid === 1) { return { name: "cursor", ppid: 0 }; } + return undefined; }); expect(await detectAgentFromProcessTree()).toBeUndefined(); }); diff --git a/packages/cli/test/lib/dif/find.test.ts b/packages/cli/test/lib/dif/find.test.ts index f5ebec9b6a..c16c64ab41 100644 --- a/packages/cli/test/lib/dif/find.test.ts +++ b/packages/cli/test/lib/dif/find.test.ts @@ -11,6 +11,7 @@ import { join } from "node:path"; import { afterEach, describe, expect, test } from "vitest"; import { findDebugFiles, idHint } from "../../../src/lib/dif/find.js"; import { computeProguardUuid } from "../../../src/lib/proguard.js"; +import { at } from "../../helpers.js"; const FIXTURES = join(process.cwd(), "test/fixtures/dif"); // The committed PE fixture's embedded debug id (see check output). @@ -46,7 +47,7 @@ describe("findDebugFiles", () => { expect(result.missing).toEqual([]); expect(result.matches).toHaveLength(1); expect(result.matches[0]).toMatchObject({ type: "pe", id: PE_ID }); - expect(result.matches[0].path).toContain("embedded-ppdb.dll"); + expect(at(result.matches, 0).path).toContain("embedded-ppdb.dll"); }); test("reports an unmatched id as missing with a hint", async () => { diff --git a/packages/cli/test/lib/dif/index.test.ts b/packages/cli/test/lib/dif/index.test.ts index 245aab3622..b04d66d735 100644 --- a/packages/cli/test/lib/dif/index.test.ts +++ b/packages/cli/test/lib/dif/index.test.ts @@ -39,7 +39,7 @@ const BREAKPAD_WITH_SOURCE = [ "1000 10 42 0", ].join("\n"); -function toBytes(s: string): Uint8Array { +function toBytes(s: string): Uint8Array { return new TextEncoder().encode(s); } diff --git a/packages/cli/test/lib/dsn/code-scanner.test.ts b/packages/cli/test/lib/dsn/code-scanner.test.ts index 09156d00ff..f389d859f2 100644 --- a/packages/cli/test/lib/dsn/code-scanner.test.ts +++ b/packages/cli/test/lib/dsn/code-scanner.test.ts @@ -7,6 +7,7 @@ import { scanCodeForDsns, scanCodeForFirstDsn, } from "../../../src/lib/dsn/code-scanner.js"; +import { at } from "../../helpers.js"; describe("Code Scanner", () => { const testDir = join(import.meta.dirname, ".test-code-scanner"); @@ -17,8 +18,8 @@ describe("Code Scanner", () => { afterEach(() => { rmSync(testDir, { recursive: true, force: true }); - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; }); describe("extractDsnsFromContent", () => { @@ -206,7 +207,7 @@ describe("Code Scanner", () => { }); test("accepts self-hosted DSNs when SENTRY_URL is set", () => { - process.env.SENTRY_URL = "https://sentry.mycompany.com:9000"; + process.env["SENTRY_URL"] = "https://sentry.mycompany.com:9000"; const content = ` const DSN = "https://abc@sentry.mycompany.com:9000/123"; `; @@ -215,7 +216,7 @@ describe("Code Scanner", () => { }); test("rejects SaaS DSNs when SENTRY_URL is set (self-hosted mode)", () => { - process.env.SENTRY_URL = "https://sentry.mycompany.com:9000"; + process.env["SENTRY_URL"] = "https://sentry.mycompany.com:9000"; const content = ` const SAAS_DSN = "https://abc@o123.ingest.sentry.io/456"; const SELF_HOSTED_DSN = "https://def@sentry.mycompany.com:9000/789"; @@ -228,7 +229,9 @@ describe("Code Scanner", () => { test("throws ConfigError when SENTRY_URL is invalid", () => { // normalizeUrl prepends https:// to bare strings, so use a value // that remains unparseable even after normalization (https://://) - process.env.SENTRY_URL = "://"; + // normalizeUrl prepends https:// to bare strings, so use a value + // that remains unparseable even after normalization (https://://) + process.env["SENTRY_URL"] = "://"; const content = ` const SAAS_DSN = "https://abc@o123.ingest.sentry.io/456"; `; @@ -240,7 +243,7 @@ describe("Code Scanner", () => { }); test("accepts self-hosted DSNs when SENTRY_HOST is set", () => { - process.env.SENTRY_HOST = "https://sentry.mycompany.com:9000"; + process.env["SENTRY_HOST"] = "https://sentry.mycompany.com:9000"; const content = ` const DSN = "https://abc@sentry.mycompany.com:9000/123"; `; @@ -249,8 +252,8 @@ describe("Code Scanner", () => { }); test("SENTRY_HOST takes precedence over SENTRY_URL for DSN validation", () => { - process.env.SENTRY_HOST = "https://sentry.mycompany.com:9000"; - process.env.SENTRY_URL = "https://sentry.other.com"; + process.env["SENTRY_HOST"] = "https://sentry.mycompany.com:9000"; + process.env["SENTRY_URL"] = "https://sentry.other.com"; const content = ` const DSN1 = "https://abc@sentry.mycompany.com:9000/123"; const DSN2 = "https://def@sentry.other.com/456"; @@ -375,7 +378,7 @@ describe("Code Scanner", () => { const result = await scanCodeForDsns(testDir); expect(result.dsns).toHaveLength(1); - expect(result.dsns[0].raw).toBe( + expect(at(result.dsns, 0).raw).toBe( "https://realkey@o123.ingest.sentry.io/456", ); }); diff --git a/packages/cli/test/lib/dsn/detector.test.ts b/packages/cli/test/lib/dsn/detector.test.ts index e3d7e44a97..cb05457d02 100644 --- a/packages/cli/test/lib/dsn/detector.test.ts +++ b/packages/cli/test/lib/dsn/detector.test.ts @@ -30,11 +30,11 @@ describe("DSN Detector (New Module)", () => { // Clear any cached DSN for the test directory clearDsnCache(testDir); // Clear SENTRY_DSN env var - delete process.env.SENTRY_DSN; + delete process.env["SENTRY_DSN"]; }); afterEach(() => { - delete process.env.SENTRY_DSN; + delete process.env["SENTRY_DSN"]; }); describe("detectDsn with caching", () => { @@ -104,7 +104,8 @@ describe("DSN Detector (New Module)", () => { const codeDsn = "https://code@o222.ingest.sentry.io/222"; // Set env var - process.env.SENTRY_DSN = envVarDsn; + // Set env var + process.env["SENTRY_DSN"] = envVarDsn; // Set up code file mkdirSync(join(testDir, "src"), { recursive: true }); @@ -124,7 +125,8 @@ describe("DSN Detector (New Module)", () => { const envFileDsn = "https://file@o222.ingest.sentry.io/222"; // Set env var - process.env.SENTRY_DSN = envVarDsn; + // Set env var + process.env["SENTRY_DSN"] = envVarDsn; // Set up env file writeFileSync(join(testDir, ".env"), `SENTRY_DSN=${envFileDsn}`); @@ -139,7 +141,8 @@ describe("DSN Detector (New Module)", () => { const envVarDsn = "https://var@o111.ingest.sentry.io/111"; // Only set env var - process.env.SENTRY_DSN = envVarDsn; + // Only set env var + process.env["SENTRY_DSN"] = envVarDsn; // Should return env var DSN (lowest priority, but only one available) const result = await detectDsn(testDir); @@ -152,7 +155,8 @@ describe("DSN Detector (New Module)", () => { const changedDsn = "https://changed@o222.ingest.sentry.io/222"; // Only set env var - process.env.SENTRY_DSN = envVarDsn; + // Only set env var + process.env["SENTRY_DSN"] = envVarDsn; // First detection - should detect and cache const result1 = await detectDsn(testDir); @@ -170,7 +174,8 @@ describe("DSN Detector (New Module)", () => { expect(result2?.source).toBe("env"); // Change env var - should detect the change - process.env.SENTRY_DSN = changedDsn; + // Change env var - should detect the change + process.env["SENTRY_DSN"] = changedDsn; const result3 = await detectDsn(testDir); expect(result3?.raw).toBe(changedDsn); expect(result3?.source).toBe("env"); @@ -185,7 +190,8 @@ describe("DSN Detector (New Module)", () => { const codeDsn = "https://code@o222.ingest.sentry.io/222"; // First, detect with only env var - process.env.SENTRY_DSN = envVarDsn; + // First, detect with only env var + process.env["SENTRY_DSN"] = envVarDsn; const result1 = await detectDsn(testDir); expect(result1?.raw).toBe(envVarDsn); expect(result1?.source).toBe("env"); @@ -302,7 +308,7 @@ describe("DSN Detector (New Module)", () => { const envVarDsn = "https://var@o111.ingest.sentry.io/111"; const envFileDsn = "https://file@o222.ingest.sentry.io/222"; - process.env.SENTRY_DSN = envVarDsn; + process.env["SENTRY_DSN"] = envVarDsn; writeFileSync(join(testDir, ".env"), `SENTRY_DSN=${envFileDsn}`); const result = await detectAllDsns(testDir); diff --git a/packages/cli/test/lib/dsn/env-file.test.ts b/packages/cli/test/lib/dsn/env-file.test.ts index da6afd530d..7593c049f3 100644 --- a/packages/cli/test/lib/dsn/env-file.test.ts +++ b/packages/cli/test/lib/dsn/env-file.test.ts @@ -23,7 +23,7 @@ import { ENV_FILES, extractDsnFromEnvContent, } from "../../../src/lib/dsn/env-file.js"; -import { cleanupTestDir, createTestConfigDir } from "../../helpers.js"; +import { cleanupTestDir, createTestConfigDir, at } from "../../helpers.js"; // ============================================================================ // Arbitraries for Property-Based Testing @@ -388,8 +388,8 @@ describe("integration: file-based detection", () => { const result = await detectFromMonorepoEnvFiles(testDir); expect(result.dsns).toHaveLength(1); - expect(result.dsns[0].raw).toBe("https://frontend@sentry.io/1"); - expect(result.dsns[0].packagePath).toBe("packages/frontend"); + expect(at(result.dsns, 0).raw).toBe("https://frontend@sentry.io/1"); + expect(at(result.dsns, 0).packagePath).toBe("packages/frontend"); }); test("detects DSN in apps/ subdirectory", async () => { @@ -399,8 +399,8 @@ describe("integration: file-based detection", () => { const result = await detectFromMonorepoEnvFiles(testDir); expect(result.dsns).toHaveLength(1); - expect(result.dsns[0].raw).toBe("https://web@sentry.io/2"); - expect(result.dsns[0].packagePath).toBe("apps/web"); + expect(at(result.dsns, 0).raw).toBe("https://web@sentry.io/2"); + expect(at(result.dsns, 0).packagePath).toBe("apps/web"); }); test("detects DSNs from multiple monorepo packages", async () => { @@ -436,7 +436,7 @@ describe("integration: file-based detection", () => { const result = await detectFromMonorepoEnvFiles(testDir); expect(result.dsns).toHaveLength(1); - expect(result.dsns[0].packagePath).toBe("packages/with-dsn"); + expect(at(result.dsns, 0).packagePath).toBe("packages/with-dsn"); }); test("ignores files in monorepo root (only scans subdirs)", async () => { diff --git a/packages/cli/test/lib/dsn/env.test.ts b/packages/cli/test/lib/dsn/env.test.ts index 4256fd1f57..11c8bfc018 100644 --- a/packages/cli/test/lib/dsn/env.test.ts +++ b/packages/cli/test/lib/dsn/env.test.ts @@ -49,7 +49,7 @@ describe("detectFromEnv", () => { }); test("detects canonical SENTRY_DSN", () => { - process.env.SENTRY_DSN = VALID_DSN; + process.env["SENTRY_DSN"] = VALID_DSN; const result = detectFromEnv(); expect(result).not.toBeNull(); expect(result?.raw).toBe(VALID_DSN); @@ -58,7 +58,7 @@ describe("detectFromEnv", () => { }); test("detects NEXT_PUBLIC_SENTRY_DSN", () => { - process.env.NEXT_PUBLIC_SENTRY_DSN = VALID_DSN; + process.env["NEXT_PUBLIC_SENTRY_DSN"] = VALID_DSN; const result = detectFromEnv(); expect(result).not.toBeNull(); expect(result?.raw).toBe(VALID_DSN); @@ -66,44 +66,44 @@ describe("detectFromEnv", () => { }); test("detects REACT_APP_SENTRY_DSN", () => { - process.env.REACT_APP_SENTRY_DSN = VALID_DSN; + process.env["REACT_APP_SENTRY_DSN"] = VALID_DSN; const result = detectFromEnv(); expect(result?.raw).toBe(VALID_DSN); expect(result?.sourcePath).toBe("REACT_APP_SENTRY_DSN"); }); test("detects VITE_SENTRY_DSN", () => { - process.env.VITE_SENTRY_DSN = VALID_DSN; + process.env["VITE_SENTRY_DSN"] = VALID_DSN; const result = detectFromEnv(); expect(result?.raw).toBe(VALID_DSN); expect(result?.sourcePath).toBe("VITE_SENTRY_DSN"); }); test("detects EXPO_PUBLIC_SENTRY_DSN", () => { - process.env.EXPO_PUBLIC_SENTRY_DSN = VALID_DSN; + process.env["EXPO_PUBLIC_SENTRY_DSN"] = VALID_DSN; const result = detectFromEnv(); expect(result?.raw).toBe(VALID_DSN); expect(result?.sourcePath).toBe("EXPO_PUBLIC_SENTRY_DSN"); }); test("detects NUXT_PUBLIC_SENTRY_DSN", () => { - process.env.NUXT_PUBLIC_SENTRY_DSN = VALID_DSN; + process.env["NUXT_PUBLIC_SENTRY_DSN"] = VALID_DSN; const result = detectFromEnv(); expect(result?.raw).toBe(VALID_DSN); expect(result?.sourcePath).toBe("NUXT_PUBLIC_SENTRY_DSN"); }); test("canonical SENTRY_DSN takes priority over framework-prefixed vars", () => { - process.env.SENTRY_DSN = VALID_DSN; - process.env.NEXT_PUBLIC_SENTRY_DSN = VALID_DSN_2; + process.env["SENTRY_DSN"] = VALID_DSN; + process.env["NEXT_PUBLIC_SENTRY_DSN"] = VALID_DSN_2; const result = detectFromEnv(); expect(result?.raw).toBe(VALID_DSN); expect(result?.sourcePath).toBe(SENTRY_DSN_ENV); }); test("skips invalid DSN in SENTRY_DSN and falls through to framework var", () => { - process.env.SENTRY_DSN = INVALID_DSN; - process.env.NEXT_PUBLIC_SENTRY_DSN = VALID_DSN; + process.env["SENTRY_DSN"] = INVALID_DSN; + process.env["NEXT_PUBLIC_SENTRY_DSN"] = VALID_DSN; const result = detectFromEnv(); expect(result).not.toBeNull(); expect(result?.raw).toBe(VALID_DSN); @@ -111,22 +111,22 @@ describe("detectFromEnv", () => { }); test("skips invalid DSN in framework var and continues to next", () => { - process.env.NEXT_PUBLIC_SENTRY_DSN = INVALID_DSN; - process.env.VITE_SENTRY_DSN = VALID_DSN; + process.env["NEXT_PUBLIC_SENTRY_DSN"] = INVALID_DSN; + process.env["VITE_SENTRY_DSN"] = VALID_DSN; const result = detectFromEnv(); expect(result?.raw).toBe(VALID_DSN); expect(result?.sourcePath).toBe("VITE_SENTRY_DSN"); }); test("returns null when all set vars contain invalid DSNs", () => { - process.env.SENTRY_DSN = INVALID_DSN; - process.env.NEXT_PUBLIC_SENTRY_DSN = "also-not-valid"; + process.env["SENTRY_DSN"] = INVALID_DSN; + process.env["NEXT_PUBLIC_SENTRY_DSN"] = "also-not-valid"; expect(detectFromEnv()).toBeNull(); }); test("ignores empty string values", () => { - process.env.SENTRY_DSN = ""; - process.env.NEXT_PUBLIC_SENTRY_DSN = VALID_DSN; + process.env["SENTRY_DSN"] = ""; + process.env["NEXT_PUBLIC_SENTRY_DSN"] = VALID_DSN; const result = detectFromEnv(); expect(result?.raw).toBe(VALID_DSN); }); diff --git a/packages/cli/test/lib/dsn/errors.test.ts b/packages/cli/test/lib/dsn/errors.test.ts index cf5f0f980a..cf1bae8277 100644 --- a/packages/cli/test/lib/dsn/errors.test.ts +++ b/packages/cli/test/lib/dsn/errors.test.ts @@ -1,4 +1,8 @@ import { beforeEach, describe, expect, test, vi } from "vitest"; +import type { + listOrganizations, + listProjects, +} from "../../../src/lib/api-client.js"; import { formatConflictError, formatMultipleProjectsFooter, @@ -12,8 +16,10 @@ import type { // Mock api-client to prevent real API calls from getAccessibleProjects const { mockListOrganizations, mockListProjects } = vi.hoisted(() => ({ - mockListOrganizations: vi.fn(() => Promise.resolve([])), - mockListProjects: vi.fn(() => Promise.resolve([])), + mockListOrganizations: vi.fn(() => + Promise.resolve([]), + ), + mockListProjects: vi.fn(() => Promise.resolve([])), })); vi.mock("../../../src/lib/api-client.js", () => ({ diff --git a/packages/cli/test/lib/dsn/fifo-safety.test.ts b/packages/cli/test/lib/dsn/fifo-safety.test.ts index c17b2f307d..c768782f81 100644 --- a/packages/cli/test/lib/dsn/fifo-safety.test.ts +++ b/packages/cli/test/lib/dsn/fifo-safety.test.ts @@ -22,6 +22,7 @@ import { tmpdir } from "node:os"; import { join } from "node:path"; import { afterEach, beforeEach, describe, expect, test } from "vitest"; import { isRegularFile } from "../../../src/lib/dsn/fs-utils.js"; +import type { DetectedDsn } from "../../../src/lib/dsn/types.js"; import { useTestConfigDir } from "../../helpers.js"; /** Create a FIFO (named pipe) at the given path using mkfifo(1). */ @@ -31,6 +32,14 @@ function createFifo(path: string): void { const getConfigDir = useTestConfigDir("fifo-safety-"); +/** Narrow a raced detection result to the DSN it found. */ +function detected(result: DetectedDsn | null | "timeout"): DetectedDsn { + if (result === null || result === "timeout") { + throw new Error(`Expected a detected DSN, got ${String(result)}`); + } + return result; +} + describe("isRegularFile", () => { let testDir: string; @@ -106,7 +115,7 @@ describe("FIFO: env file detection", () => { }); afterEach(() => { - delete process.env.SENTRY_DSN; + delete process.env["SENTRY_DSN"]; try { rmSync(testDir, { recursive: true, force: true }); } catch { @@ -175,7 +184,7 @@ describe("FIFO: env file detection", () => { expect(result).not.toBe("timeout"); expect(result).not.toBeNull(); - expect(result!.raw).toBe("https://key@o1.ingest.sentry.io/111"); + expect(detected(result).raw).toBe("https://key@o1.ingest.sentry.io/111"); }); test("findProjectRoot walk-up skips FIFO .env without hanging", async () => { @@ -223,8 +232,10 @@ describe("FIFO: env file detection", () => { expect(result).not.toBe("timeout"); expect(result).not.toBeNull(); - expect(result!.raw).toBe("https://fallback@o1.ingest.sentry.io/222"); - expect(result!.source).toBe("env_file"); + expect(detected(result).raw).toBe( + "https://fallback@o1.ingest.sentry.io/222", + ); + expect(detected(result).source).toBe("env_file"); }); test("detectDsn cache verification skips source file after it becomes a symlinked FIFO", async () => { @@ -245,7 +256,7 @@ describe("FIFO: env file detection", () => { const fifoPath = join(testDir, ".env.fifo"); createFifo(fifoPath); symlinkSync(fifoPath, envPath); - process.env.SENTRY_DSN = fallbackDsn; + process.env["SENTRY_DSN"] = fallbackDsn; const result = await Promise.race([ detectDsn(testDir), @@ -256,7 +267,7 @@ describe("FIFO: env file detection", () => { expect(result).not.toBe("timeout"); expect(result).not.toBeNull(); - expect(result!.raw).toBe(fallbackDsn); - expect(result!.source).toBe("env"); + expect(detected(result).raw).toBe(fallbackDsn); + expect(detected(result).source).toBe("env"); }); }); diff --git a/packages/cli/test/lib/dsn/home-fallback.test.ts b/packages/cli/test/lib/dsn/home-fallback.test.ts index ae136f5c23..46ed4a4b24 100644 --- a/packages/cli/test/lib/dsn/home-fallback.test.ts +++ b/packages/cli/test/lib/dsn/home-fallback.test.ts @@ -41,13 +41,13 @@ describe("DSN detection from $HOME fallback", () => { mkdirSync(home, { recursive: true }); fakeHome.path = home; clearDsnCache(home); - delete process.env.SENTRY_DSN; + delete process.env["SENTRY_DSN"]; }); afterEach(() => { fakeHome.path = ""; fakeTmp.path = ""; - delete process.env.SENTRY_DSN; + delete process.env["SENTRY_DSN"]; }); test("does not scan into sensitive dirs under $HOME", async () => { @@ -96,7 +96,7 @@ describe("DSN detection from $HOME fallback", () => { test("still returns SENTRY_DSN env var when set from $HOME", async () => { const envDsn = "https://var@o111.ingest.sentry.io/111"; - process.env.SENTRY_DSN = envDsn; + process.env["SENTRY_DSN"] = envDsn; const result = await detectDsn(home); expect(result?.raw).toBe(envDsn); @@ -236,7 +236,7 @@ describe("DSN detection from $HOME fallback", () => { test("still returns SENTRY_DSN env var when set from an ancestor", async () => { const envDsn = "https://var@o333.ingest.sentry.io/333"; - process.env.SENTRY_DSN = envDsn; + process.env["SENTRY_DSN"] = envDsn; const result = await detectDsn(ancestor); expect(result?.raw).toBe(envDsn); diff --git a/packages/cli/test/lib/dsn/resolver.test.ts b/packages/cli/test/lib/dsn/resolver.test.ts index e601127502..00f49653f3 100644 --- a/packages/cli/test/lib/dsn/resolver.test.ts +++ b/packages/cli/test/lib/dsn/resolver.test.ts @@ -1,4 +1,14 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import type { + findProjectByDsn, + listOrganizations, + listProjects, + resolveOrgDisplayName, +} from "../../../src/lib/api-client.js"; +import type { + SentryOrganization, + SentryProject, +} from "../../../src/types/index.js"; import { createIsolatedDbContext } from "../../model-based/helpers.js"; // Mock api-client module to avoid real API calls @@ -8,11 +18,15 @@ const { mockFindProjectByDsn, mockResolveOrgDisplayName, } = vi.hoisted(() => ({ - mockListOrganizations: vi.fn(() => Promise.resolve([])), - mockListProjects: vi.fn(() => Promise.resolve([])), - mockFindProjectByDsn: vi.fn(() => Promise.resolve(null)), - mockResolveOrgDisplayName: vi.fn( - (slug: string, name?: string) => name ?? slug, + mockListOrganizations: vi.fn(() => + Promise.resolve([]), + ), + mockListProjects: vi.fn(() => Promise.resolve([])), + mockFindProjectByDsn: vi.fn(() => + Promise.resolve(null), + ), + mockResolveOrgDisplayName: vi.fn( + (slug, name) => name ?? slug, ), })); @@ -236,14 +250,17 @@ describe("resolveProject", () => { source: "env", }; - // API returns id as number, but DSN has it as string - mockListOrganizations.mockResolvedValue([ - { id: 42, slug: "number-org", name: "Number Org" }, - ]); + // API returns id as number, but DSN has it as string. The client + // passes the parsed JSON through, so build the fixtures the same way. + const orgs: SentryOrganization[] = JSON.parse( + '[{ "id": 42, "slug": "number-org", "name": "Number Org" }]', + ); + const projects: SentryProject[] = JSON.parse( + '[{ "id": 100, "slug": "number-project", "name": "Number Project" }]', + ); + mockListOrganizations.mockResolvedValue(orgs); - mockListProjects.mockResolvedValue([ - { id: 100, slug: "number-project", name: "Number Project" }, - ]); + mockListProjects.mockResolvedValue(projects); const result = await resolveProject("/test/path", dsn); diff --git a/packages/cli/test/lib/env-token-host.test.ts b/packages/cli/test/lib/env-token-host.test.ts index 3d51d66e63..5425c845e0 100644 --- a/packages/cli/test/lib/env-token-host.test.ts +++ b/packages/cli/test/lib/env-token-host.test.ts @@ -34,8 +34,8 @@ describe("env-token-host", () => { url: "https://self-hosted.example.com", org: "synthetic-org", }); - process.env.SENTRY_AUTH_TOKEN = `\x01\u00a0${token}\x7f`; - process.env.SENTRY_HOST = "https://different.example.com"; + process.env["SENTRY_AUTH_TOKEN"] = `\x01\u00a0${token}\x7f`; + process.env["SENTRY_HOST"] = "https://different.example.com"; captureEnvTokenHost(); expect(getEnvTokenHost()).toBe("https://self-hosted.example.com"); }); @@ -46,37 +46,38 @@ describe("env-token-host", () => { }); test("captures SENTRY_HOST when set", () => { - process.env.SENTRY_HOST = "https://sentry.acme.com"; + process.env["SENTRY_HOST"] = "https://sentry.acme.com"; captureEnvTokenHost(); expect(getEnvTokenHost()).toBe("https://sentry.acme.com"); }); test("captures SENTRY_URL when SENTRY_HOST is unset", () => { - process.env.SENTRY_URL = "https://sentry.acme.com"; + process.env["SENTRY_URL"] = "https://sentry.acme.com"; captureEnvTokenHost(); expect(getEnvTokenHost()).toBe("https://sentry.acme.com"); }); test("prefers SENTRY_HOST over SENTRY_URL when both are set", () => { - process.env.SENTRY_HOST = "https://host.example.com"; - process.env.SENTRY_URL = "https://url.example.com"; + process.env["SENTRY_HOST"] = "https://host.example.com"; + process.env["SENTRY_URL"] = "https://url.example.com"; captureEnvTokenHost(); expect(getEnvTokenHost()).toBe("https://host.example.com"); }); test("normalizes bare hostname to https://", () => { - process.env.SENTRY_HOST = "sentry.acme.com"; + process.env["SENTRY_HOST"] = "sentry.acme.com"; captureEnvTokenHost(); expect(getEnvTokenHost()).toBe("https://sentry.acme.com"); }); test("is idempotent — second capture is a no-op", () => { - process.env.SENTRY_HOST = "https://first.example.com"; + process.env["SENTRY_HOST"] = "https://first.example.com"; captureEnvTokenHost(); expect(getEnvTokenHost()).toBe("https://first.example.com"); // Change env AFTER initial capture — snapshot should NOT update - process.env.SENTRY_HOST = "https://second.example.com"; + // Change env AFTER initial capture — snapshot should NOT update + process.env["SENTRY_HOST"] = "https://second.example.com"; captureEnvTokenHost(); expect(getEnvTokenHost()).toBe("https://first.example.com"); }); @@ -89,14 +90,15 @@ describe("env-token-host", () => { expect(getEnvTokenHost()).toBe(DEFAULT_SENTRY_URL); // Simulate shim write - process.env.SENTRY_URL = "https://injected-by-sentryclirc.com"; + // Simulate shim write + process.env["SENTRY_URL"] = "https://injected-by-sentryclirc.com"; // Second call is a no-op (idempotent) captureEnvTokenHost(); expect(getEnvTokenHost()).toBe(DEFAULT_SENTRY_URL); }); test("auto-captures on first getEnvTokenHost() call without explicit capture", () => { - process.env.SENTRY_HOST = "https://auto.example.com"; + process.env["SENTRY_HOST"] = "https://auto.example.com"; // Never call captureEnvTokenHost explicitly expect(getEnvTokenHost()).toBe("https://auto.example.com"); }); diff --git a/packages/cli/test/lib/env.test.ts b/packages/cli/test/lib/env.test.ts index a697b59961..0d34e9630e 100644 --- a/packages/cli/test/lib/env.test.ts +++ b/packages/cli/test/lib/env.test.ts @@ -15,7 +15,7 @@ describe("env registry", () => { const custom = { CUSTOM_VAR: "test" } as NodeJS.ProcessEnv; setEnv(custom); expect(getEnv()).toBe(custom); - expect(getEnv().CUSTOM_VAR).toBe("test"); + expect(getEnv()["CUSTOM_VAR"]).toBe("test"); }); test("setEnv(process.env) restores the default", () => { diff --git a/packages/cli/test/lib/envelope/event-builder.test.ts b/packages/cli/test/lib/envelope/event-builder.test.ts index 1f4b1e8538..ebeaffc342 100644 --- a/packages/cli/test/lib/envelope/event-builder.test.ts +++ b/packages/cli/test/lib/envelope/event-builder.test.ts @@ -180,17 +180,17 @@ describe("buildEventFromFlags", () => { test("--extra parses into extra object", async () => { const event = await buildEventFromFlags(flags({ extra: ["foo:bar"] })); - expect((event.extra as Record).foo).toBe("bar"); + expect((event.extra as Record)["foo"]).toBe("bar"); }); test("--no-environ omits process.env from extra", async () => { const event = await buildEventFromFlags(flags({ "no-environ": true })); - expect(event.extra?.environ).toBeUndefined(); + expect(event.extra?.["environ"]).toBeUndefined(); }); test("environ included when --no-environ not set", async () => { const event = await buildEventFromFlags(flags({ "no-environ": false })); - expect(event.extra?.environ).toBeDefined(); + expect(event.extra?.["environ"]).toBeDefined(); }); test("--user routes known fields correctly", async () => { diff --git a/packages/cli/test/lib/envelope/event-send-dsn.test.ts b/packages/cli/test/lib/envelope/event-send-dsn.test.ts index e0f9ad5e60..0ce670ac03 100644 --- a/packages/cli/test/lib/envelope/event-send-dsn.test.ts +++ b/packages/cli/test/lib/envelope/event-send-dsn.test.ts @@ -21,12 +21,8 @@ import { useEnvSandbox, useTestConfigDir } from "../../helpers.js"; vi.mock("../../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([key, value]) => [ - key, - typeof value === "function" ? vi.fn(value) : value, - ]), - ); + const { mockFunctionExports } = await import("../../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for mocked access @@ -169,7 +165,7 @@ describe("resolveEventSendDsn", () => { }); test("positional DSN wins over SENTRY_DSN and project scan", async () => { - process.env.SENTRY_DSN = OTHER_DSN; + process.env["SENTRY_DSN"] = OTHER_DSN; detectSpy.mockResolvedValue(detectedDsn(OTHER_DSN)); const dsn = await resolveEventSendDsn("/tmp", { @@ -183,7 +179,7 @@ describe("resolveEventSendDsn", () => { }); test("project target wins over SENTRY_DSN and project scan", async () => { - process.env.SENTRY_DSN = OTHER_DSN; + process.env["SENTRY_DSN"] = OTHER_DSN; authSpy.mockReturnValue(OAUTH_SESSION); keysSpy.mockResolvedValue([ACTIVE_KEY]); @@ -223,7 +219,7 @@ describe("resolveEventSendDsn", () => { }); test("project target without login throws ConfigError", async () => { - process.env.SENTRY_DSN = OTHER_DSN; + process.env["SENTRY_DSN"] = OTHER_DSN; await expect( resolveEventSendDsn("/tmp", { kind: "project", @@ -281,7 +277,7 @@ describe("resolveEventSendDsn", () => { }); test("uses SENTRY_DSN when no positional target is provided", async () => { - process.env.SENTRY_DSN = SAAS_DSN; + process.env["SENTRY_DSN"] = SAAS_DSN; const dsn = await resolveEventSendDsn("/tmp", undefined); expect(dsn).toBe(SAAS_DSN); }); diff --git a/packages/cli/test/lib/envelope/transport.test.ts b/packages/cli/test/lib/envelope/transport.test.ts index eda43f86e2..5d55afcb76 100644 --- a/packages/cli/test/lib/envelope/transport.test.ts +++ b/packages/cli/test/lib/envelope/transport.test.ts @@ -57,20 +57,20 @@ describe("buildEnvelopeUrl", () => { describe("resolveDsn", () => { test("explicit --dsn flag takes priority over env", () => { - process.env.SENTRY_DSN = SELF_HOSTED_DSN; + process.env["SENTRY_DSN"] = SELF_HOSTED_DSN; const result = resolveDsn({ dsn: SAAS_DSN }); expect(result).toBe(SAAS_DSN); }); test("SENTRY_DSN env var used when no flag", () => { - process.env.SENTRY_DSN = SAAS_DSN; - const result = resolveDsn({ dsn: undefined }); + process.env["SENTRY_DSN"] = SAAS_DSN; + const result = resolveDsn({}); expect(result).toBe(SAAS_DSN); }); test("returns undefined when neither flag nor env set", () => { - delete process.env.SENTRY_DSN; - const result = resolveDsn({ dsn: undefined }); + delete process.env["SENTRY_DSN"]; + const result = resolveDsn({}); expect(result).toBeUndefined(); }); @@ -80,8 +80,8 @@ describe("resolveDsn", () => { }); test("trims whitespace from SENTRY_DSN env var", () => { - process.env.SENTRY_DSN = `\n${SAAS_DSN}\n`; - const result = resolveDsn({ dsn: undefined }); + process.env["SENTRY_DSN"] = `\n${SAAS_DSN}\n`; + const result = resolveDsn({}); expect(result).toBe(SAAS_DSN); }); }); @@ -98,7 +98,7 @@ describe("resolveIngestDsn", () => { }); test("returns flag/env DSN without scanning", async () => { - process.env.SENTRY_DSN = SAAS_DSN; + process.env["SENTRY_DSN"] = SAAS_DSN; await expect(resolveIngestDsn({}, "/tmp")).resolves.toBe(SAAS_DSN); expect(detectSpy).not.toHaveBeenCalled(); }); diff --git a/packages/cli/test/lib/error-reporting.test.ts b/packages/cli/test/lib/error-reporting.test.ts index 2b3c6c3cf6..2f22563d8b 100644 --- a/packages/cli/test/lib/error-reporting.test.ts +++ b/packages/cli/test/lib/error-reporting.test.ts @@ -11,7 +11,15 @@ // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as Sentry from "@sentry/node"; import { ArgumentParseError, FlagNotFoundError } from "@stricli/core"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { formatAuthHeader } from "../../src/lib/auth-header.js"; import { buildLocalUiUrl, @@ -43,6 +51,7 @@ import { ValidationError, VerifyFailedError, } from "../../src/lib/errors.js"; +import { at } from "../helpers.js"; // --------------------------------------------------------------------------- // extractResourceKind @@ -551,20 +560,20 @@ describe("classifySilenced", () => { * `SENTRY_HOST` is cleared for the duration since it takes precedence. */ function withSentryUrl(url: string, fn: () => void): void { - const savedUrl = process.env.SENTRY_URL; - const savedHost = process.env.SENTRY_HOST; - process.env.SENTRY_URL = url; - delete process.env.SENTRY_HOST; + const savedUrl = process.env["SENTRY_URL"]; + const savedHost = process.env["SENTRY_HOST"]; + process.env["SENTRY_URL"] = url; + delete process.env["SENTRY_HOST"]; try { fn(); } finally { if (savedUrl === undefined) { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; } else { - process.env.SENTRY_URL = savedUrl; + process.env["SENTRY_URL"] = savedUrl; } if (savedHost !== undefined) { - process.env.SENTRY_HOST = savedHost; + process.env["SENTRY_HOST"] = savedHost; } } } @@ -615,7 +624,7 @@ describe("enrichEventWithGroupingTags", () => { test("sets cli_error.kind from exception value", () => { const event = makeEvent("TypeError"); - event.exception!.values![0].value = + at(event.exception!.values!, 0).value = "Cannot read properties of undefined (reading 'replaceAll')"; const result = enrichEventWithGroupingTags(event); expect(result.tags?.["cli_error.kind"]).toBe("Cannot read properties of"); @@ -623,17 +632,17 @@ describe("enrichEventWithGroupingTags", () => { test("sets cli_error.kind for fetch failed TypeError", () => { const event = makeEvent("TypeError"); - event.exception!.values![0].value = "fetch failed"; + at(event.exception!.values!, 0).value = "fetch failed"; const result = enrichEventWithGroupingTags(event); expect(result.tags?.["cli_error.kind"]).toBe("fetch failed"); }); test("sets cli_error.kind for Error with variable project count", () => { const event1 = makeEvent("Error"); - event1.exception!.values![0].value = + at(event1.exception!.values!, 0).value = "Failed to fetch issues from 3 project(s): Failed to list issues: 400 Bad Request"; const event2 = makeEvent("Error"); - event2.exception!.values![0].value = + at(event2.exception!.values!, 0).value = "Failed to fetch issues from 1 project(s): Failed to list issues: 400 Bad Request"; const result1 = enrichEventWithGroupingTags(event1); const result2 = enrichEventWithGroupingTags(event2); @@ -656,7 +665,7 @@ describe("enrichEventWithGroupingTags", () => { "cli_error.class": "ContextError", "cli_error.kind": "Organization", }); - event.exception!.values![0].value = "some different message"; + at(event.exception!.values!, 0).value = "some different message"; const result = enrichEventWithGroupingTags(event); expect(result.tags?.["cli_error.kind"]).toBe("Organization"); }); @@ -667,46 +676,33 @@ describe("enrichEventWithGroupingTags", () => { // --------------------------------------------------------------------------- describe("reportCliError integration", () => { - let captureSpy: ReturnType; - let metricSpy: ReturnType; - let withScopeSpy: ReturnType; + let captureSpy: MockInstance<(typeof Sentry)["captureException"]>; + let metricSpy: MockInstance<(typeof Sentry.metrics)["distribution"]>; beforeEach(() => { captureSpy = vi.spyOn(Sentry, "captureException"); metricSpy = vi.spyOn(Sentry.metrics, "distribution"); - withScopeSpy = vi.spyOn(Sentry, "withScope"); }); afterEach(() => { captureSpy.mockRestore(); metricSpy.mockRestore(); - withScopeSpy.mockRestore(); }); /** - * Capture the tags that `reportCliError` would set on the scope. - * Intercepts `Sentry.withScope` and runs the callback with a fake scope - * that records `setTag`/`setContext` calls. + * Capture the tags and contexts that `reportCliError` sets on its scope. + * `captureException` runs inside that scope, so read the current scope's + * data when it is called. */ function capturedScopeTags(error: unknown): { - tags: Record; + tags: Record; contexts: Record; } { - const tags: Record = {}; - const contexts: Record = {}; - const fakeScope = { - setTag(k: string, v: string) { - tags[k] = v; - }, - setContext(k: string, v: unknown) { - contexts[k] = v; - }, - setFingerprint() { - /* noop */ - }, - }; - withScopeSpy.mockImplementation((fn: (s: unknown) => void) => { - fn(fakeScope); + let tags: Record = {}; + let contexts: Record = {}; + captureSpy.mockImplementation(() => { + ({ tags, contexts } = Sentry.getCurrentScope().getScopeData()); + return ""; }); reportCliError(error); return { tags, contexts }; @@ -1071,7 +1067,8 @@ describe("reportArgumentError", () => { test("captures one info message with the parser's error class", () => { const error = new ArgumentParseError( - "period", + // Stricli brands flag names; it builds them from the command's flags. + "period" as ConstructorParameters[0], "bogus", new ValidationError("Invalid period 'bogus'", "period"), ); diff --git a/packages/cli/test/lib/errors.test.ts b/packages/cli/test/lib/errors.test.ts index 3024ed7892..3ce5e75108 100644 --- a/packages/cli/test/lib/errors.test.ts +++ b/packages/cli/test/lib/errors.test.ts @@ -506,7 +506,7 @@ describe("stringifyUnknown", () => { test("falls back to String() for circular references", () => { const circular: Record = { name: "loop" }; - circular.self = circular; + circular["self"] = circular; // Should not throw — falls back to String() which returns [object Object] expect(() => stringifyUnknown(circular)).not.toThrow(); expect(stringifyUnknown(circular)).toBe("[object Object]"); @@ -907,6 +907,7 @@ describe("withAuthGuard", () => { }); test("handles non-Error thrown values", async () => { + // oxlint-disable-next-line typescript/prefer-promise-reject-errors -- the test covers non-Error rejection values const result = await withAuthGuard(() => Promise.reject("string error")); expect(result.ok).toBe(false); if (!result.ok) { diff --git a/packages/cli/test/lib/formatters/alerts.test.ts b/packages/cli/test/lib/formatters/alerts.test.ts index f9e6682db8..85e5257ca2 100644 --- a/packages/cli/test/lib/formatters/alerts.test.ts +++ b/packages/cli/test/lib/formatters/alerts.test.ts @@ -6,6 +6,16 @@ import { type MetricAlertViewResult, } from "../../../src/lib/formatters/alerts.js"; +/** + * A condition group as the API sends it, including comparison shapes that the + * generated types do not list. + */ +function apiConditionGroup( + group: object, +): NonNullable { + return JSON.parse(JSON.stringify(group)); +} + const rule: MetricAlertRule = { id: "9", name: "P95 latency", @@ -23,8 +33,8 @@ const rule: MetricAlertRule = { conditionGroup: { logicType: "any", conditions: [ - { type: "gte", comparison: 500, conditionResult: 75 }, - { type: "lte", comparison: 300, conditionResult: 0 }, + { id: "1", type: "gte", comparison: 500, conditionResult: 75 }, + { id: "2", type: "lte", comparison: 300, conditionResult: 0 }, ], }, }; @@ -32,6 +42,7 @@ const rule: MetricAlertRule = { const workflow: GetOrganizationWorkflowResponse = { id: "12", name: "Notify on-call", + type: "alert", organizationId: "1", createdBy: null, dateCreated: "2026-10-20T00:00:00Z", @@ -45,14 +56,21 @@ const workflow: GetOrganizationWorkflowResponse = { triggers: { logicType: "any", conditions: [ - { type: "first_seen_event", comparison: true, conditionResult: true }, + { + id: "3", + type: "first_seen_event", + comparison: true, + conditionResult: true, + }, ], actions: [], }, actionFilters: [ { logicType: "all", - conditions: [{ type: "eq", comparison: 75, conditionResult: true }], + conditions: [ + { id: "4", type: "eq", comparison: 75, conditionResult: true }, + ], actions: [ { id: "21", @@ -115,7 +133,7 @@ describe("formatMetricAlertView", () => { rule: { ...rule, config: { detectionType: "dynamic" }, - conditionGroup: { + conditionGroup: apiConditionGroup({ logicType: "any", conditions: [ { @@ -124,7 +142,7 @@ describe("formatMetricAlertView", () => { conditionResult: 50, }, ], - }, + }), }, workflows: [ { diff --git a/packages/cli/test/lib/formatters/chart-core.test.ts b/packages/cli/test/lib/formatters/chart-core.test.ts index 9993c4038b..68ff5abbbd 100644 --- a/packages/cli/test/lib/formatters/chart-core.test.ts +++ b/packages/cli/test/lib/formatters/chart-core.test.ts @@ -13,6 +13,7 @@ import { seriesColor, } from "../../../src/lib/formatters/chart-core.js"; import type { TimeseriesResult } from "../../../src/types/dashboard.js"; +import { at } from "../../helpers.js"; function makeTimeseries( overrides: Partial = {}, @@ -75,7 +76,7 @@ describe("incomplete buckets", () => { test("buildChartModel carries per-bucket incomplete flags", () => { const data = makeTimeseries(); - data.series[0].values[3] = { + at(data.series, 0).values[3] = { timestamp: 1_700_000_180, value: 30, incomplete: true, @@ -91,7 +92,7 @@ describe("incomplete buckets", () => { test("single-series bars fade incomplete columns", () => { const data = makeTimeseries(); - data.series[0].values[3] = { + at(data.series, 0).values[3] = { timestamp: 1_700_000_180, value: 30, incomplete: true, @@ -230,7 +231,7 @@ describe("buildCategoricalChartModel", () => { describe("rasterizeChart", () => { test("downsamples dense nullable buckets and keeps unmeasured columns empty", () => { const model = buildChartModel(makeTimeseries())!; - model.series[0].values = [10, null, 20, 30, 40, 50, 60, 70, 80]; + at(model.series, 0).values = [10, null, 20, 30, 40, 50, 60, 70, 80]; model.buckets = 9; // 16px fits 8 one-pixel columns two pixels apart. Column 1 covers only diff --git a/packages/cli/test/lib/formatters/colors.test.ts b/packages/cli/test/lib/formatters/colors.test.ts index 296e17edb3..726a8d03aa 100644 --- a/packages/cli/test/lib/formatters/colors.test.ts +++ b/packages/cli/test/lib/formatters/colors.test.ts @@ -147,13 +147,13 @@ describe("terminalLink", () => { */ function withTTY(fn: () => void): void { const savedTTY = process.stdout.isTTY; - const savedPlain = process.env.SENTRY_PLAIN_OUTPUT; - const savedNoColor = process.env.NO_COLOR; - const savedForceColor = process.env.FORCE_COLOR; + const savedPlain = process.env["SENTRY_PLAIN_OUTPUT"]; + const savedNoColor = process.env["NO_COLOR"]; + const savedForceColor = process.env["FORCE_COLOR"]; process.stdout.isTTY = true; - delete process.env.SENTRY_PLAIN_OUTPUT; - delete process.env.NO_COLOR; - delete process.env.FORCE_COLOR; + delete process.env["SENTRY_PLAIN_OUTPUT"]; + delete process.env["NO_COLOR"]; + delete process.env["FORCE_COLOR"]; try { fn(); } finally { @@ -195,9 +195,9 @@ describe("terminalLink", () => { test("returns plain text without OSC 8 when piped", () => { const savedTTY = process.stdout.isTTY; - const savedPlain = process.env.SENTRY_PLAIN_OUTPUT; + const savedPlain = process.env["SENTRY_PLAIN_OUTPUT"]; process.stdout.isTTY = false; - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; try { const result = terminalLink("click me", "https://example.com"); expect(result).toBe("click me"); @@ -205,24 +205,24 @@ describe("terminalLink", () => { } finally { process.stdout.isTTY = savedTTY; if (savedPlain !== undefined) { - process.env.SENTRY_PLAIN_OUTPUT = savedPlain; + process.env["SENTRY_PLAIN_OUTPUT"] = savedPlain; } else { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } } }); test("returns plain text when SENTRY_PLAIN_OUTPUT=1", () => { - const savedPlain = process.env.SENTRY_PLAIN_OUTPUT; - process.env.SENTRY_PLAIN_OUTPUT = "1"; + const savedPlain = process.env["SENTRY_PLAIN_OUTPUT"]; + process.env["SENTRY_PLAIN_OUTPUT"] = "1"; try { const result = terminalLink("display", "https://url.com"); expect(result).toBe("display"); } finally { if (savedPlain !== undefined) { - process.env.SENTRY_PLAIN_OUTPUT = savedPlain; + process.env["SENTRY_PLAIN_OUTPUT"] = savedPlain; } else { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } } }); diff --git a/packages/cli/test/lib/formatters/conversation.test.ts b/packages/cli/test/lib/formatters/conversation.test.ts index dce078a565..2315f40202 100644 --- a/packages/cli/test/lib/formatters/conversation.test.ts +++ b/packages/cli/test/lib/formatters/conversation.test.ts @@ -10,19 +10,33 @@ import type { AgentConversationSpan, ConversationListItem, } from "../../../src/types/conversation.js"; +import { at, without } from "../../helpers.js"; function makeListItem( overrides: Partial = {}, ): ConversationListItem { return { conversationId: "conv-abc-123", + flow: [], startTimestamp: 1_716_500_000_000, + endTimestamp: 1_716_500_010_000, totalTokens: 500, totalCost: 0.01, + llmCalls: 1, toolCalls: 3, + toolNames: [], + toolErrors: 0, errors: 0, + traceCount: 1, + traceIds: [], firstInput: "Hello world", - user: { email: "test@example.com" }, + lastOutput: null, + user: { + id: null, + email: "test@example.com", + username: null, + ip_address: null, + }, ...overrides, }; } @@ -31,9 +45,11 @@ function makeSpan( overrides: Partial = {}, ): AgentConversationSpan { return { + "gen_ai.conversation.id": "conv-abc-123", span_id: "aabb112233445566", trace: "00112233445566778899aabbccddeeff", project: "my-project", + "project.id": "1", "span.name": "gen_ai.invoke_agent", "span.status": "ok", "precise.start_ts": 1_716_500_000, @@ -112,14 +128,14 @@ describe("formatConversationTable", () => { }); test("handles missing user and input", () => { - const items = [makeListItem({ user: undefined, firstInput: undefined })]; + const items = [without(makeListItem({ firstInput: null }), "user")]; const result = formatConversationTable(items); expect(result).toContain("—"); }); test("links conversation IDs to Sentry", () => { - const previousPlainOutput = process.env.SENTRY_PLAIN_OUTPUT; - process.env.SENTRY_PLAIN_OUTPUT = "0"; + const previousPlainOutput = process.env["SENTRY_PLAIN_OUTPUT"]; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; try { const webUrl = "https://sentry.io/organizations/test-org/explore/agents/conversations/conv-abc-123/"; @@ -127,9 +143,9 @@ describe("formatConversationTable", () => { expect(result).toContain(`]8;;${webUrl}`); } finally { if (previousPlainOutput === undefined) { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } else { - process.env.SENTRY_PLAIN_OUTPUT = previousPlainOutput; + process.env["SENTRY_PLAIN_OUTPUT"] = previousPlainOutput; } } }); @@ -168,10 +184,10 @@ describe("extractTurns", () => { const spans = [makeSpan()]; const turns = extractTurns(spans); expect(turns).toHaveLength(1); - expect(turns[0].turn).toBe(1); - expect(turns[0].userContent).toBe("hi"); - expect(turns[0].assistantContent).toBe("hello"); - expect(turns[0].model).toBe("gpt-4"); + expect(at(turns, 0).turn).toBe(1); + expect(at(turns, 0).userContent).toBe("hi"); + expect(at(turns, 0).assistantContent).toBe("hello"); + expect(at(turns, 0).model).toBe("gpt-4"); }); test("associates tool calls with the correct turn", () => { @@ -189,8 +205,8 @@ describe("extractTurns", () => { }); const turns = extractTurns([aiSpan, toolSpan]); expect(turns).toHaveLength(1); - expect(turns[0].toolCalls).toHaveLength(1); - expect(turns[0].toolCalls[0].name).toBe("search"); + expect(at(turns, 0).toolCalls).toHaveLength(1); + expect(at(at(turns, 0).toolCalls, 0).name).toBe("search"); }); test("returns empty array for no spans", () => { @@ -209,8 +225,8 @@ describe("extractTurns", () => { "precise.finish_ts": 110, }); const turns = extractTurns([span1, span2]); - expect(turns[0].started).toBe(100); - expect(turns[1].started).toBe(200); + expect(at(turns, 0).started).toBe(100); + expect(at(turns, 1).started).toBe(200); }); test("handles filtered content", () => { @@ -219,8 +235,8 @@ describe("extractTurns", () => { "gen_ai.output.messages": "[Filtered]", }); const turns = extractTurns([span]); - expect(turns[0].userContent).toBe("[Filtered]"); - expect(turns[0].assistantContent).toBe("[Filtered]"); + expect(at(turns, 0).userContent).toBe("[Filtered]"); + expect(at(turns, 0).assistantContent).toBe("[Filtered]"); }); test("handles null content messages gracefully", () => { @@ -230,7 +246,7 @@ describe("extractTurns", () => { }), }); const turns = extractTurns([span]); - expect(turns[0].userContent).toBeNull(); + expect(at(turns, 0).userContent).toBeNull(); }); }); @@ -463,7 +479,7 @@ describe("extractTurns: content extraction edge cases", () => { "gen_ai.response.text": "fallback text", }); const turns = extractTurns([span]); - expect(turns[0].assistantContent).toBe("fallback text"); + expect(at(turns, 0).assistantContent).toBe("fallback text"); }); test("extracts from gen_ai.response.object fallback", () => { @@ -473,7 +489,7 @@ describe("extractTurns: content extraction edge cases", () => { "gen_ai.response.object": '{"result": true}', }); const turns = extractTurns([span]); - expect(turns[0].assistantContent).toBe('{"result": true}'); + expect(at(turns, 0).assistantContent).toBe('{"result": true}'); }); test("handles plain string input messages", () => { @@ -481,7 +497,7 @@ describe("extractTurns: content extraction edge cases", () => { "gen_ai.input.messages": "plain string input", }); const turns = extractTurns([span]); - expect(turns[0].userContent).toBe("plain string input"); + expect(at(turns, 0).userContent).toBe("plain string input"); }); test("handles array of string messages", () => { @@ -489,7 +505,7 @@ describe("extractTurns: content extraction edge cases", () => { "gen_ai.input.messages": JSON.stringify(["msg1", "msg2"]), }); const turns = extractTurns([span]); - expect(turns[0].userContent).toBe("msg2"); + expect(at(turns, 0).userContent).toBe("msg2"); }); test("handles message with text field instead of content", () => { @@ -499,7 +515,7 @@ describe("extractTurns: content extraction edge cases", () => { }), }); const turns = extractTurns([span]); - expect(turns[0].userContent).toBe("from text field"); + expect(at(turns, 0).userContent).toBe("from text field"); }); test("handles array content parts with text", () => { @@ -514,8 +530,8 @@ describe("extractTurns: content extraction edge cases", () => { }), }); const turns = extractTurns([span]); - expect(turns[0].assistantContent).toContain("part one"); - expect(turns[0].assistantContent).toContain("part two"); + expect(at(turns, 0).assistantContent).toContain("part one"); + expect(at(turns, 0).assistantContent).toContain("part two"); }); test("handles no input or output messages", () => { @@ -527,8 +543,8 @@ describe("extractTurns: content extraction edge cases", () => { "gen_ai.response.object": undefined, }); const turns = extractTurns([span]); - expect(turns[0].userContent).toBeNull(); - expect(turns[0].assistantContent).toBeNull(); + expect(at(turns, 0).userContent).toBeNull(); + expect(at(turns, 0).assistantContent).toBeNull(); }); test("extracts from gen_ai.request.messages fallback", () => { @@ -539,7 +555,7 @@ describe("extractTurns: content extraction edge cases", () => { }), }); const turns = extractTurns([span]); - expect(turns[0].userContent).toBe("from request"); + expect(at(turns, 0).userContent).toBe("from request"); }); test("handles numeric token values", () => { @@ -547,7 +563,7 @@ describe("extractTurns: content extraction edge cases", () => { "gen_ai.usage.total_tokens": 42, }); const turns = extractTurns([span]); - expect(turns[0].totalTokens).toBe(42); + expect(at(turns, 0).totalTokens).toBe(42); }); test("handles missing token values", () => { @@ -555,7 +571,7 @@ describe("extractTurns: content extraction edge cases", () => { "gen_ai.usage.total_tokens": undefined, }); const turns = extractTurns([span]); - expect(turns[0].totalTokens).toBe(0); + expect(at(turns, 0).totalTokens).toBe(0); }); test("detects operation type from span name when explicit type missing", () => { diff --git a/packages/cli/test/lib/formatters/dashboard-sixel-integration.test.ts b/packages/cli/test/lib/formatters/dashboard-sixel-integration.test.ts index 3cd013cc79..13759776c6 100644 --- a/packages/cli/test/lib/formatters/dashboard-sixel-integration.test.ts +++ b/packages/cli/test/lib/formatters/dashboard-sixel-integration.test.ts @@ -73,9 +73,9 @@ describe("dashboard sixel integration", () => { let savedColumns: number | undefined; beforeEach(() => { - savedPlainOutput = process.env.SENTRY_PLAIN_OUTPUT; + savedPlainOutput = process.env["SENTRY_PLAIN_OUTPUT"]; savedColumns = process.stdout.columns; - process.env.SENTRY_PLAIN_OUTPUT = "0"; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; process.stdout.columns = 40; vi.spyOn(sixelModule, "selectGraphicsFormat").mockReturnValue("sixel"); vi.spyOn(sixelModule, "detectSixelCaps").mockReturnValue({ @@ -91,11 +91,12 @@ describe("dashboard sixel integration", () => { afterEach(() => { vi.restoreAllMocks(); if (savedPlainOutput === undefined) { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } else { - process.env.SENTRY_PLAIN_OUTPUT = savedPlainOutput; + process.env["SENTRY_PLAIN_OUTPUT"] = savedPlainOutput; } - process.stdout.columns = savedColumns; + // Non-TTY streams have no columns; restore that state as-is. + Reflect.set(process.stdout, "columns", savedColumns); }); test("renders one sixel canvas for a timeseries widget when enabled", () => { @@ -152,8 +153,8 @@ describe("dashboard sixel integration", () => { }); test("uses a requested sixel renderer instead of an available kitty renderer", () => { - vi.mocked(sixelModule.selectGraphicsFormat).mockImplementation( - (renderer) => (renderer === "sixel" ? "sixel" : "kitty"), + vi.mocked(sixelModule.selectGraphicsFormat).mockImplementation((renderer) => + renderer === "sixel" ? "sixel" : "kitty", ); const output = formatDashboardWithData( diff --git a/packages/cli/test/lib/formatters/dashboard.test.ts b/packages/cli/test/lib/formatters/dashboard.test.ts index 378d0c13d3..6799ab3246 100644 --- a/packages/cli/test/lib/formatters/dashboard.test.ts +++ b/packages/cli/test/lib/formatters/dashboard.test.ts @@ -37,6 +37,7 @@ import type { TimeseriesResult, UnsupportedResult, } from "../../../src/types/dashboard.js"; +import { at } from "../../helpers.js"; // --------------------------------------------------------------------------- // Constants (must match source) @@ -73,30 +74,30 @@ function usePlainMode() { let savedPlain: string | undefined; beforeEach(() => { - savedNoColor = process.env.NO_COLOR; - savedForceColor = process.env.FORCE_COLOR; - savedPlain = process.env.SENTRY_PLAIN_OUTPUT; + savedNoColor = process.env["NO_COLOR"]; + savedForceColor = process.env["FORCE_COLOR"]; + savedPlain = process.env["SENTRY_PLAIN_OUTPUT"]; - process.env.NO_COLOR = "1"; - delete process.env.FORCE_COLOR; - delete process.env.SENTRY_PLAIN_OUTPUT; + process.env["NO_COLOR"] = "1"; + delete process.env["FORCE_COLOR"]; + delete process.env["SENTRY_PLAIN_OUTPUT"]; }); afterEach(() => { if (savedNoColor === undefined) { - delete process.env.NO_COLOR; + delete process.env["NO_COLOR"]; } else { - process.env.NO_COLOR = savedNoColor; + process.env["NO_COLOR"] = savedNoColor; } if (savedForceColor === undefined) { - delete process.env.FORCE_COLOR; + delete process.env["FORCE_COLOR"]; } else { - process.env.FORCE_COLOR = savedForceColor; + process.env["FORCE_COLOR"] = savedForceColor; } if (savedPlain === undefined) { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } else { - process.env.SENTRY_PLAIN_OUTPUT = savedPlain; + process.env["SENTRY_PLAIN_OUTPUT"] = savedPlain; } }); } @@ -114,26 +115,26 @@ function useRenderedMode() { let savedChalkLevel: typeof chalk.level; beforeEach(() => { - savedPlain = process.env.SENTRY_PLAIN_OUTPUT; - savedNoColor = process.env.NO_COLOR; + savedPlain = process.env["SENTRY_PLAIN_OUTPUT"]; + savedNoColor = process.env["NO_COLOR"]; savedChalkLevel = chalk.level; - process.env.SENTRY_PLAIN_OUTPUT = "0"; - delete process.env.NO_COLOR; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; + delete process.env["NO_COLOR"]; chalk.level = 3; }); afterEach(() => { chalk.level = savedChalkLevel; if (savedPlain === undefined) { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } else { - process.env.SENTRY_PLAIN_OUTPUT = savedPlain; + process.env["SENTRY_PLAIN_OUTPUT"] = savedPlain; } if (savedNoColor === undefined) { - delete process.env.NO_COLOR; + delete process.env["NO_COLOR"]; } else { - process.env.NO_COLOR = savedNoColor; + process.env["NO_COLOR"] = savedNoColor; } }); } @@ -329,14 +330,14 @@ describe("formatDashboardWithData", () => { const output = formatDashboardWithData(data); const lines = output.split("\n"); // First line contains title and period - const firstLine = stripAnsi(lines[0]); + const firstLine = stripAnsi(at(lines, 0)); expect(firstLine).toContain("24h"); }); test("renders environment with green color", () => { const data = makeDashboardData({ environment: ["production"] }); const output = formatDashboardWithData(data); - const firstLine = stripAnsi(output.split("\n")[0]); + const firstLine = stripAnsi(at(output.split("\n"), 0)); expect(firstLine).toContain("production"); }); @@ -345,9 +346,9 @@ describe("formatDashboardWithData", () => { const data = makeDashboardData({ url }); const output = formatDashboardWithData(data); // Rendered mode: title line, muted underline, blank separator - const secondLine = stripAnsi(output.split("\n")[1]); + const secondLine = stripAnsi(at(output.split("\n"), 1)); expect(secondLine).toMatch(/^─+$/); - expect(stripAnsi(output.split("\n")[2])).toBe(""); + expect(stripAnsi(at(output.split("\n"), 2))).toBe(""); }); }); diff --git a/packages/cli/test/lib/formatters/event-outcomes.test.ts b/packages/cli/test/lib/formatters/event-outcomes.test.ts index 1ee8759045..5f0c5052b9 100644 --- a/packages/cli/test/lib/formatters/event-outcomes.test.ts +++ b/packages/cli/test/lib/formatters/event-outcomes.test.ts @@ -4,6 +4,7 @@ import { formatEventOutcomes, summarizeEventOutcomes, } from "../../../src/lib/formatters/event-outcomes.js"; +import { at } from "../../helpers.js"; function bucket( overrides: Partial< @@ -118,7 +119,7 @@ describe("summarizeEventOutcomes", () => { events: 10, tags: [], }); - expect(rows[1].outcome).toBe("rate_limited"); + expect(at(rows, 1).outcome).toBe("rate_limited"); }); test("defaults tags to [] when an older server omits them", () => { @@ -137,7 +138,7 @@ describe("summarizeEventOutcomes", () => { const rows = summarizeEventOutcomes(response); - expect(rows[0].tags).toEqual([]); + expect(at(rows, 0).tags).toEqual([]); expect(formatEventOutcomes(rows)).toContain("—"); }); }); diff --git a/packages/cli/test/lib/formatters/explore-timeseries.test.ts b/packages/cli/test/lib/formatters/explore-timeseries.test.ts index 426844ca78..15bf59e32c 100644 --- a/packages/cli/test/lib/formatters/explore-timeseries.test.ts +++ b/packages/cli/test/lib/formatters/explore-timeseries.test.ts @@ -16,6 +16,7 @@ import { // oxlint-disable-next-line sentry-cli/no-namespace-import -- terminal capability boundary for vi.spyOn import * as terminal from "../../../src/lib/sixel.js"; import type { DecodedImage } from "../../../src/lib/sixel-image.js"; +import { at, must } from "../../helpers.js"; /** Sanitized shape of a captured spans timeseries response, including ingestion metadata. */ function makeData(): ExploreTimeSeriesData { @@ -104,7 +105,7 @@ describe("formatExploreTimeSeriesHuman", () => { test("renders each measure with its own metadata and distinguishes missing values from zero", () => { const data = makeData(); - data.timeSeries[0].values.pop(); + at(data.timeSeries, 0).values.pop(); data.timeSeries.push({ yAxis: "p95(span.duration)", meta: { @@ -138,7 +139,7 @@ describe("formatExploreTimeSeriesHuman", () => { test("preserves identifier-like and markdown-like strings without coercion", () => { const data = makeData(); - const series = data.timeSeries[0]; + const series = at(data.timeSeries, 0); series.yAxis = "latest_event()"; series.meta.valueType = "string"; series.values = [ @@ -165,7 +166,7 @@ describe("formatExploreTimeSeriesHuman", () => { test("distinguishes retention, unfinished windows, and unavailable scan coverage", () => { const data = makeData(); - const series = data.timeSeries[0]; + const series = at(data.timeSeries, 0); series.meta.dataScanned = "partial"; series.values[0] = { timestamp: Date.UTC(2026, 0, 1), @@ -176,7 +177,7 @@ describe("formatExploreTimeSeriesHuman", () => { sampleRate: 0.1, confidence: "low", }; - series.values[2].incompleteReason = "NOT_ELAPSED"; + at(series.values, 2).incompleteReason = "NOT_ELAPSED"; const output = formatExploreTimeSeriesHuman(data); @@ -191,7 +192,7 @@ describe("formatExploreTimeSeriesHuman", () => { test("does not mistake absent series or buckets for zero-valued results", () => { const data = makeData(); - data.timeSeries[0].values = []; + at(data.timeSeries, 0).values = []; expect(formatExploreTimeSeriesHuman(data)).toContain( "No time buckets returned", ); @@ -283,7 +284,8 @@ describe("Explore time-series graphics", () => { }); afterEach(() => { - process.stdout.columns = savedColumns; + // Non-TTY streams have no columns; restore that state as-is. + Reflect.set(process.stdout, "columns", savedColumns); }); test.each(["kitty", "sixel"] as const)( @@ -292,8 +294,8 @@ describe("Explore time-series graphics", () => { vi.mocked(terminal.selectGraphicsFormat).mockReturnValue(format); vi.stubEnv("TZ", "America/Los_Angeles"); const data = makeData(); - const count = data.timeSeries[0]; - count.values[2].incomplete = false; + const count = at(data.timeSeries, 0); + at(count.values, 2).incomplete = false; data.timeSeries.push({ yAxis: "p95(span.duration)", meta: { @@ -334,7 +336,9 @@ describe("Explore time-series graphics", () => { expect(output).not.toContain("TIME (UTC)"); expect(data).toEqual(original); if (format === "kitty") { - const [countImage, durationImage] = kittyImages(output); + const kitty = kittyImages(output); + const countImage = at(kitty, 0); + const durationImage = at(kitty, 1); expect(textPixels(countImage, 0, 0, 5)).toEqual(labelPixels("1,234")); expect(textPixels(durationImage, 0, 0, 4)).toEqual(labelPixels("25ms")); expect(textPixels(durationImage, 41, 48, 23)).toEqual( @@ -363,7 +367,7 @@ describe("Explore time-series graphics", () => { "retains the complete expression %s below an abbreviated legend", (yAxis) => { const data = makeData(); - data.timeSeries[0].yAxis = yAxis; + at(data.timeSeries, 0).yAxis = yAxis; const output = formatExploreTimeSeriesHuman(data); @@ -386,10 +390,10 @@ describe("Explore time-series graphics", () => { "keeps $valueType units in the caption on a narrow chart (maximum $maximum)", ({ valueType, maximum, label }) => { const data = makeData(); - const series = data.timeSeries[0]; + const series = at(data.timeSeries, 0); series.meta.valueType = valueType; series.meta.valueUnit = "1/second"; - series.values[0].value = maximum; + at(series.values, 0).value = maximum; // A redundant axis unit would consume the space needed by the UTC labels. process.stdout.columns = 56; vi.mocked(terminal.terminalPixelWidth).mockReturnValue(448); @@ -398,7 +402,7 @@ describe("Explore time-series graphics", () => { const images = kittyImages(output); expect(images).toHaveLength(1); - expect(textPixels(images[0], 0, 0, label.length)).toEqual( + expect(textPixels(at(images, 0), 0, 0, label.length)).toEqual( labelPixels(label), ); expect(output).toContain("Interval: 5m · Unit: 1/second"); @@ -410,7 +414,7 @@ describe("Explore time-series graphics", () => { test("keeps gaps in place, distinguishes zero, and retains incomplete values and warnings", () => { const data = makeData(); - const series = data.timeSeries[0]; + const series = at(data.timeSeries, 0); series.meta.dataScanned = "partial"; series.values = [10_000, null, 0, 90_000, 80_000, 70_000, 5000, 1].map( (value, index) => ({ @@ -419,21 +423,21 @@ describe("Explore time-series graphics", () => { incomplete: false, }), ); - series.values[3].incomplete = true; - series.values[3].incompleteReason = "OUTSIDE_RETENTION"; - series.values[4].incomplete = true; - series.values[4].incompleteReason = "INGESTION_PENDING"; - series.values[5].incomplete = true; - series.values[5].incompleteReason = "NOT_ELAPSED"; - series.values[6].sampleRate = 0.1; - series.values[6].confidence = "low"; + at(series.values, 3).incomplete = true; + at(series.values, 3).incompleteReason = "OUTSIDE_RETENTION"; + at(series.values, 4).incomplete = true; + at(series.values, 4).incompleteReason = "INGESTION_PENDING"; + at(series.values, 5).incomplete = true; + at(series.values, 5).incompleteReason = "NOT_ELAPSED"; + at(series.values, 6).sampleRate = 0.1; + at(series.values, 6).confidence = "low"; const original = structuredClone(data); const output = formatExploreTimeSeriesHuman(data); const images = kittyImages(output); expect(images).toHaveLength(1); - const image = images[0]; + const image = at(images, 0); expect(image.data).toHaveLength(image.width * image.height * 4); // Eight slots follow the value-axis gutter. Gaps keep their time positions // and the axis below the plot must not turn them into visible data ticks. @@ -484,7 +488,7 @@ describe("Explore time-series graphics", () => { test("scales sub-centesimal measurements without labelling them zero", () => { const data = makeData(); - const series = data.timeSeries[0]; + const series = at(data.timeSeries, 0); series.meta.valueType = "duration"; series.meta.valueUnit = "millisecond"; series.values = [0.001, 0.002].map((value, index) => ({ @@ -494,9 +498,8 @@ describe("Explore time-series graphics", () => { })); const output = formatExploreTimeSeriesHuman(data); - const [image] = kittyImages(output); + const image = must(kittyImages(output)[0], "a kitty image"); - expect(image).toBeDefined(); expect(textPixels(image, 0, 0, 7)).toEqual(labelPixels("0.002ms")); expect(alphaAt(image, 100, 22)).toBe(0); expect(alphaAt(image, 100, 23)).toBe(255); @@ -507,13 +510,13 @@ describe("Explore time-series graphics", () => { "uses the table for a %s series", (kind) => { const data = makeData(); - const series = data.timeSeries[0]; + const series = at(data.timeSeries, 0); if (kind === "negative") { - series.values[0].value = -5; + at(series.values, 0).value = -5; } else if (kind === "string") { - series.values[0].value = "00123"; + at(series.values, 0).value = "00123"; } else if (kind === "irregular") { - series.values[1].timestamp += 1000; + at(series.values, 1).timestamp += 1000; } else { series.values = series.values.map((bucket) => ({ ...bucket, @@ -536,7 +539,7 @@ describe("Explore time-series graphics", () => { test("uses the full table when axes leave too little plot width for percentile buckets", () => { const data = makeData(); - const series = data.timeSeries[0]; + const series = at(data.timeSeries, 0); series.yAxis = "p95(span.duration)"; series.values = Array.from({ length: 300 }, (_, index) => ({ timestamp: Date.UTC(2026, 0, 1) + index * series.meta.interval, @@ -583,7 +586,7 @@ describe("Explore time-series graphics", () => { "preserves JSON with fields %j without probing the terminal", (fields) => { const data = makeData(); - data.timeSeries[0].values[1].value = null; + at(at(data.timeSeries, 0).values, 1).value = null; const original = structuredClone(data); const chunks: (string | Uint8Array)[] = []; const config = { diff --git a/packages/cli/test/lib/formatters/feedback.test.ts b/packages/cli/test/lib/formatters/feedback.test.ts index a1e845254c..6bd5034b83 100644 --- a/packages/cli/test/lib/formatters/feedback.test.ts +++ b/packages/cli/test/lib/formatters/feedback.test.ts @@ -12,8 +12,9 @@ import { formatSpamFeedback, } from "../../../src/lib/formatters/feedback.js"; import type { SentryFeedback } from "../../../src/types/index.js"; +import { without } from "../../helpers.js"; -const originalPlainOutput = process.env.SENTRY_PLAIN_OUTPUT; +const originalPlainOutput = process.env["SENTRY_PLAIN_OUTPUT"]; function feedback(overrides: Partial = {}): SentryFeedback { return { @@ -25,21 +26,21 @@ function feedback(overrides: Partial = {}): SentryFeedback { status: "unresolved", hasSeen: false, firstSeen: "2026-07-16T12:00:00Z", - project: { id: "1", slug: "web", name: "Web" }, + project: { id: "1", slug: "web", name: "Web", platform: null }, metadata: { message: "Button | failed\nwith **markdown**" }, ...overrides, }; } beforeAll(() => { - process.env.SENTRY_PLAIN_OUTPUT = "1"; + process.env["SENTRY_PLAIN_OUTPUT"] = "1"; }); afterAll(() => { if (originalPlainOutput === undefined) { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } else { - process.env.SENTRY_PLAIN_OUTPUT = originalPlainOutput; + process.env["SENTRY_PLAIN_OUTPUT"] = originalPlainOutput; } }); @@ -100,7 +101,7 @@ describe("formatFeedbackList", () => { test("does not label an absent read state as unread", () => { const output = formatFeedbackList({ - feedback: [feedback({ hasSeen: undefined })], + feedback: [without(feedback(), "hasSeen")], hasMore: false, hasPrev: false, org: "test-org", @@ -157,10 +158,10 @@ describe("formatFeedbackView", () => { }); test("truncates long list messages but preserves the complete detail message", () => { - const savedPlain = process.env.SENTRY_PLAIN_OUTPUT; + const savedPlain = process.env["SENTRY_PLAIN_OUTPUT"]; const savedColumns = process.stdout.columns; const longMessage = `${"Checkout failed ".repeat(20)}\nTAIL **marker**`; - process.env.SENTRY_PLAIN_OUTPUT = "0"; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; process.stdout.columns = 60; try { @@ -187,17 +188,17 @@ describe("formatFeedbackView", () => { expect(viewOutput).toContain("TAIL **marker**"); } finally { if (savedPlain === undefined) { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } else { - process.env.SENTRY_PLAIN_OUTPUT = savedPlain; + process.env["SENTRY_PLAIN_OUTPUT"] = savedPlain; } process.stdout.columns = savedColumns; } }); test("removes terminal control sequences from untrusted fields", () => { - const savedPlain = process.env.SENTRY_PLAIN_OUTPUT; - process.env.SENTRY_PLAIN_OUTPUT = "0"; + const savedPlain = process.env["SENTRY_PLAIN_OUTPUT"]; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; const maliciousControlSequences = [ "\u001b[2J", "\u001b]52;c;dGVzdA==\u0007", @@ -262,9 +263,9 @@ describe("formatFeedbackView", () => { expect(viewOutput).toContain("screen.png"); } finally { if (savedPlain === undefined) { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } else { - process.env.SENTRY_PLAIN_OUTPUT = savedPlain; + process.env["SENTRY_PLAIN_OUTPUT"] = savedPlain; } } }); diff --git a/packages/cli/test/lib/formatters/human.details.test.ts b/packages/cli/test/lib/formatters/human.details.test.ts index acb6f11a37..d80520b49c 100644 --- a/packages/cli/test/lib/formatters/human.details.test.ts +++ b/packages/cli/test/lib/formatters/human.details.test.ts @@ -21,7 +21,7 @@ import type { SentryOrganization, SentryProject, } from "../../../src/types/index.js"; -import { useTestConfigDir } from "../../helpers.js"; +import { useTestConfigDir, without } from "../../helpers.js"; // Isolated per-test config dir so `resolveOrgDisplayName`'s cached-org lookup // (via `getCachedOrganizations`) starts empty. Without this, an earlier test @@ -133,7 +133,7 @@ describe("formatOrgDetails", () => { }); test("handles missing dateCreated", () => { - const org = createMockOrg({ dateCreated: undefined }); + const org = without(createMockOrg(), "dateCreated"); // Should not throw const result = stripAnsi(formatOrgDetails(org)); expect(result).not.toContain("Created"); @@ -234,7 +234,7 @@ describe("formatProjectDetails", () => { }); test("handles missing firstEvent", () => { - const project = createMockProject({ firstEvent: undefined }); + const project = without(createMockProject(), "firstEvent"); const result = stripAnsi(formatProjectDetails(project)); expect(result).toContain("No events yet"); }); @@ -302,7 +302,12 @@ describe("formatIssueDetails", () => { test("includes project info when present", () => { const issue = createMockIssue({ - project: { slug: "frontend", name: "Frontend App" }, + project: { + id: "1", + slug: "frontend", + name: "Frontend App", + platform: null, + }, }); const result = stripAnsi(formatIssueDetails(issue)); @@ -312,8 +317,8 @@ describe("formatIssueDetails", () => { test("formats single release correctly", () => { const issue = createMockIssue({ - firstRelease: { shortVersion: "1.0.0" }, - lastRelease: { shortVersion: "1.0.0" }, + firstRelease: { version: "1.0.0", shortVersion: "1.0.0" }, + lastRelease: { version: "1.0.0", shortVersion: "1.0.0" }, }); const result = stripAnsi(formatIssueDetails(issue)); @@ -323,8 +328,8 @@ describe("formatIssueDetails", () => { test("formats release range when different", () => { const issue = createMockIssue({ - firstRelease: { shortVersion: "1.0.0" }, - lastRelease: { shortVersion: "2.0.0" }, + firstRelease: { version: "1.0.0", shortVersion: "1.0.0" }, + lastRelease: { version: "2.0.0", shortVersion: "2.0.0" }, }); const result = stripAnsi(formatIssueDetails(issue)); @@ -346,7 +351,7 @@ describe("formatIssueDetails", () => { test("includes assignee name", () => { const issue = createMockIssue({ - assignedTo: { name: "John Doe" }, + assignedTo: { type: "user", id: "1", name: "John Doe" }, }); const result = stripAnsi(formatIssueDetails(issue)); @@ -354,7 +359,7 @@ describe("formatIssueDetails", () => { }); test("shows Unassigned when no assignee", () => { - const issue = createMockIssue({ assignedTo: undefined }); + const issue = without(createMockIssue(), "assignedTo"); const result = stripAnsi(formatIssueDetails(issue)); expect(result).toContain("Unassigned"); }); @@ -395,18 +400,19 @@ describe("formatIssueDetails", () => { }); test("handles missing optional fields gracefully", () => { - const issue = createMockIssue({ - platform: undefined, - type: undefined, - priority: undefined, - substatus: undefined, - isUnhandled: undefined, - project: undefined, - firstRelease: undefined, - lastRelease: undefined, - culprit: undefined, - metadata: undefined, - }); + const issue = without( + createMockIssue(), + "platform", + "type", + "priority", + "substatus", + "isUnhandled", + "project", + "firstRelease", + "lastRelease", + "culprit", + "metadata", + ); // Should not throw const result = stripAnsi(formatIssueDetails(issue)); @@ -431,7 +437,7 @@ describe("formatIssueDetails", () => { }); test("omits fixability when seerFixabilityScore is undefined", () => { - const issue = createMockIssue({ seerFixabilityScore: undefined }); + const issue = without(createMockIssue(), "seerFixabilityScore"); const result = stripAnsi(formatIssueDetails(issue)); expect(result).not.toContain("Fixability"); }); @@ -930,7 +936,7 @@ describe("formatEventDetails", () => { test("handles minimal event", () => { const result = formatEventDetails( - createMockEvent({ dateReceived: undefined }), + without(createMockEvent(), "dateReceived"), ); expect(typeof result).toBe("string"); expect(result.length).toBeGreaterThan(0); diff --git a/packages/cli/test/lib/formatters/human.test.ts b/packages/cli/test/lib/formatters/human.test.ts index 25f0ceb70e..de6a14a2c1 100644 --- a/packages/cli/test/lib/formatters/human.test.ts +++ b/packages/cli/test/lib/formatters/human.test.ts @@ -566,11 +566,16 @@ describe("writeIssueTable priority labels", () => { metadata: {}, }; + /** An issue as the API sends it, with a priority outside the typed enum. */ + function issueWithPriority(priority: string): SentryIssue { + return JSON.parse(JSON.stringify({ ...baseMockIssue, priority })); + } + test("critical priority renders in triage column", () => { const { writer, output } = capture(); const rows: IssueTableRow[] = [ { - issue: { ...baseMockIssue, priority: "critical" }, + issue: issueWithPriority("critical"), orgSlug: "org", formatOptions: {}, }, @@ -596,7 +601,7 @@ describe("writeIssueTable priority labels", () => { const { writer, output } = capture(); const rows: IssueTableRow[] = [ { - issue: { ...baseMockIssue, priority: "urgent" }, + issue: issueWithPriority("urgent"), orgSlug: "org", formatOptions: {}, }, @@ -722,16 +727,16 @@ describe("formatDashboardCreated", () => { describe("formatUpgradeResult", () => { // Force plain output so we get raw markdown (no ANSI codes) - const origPlain = process.env.SENTRY_PLAIN_OUTPUT; + const origPlain = process.env["SENTRY_PLAIN_OUTPUT"]; function withPlain(fn: () => void) { - process.env.SENTRY_PLAIN_OUTPUT = "1"; + process.env["SENTRY_PLAIN_OUTPUT"] = "1"; try { fn(); } finally { if (origPlain === undefined) { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } else { - process.env.SENTRY_PLAIN_OUTPUT = origPlain; + process.env["SENTRY_PLAIN_OUTPUT"] = origPlain; } } } diff --git a/packages/cli/test/lib/formatters/issue-links.test.ts b/packages/cli/test/lib/formatters/issue-links.test.ts index 950f00e013..aeb19826e4 100644 --- a/packages/cli/test/lib/formatters/issue-links.test.ts +++ b/packages/cli/test/lib/formatters/issue-links.test.ts @@ -13,7 +13,7 @@ describe("formatIssueLinkResult", () => { useEnvSandbox(["SENTRY_PLAIN_OUTPUT"]); beforeEach(() => { - process.env.SENTRY_PLAIN_OUTPUT = "1"; + process.env["SENTRY_PLAIN_OUTPUT"] = "1"; }); test.each([ diff --git a/packages/cli/test/lib/formatters/issue-tags.test.ts b/packages/cli/test/lib/formatters/issue-tags.test.ts index e611188e53..b5a6ed1a30 100644 --- a/packages/cli/test/lib/formatters/issue-tags.test.ts +++ b/packages/cli/test/lib/formatters/issue-tags.test.ts @@ -1,6 +1,7 @@ import type { GetOrganizationIssueTagResponse } from "@sentry/api"; import { describe, expect, test } from "vitest"; import { formatIssueTags } from "../../../src/lib/formatters/issue-tags.js"; +import { must, without } from "../../helpers.js"; /** A distribution with undisplayed events, rather than an exhaustive list. */ function distribution( @@ -34,7 +35,11 @@ describe("formatIssueTags", () => { test.each([undefined, null, 0])( "does not divide by an unknown or zero total (%s)", (total) => { - const output = formatIssueTags({ ...distribution(), totalValues: total }); + const output = formatIssueTags( + total === undefined + ? without(distribution(), "totalValues") + : { ...distribution(), totalValues: total }, + ); expect(output).not.toContain("%"); expect(output).not.toContain("NaN"); expect(output).not.toContain("Infinity"); @@ -43,7 +48,7 @@ describe("formatIssueTags", () => { test("distinguishes empty values from unknown values and preserves literal tag text", () => { const tag = distribution(); - const value = tag.topValues![0]; + const value = must(tag.topValues?.[0], "a top value"); tag.topValues = [ { ...value, value: "" }, { ...value, value: null }, diff --git a/packages/cli/test/lib/formatters/json.test.ts b/packages/cli/test/lib/formatters/json.test.ts index 00c73cba2d..afd90311ee 100644 --- a/packages/cli/test/lib/formatters/json.test.ts +++ b/packages/cli/test/lib/formatters/json.test.ts @@ -420,8 +420,8 @@ describe("writeJsonList", () => { nextCursor: "abc123", }); const result = parsed() as Record; - expect(result.hasMore).toBe(true); - expect(result.nextCursor).toBe("abc123"); + expect(result["hasMore"]).toBe(true); + expect(result["nextCursor"]).toBe("abc123"); }); test("omits nextCursor when null", () => { @@ -431,14 +431,14 @@ describe("writeJsonList", () => { nextCursor: null, }); const result = parsed() as Record; - expect(result.nextCursor).toBeUndefined(); + expect(result["nextCursor"]).toBeUndefined(); }); test("omits nextCursor when undefined", () => { const { writer, parsed } = capture(); writeJsonList(writer, [{ id: 1 }], { hasMore: false }); const result = parsed() as Record; - expect(result.nextCursor).toBeUndefined(); + expect(result["nextCursor"]).toBeUndefined(); }); test("omits nextCursor when empty string", () => { @@ -448,7 +448,7 @@ describe("writeJsonList", () => { nextCursor: "", }); const result = parsed() as Record; - expect(result.nextCursor).toBeUndefined(); + expect(result["nextCursor"]).toBeUndefined(); }); test("includes errors when non-empty", () => { @@ -456,21 +456,21 @@ describe("writeJsonList", () => { const errors = [{ message: "org failed" }]; writeJsonList(writer, [{ id: 1 }], { hasMore: false, errors }); const result = parsed() as Record; - expect(result.errors).toEqual(errors); + expect(result["errors"]).toEqual(errors); }); test("omits errors when empty array", () => { const { writer, parsed } = capture(); writeJsonList(writer, [{ id: 1 }], { hasMore: false, errors: [] }); const result = parsed() as Record; - expect(result.errors).toBeUndefined(); + expect(result["errors"]).toBeUndefined(); }); test("omits errors when undefined", () => { const { writer, parsed } = capture(); writeJsonList(writer, [{ id: 1 }], { hasMore: false }); const result = parsed() as Record; - expect(result.errors).toBeUndefined(); + expect(result["errors"]).toBeUndefined(); }); test("handles empty items array", () => { @@ -490,11 +490,11 @@ describe("writeJsonList", () => { fields: ["id", "title"], }); const result = parsed() as Record; - expect(result.data).toEqual([ + expect(result["data"]).toEqual([ { id: 1, title: "Bug" }, { id: 2, title: "Feature" }, ]); - expect(result.hasMore).toBe(true); + expect(result["hasMore"]).toBe(true); }); test("does not filter wrapper metadata keys", () => { @@ -505,9 +505,9 @@ describe("writeJsonList", () => { fields: ["id"], }); const result = parsed() as Record; - expect(result.data).toEqual([{ id: 1 }]); - expect(result.hasMore).toBe(true); - expect(result.nextCursor).toBe("xyz"); + expect(result["data"]).toEqual([{ id: 1 }]); + expect(result["hasMore"]).toBe(true); + expect(result["nextCursor"]).toBe("xyz"); }); test("with empty fields array: outputs full items (no filtering)", () => { @@ -515,15 +515,15 @@ describe("writeJsonList", () => { const items = [{ id: 1, title: "Bug", extra: true }]; writeJsonList(writer, items, { hasMore: false, fields: [] }); const result = parsed() as Record; - expect(result.data).toEqual(items); + expect(result["data"]).toEqual(items); }); test("with undefined fields: outputs full items (no filtering)", () => { const { writer, parsed } = capture(); const items = [{ id: 1, title: "Bug", extra: true }]; - writeJsonList(writer, items, { hasMore: false, fields: undefined }); + writeJsonList(writer, items, { hasMore: false }); const result = parsed() as Record; - expect(result.data).toEqual(items); + expect(result["data"]).toEqual(items); }); test("supports dot-notation field filtering on nested items", () => { @@ -537,7 +537,7 @@ describe("writeJsonList", () => { fields: ["id", "metadata.value"], }); const result = parsed() as Record; - expect(result.data).toEqual([ + expect(result["data"]).toEqual([ { id: 1, metadata: { value: "ReferenceError" } }, { id: 2, metadata: { value: "DeprecationWarning" } }, ]); @@ -550,8 +550,8 @@ describe("writeJsonList", () => { extra: { hint: "sentry project list my-org/ --json" }, }); const result = parsed() as Record; - expect(result.hint).toBe("sentry project list my-org/ --json"); - expect(result.hasMore).toBe(true); + expect(result["hint"]).toBe("sentry project list my-org/ --json"); + expect(result["hasMore"]).toBe(true); }); test("extra metadata does not interfere with fields filtering", () => { @@ -562,8 +562,8 @@ describe("writeJsonList", () => { extra: { hint: "use --cursor" }, }); const result = parsed() as Record; - expect(result.data).toEqual([{ id: 1 }]); - expect(result.hint).toBe("use --cursor"); + expect(result["data"]).toEqual([{ id: 1 }]); + expect(result["hint"]).toBe("use --cursor"); }); test("output ends with newline", () => { diff --git a/packages/cli/test/lib/formatters/local.test.ts b/packages/cli/test/lib/formatters/local.test.ts index 7d836b1405..1f130e21b8 100644 --- a/packages/cli/test/lib/formatters/local.test.ts +++ b/packages/cli/test/lib/formatters/local.test.ts @@ -25,6 +25,7 @@ import { } from "../../../src/lib/formatters/local.js"; import { parseEventTimestamp } from "../../../src/commands/local/timestamp.js"; import { stripAnsi } from "../../../src/lib/formatters/plain-detect.js"; +import { at } from "../../helpers.js"; describe("formatTime", () => { test("formats epoch seconds", () => { @@ -468,14 +469,14 @@ describe("formatItem", () => { const event = { timestamp: 1_700_000_000, message: "boom" }; const lines = formatItem("error", event, header, "fallback"); expect(lines).toHaveLength(1); - expect(stripAnsi(lines[0])).toContain("[ERROR]"); + expect(stripAnsi(at(lines, 0))).toContain("[ERROR]"); }); test("dispatches event type to error formatter", () => { const event = { timestamp: 1_700_000_000, message: "boom" }; const lines = formatItem("event", event, header, "fallback"); expect(lines).toHaveLength(1); - expect(stripAnsi(lines[0])).toContain("[ERROR]"); + expect(stripAnsi(at(lines, 0))).toContain("[ERROR]"); }); test("prints nothing for replay recording segments", () => { @@ -493,7 +494,7 @@ describe("formatItem", () => { }; const lines = formatItem("transaction", event, header, "fallback"); expect(lines).toHaveLength(1); - expect(stripAnsi(lines[0])).toContain("[TRACE]"); + expect(stripAnsi(at(lines, 0))).toContain("[TRACE]"); }); test("dispatches log type to log formatter", () => { @@ -502,19 +503,19 @@ describe("formatItem", () => { }; const lines = formatItem("log", event, header, "fallback"); expect(lines).toHaveLength(1); - expect(stripAnsi(lines[0])).toContain("[INFO]"); + expect(stripAnsi(at(lines, 0))).toContain("[INFO]"); }); test("falls back for unknown types", () => { const lines = formatItem("attachment", {}, header, "attachment"); expect(lines).toHaveLength(1); - expect(stripAnsi(lines[0])).toContain("attachment"); + expect(stripAnsi(at(lines, 0))).toContain("attachment"); }); test("falls back for undefined type", () => { const lines = formatItem(undefined, {}, header, "unknown"); expect(lines).toHaveLength(1); - expect(stripAnsi(lines[0])).toContain("unknown"); + expect(stripAnsi(at(lines, 0))).toContain("unknown"); }); }); @@ -769,7 +770,7 @@ describe("formatItemJson", () => { }; const lines = formatItemJson("error", event, serverHeader); expect(lines).toHaveLength(1); - const parsed = JSON.parse(lines[0]); + const parsed = JSON.parse(at(lines, 0)); expect(parsed.type).toBe("error"); expect(parsed.error_type).toBe("TypeError"); expect(parsed.message).toBe("x is not a function"); @@ -787,7 +788,7 @@ describe("formatItemJson", () => { serverHeader, ); - expect(JSON.parse(lines[0]).schema_version).toBe(1); + expect(JSON.parse(at(lines, 0)).schema_version).toBe(1); }); test("preserves event and envelope identities for agent correlation", () => { @@ -805,7 +806,7 @@ describe("formatItemJson", () => { }, ); - expect(JSON.parse(lines[0])).toMatchObject({ + expect(JSON.parse(at(lines, 0))).toMatchObject({ event_id: "event-123", envelope_id: "envelope-123", }); @@ -817,7 +818,7 @@ describe("formatItemJson", () => { message: "Something went wrong", }; const lines = formatItemJson("error", event, serverHeader); - const parsed = JSON.parse(lines[0]); + const parsed = JSON.parse(at(lines, 0)); expect(parsed.type).toBe("message"); expect(parsed.level).toBe("error"); expect(parsed.error_type).toBeUndefined(); @@ -831,7 +832,7 @@ describe("formatItemJson", () => { exception: { values: [{ type: "TypeError", value: "boom" }] }, }; const lines = formatItemJson("event", event, serverHeader); - const parsed = JSON.parse(lines[0]); + const parsed = JSON.parse(at(lines, 0)); expect(parsed.type).toBe("error"); }); @@ -846,7 +847,7 @@ describe("formatItemJson", () => { }, serverHeader, ); - expect(JSON.parse(errorLines[0]).trace_id).toBe(traceId); + expect(JSON.parse(at(errorLines, 0)).trace_id).toBe(traceId); const txnLines = formatItemJson( "transaction", @@ -858,7 +859,7 @@ describe("formatItemJson", () => { }, serverHeader, ); - expect(JSON.parse(txnLines[0]).trace_id).toBe(traceId); + expect(JSON.parse(at(txnLines, 0)).trace_id).toBe(traceId); }); test("includes trace_id for logs from sentry.trace.trace_id attribute", () => { @@ -878,7 +879,7 @@ describe("formatItemJson", () => { }, serverHeader, ); - expect(JSON.parse(lines[0]).trace_id).toBe(traceId); + expect(JSON.parse(at(lines, 0)).trace_id).toBe(traceId); }); test("formats transaction with semantic attributes", () => { @@ -899,7 +900,7 @@ describe("formatItemJson", () => { }; const lines = formatItemJson("transaction", event, serverHeader); expect(lines).toHaveLength(1); - const parsed = JSON.parse(lines[0]); + const parsed = JSON.parse(at(lines, 0)); expect(parsed.type).toBe("transaction"); expect(parsed.op).toBe("gen_ai"); expect(parsed.label).toBe("chat gpt-4o"); @@ -916,7 +917,7 @@ describe("formatItemJson", () => { contexts: { trace: { op: "http.server" } }, }; const lines = formatItemJson("transaction", event, serverHeader); - const parsed = JSON.parse(lines[0]); + const parsed = JSON.parse(at(lines, 0)); expect(parsed.label).toBe("GET /api/users"); expect(parsed.op).toBe("http.server"); }); @@ -939,14 +940,14 @@ describe("formatItemJson", () => { const lines = formatItemJson("log", event, serverHeader); expect(lines).toHaveLength(2); - const first = JSON.parse(lines[0]); + const first = JSON.parse(at(lines, 0)); expect(first.type).toBe("log"); expect(first.level).toBe("info"); expect(first.message).toBe("User logged in"); expect(first.attributes).toEqual({ user_id: 42 }); expect(first.attributes["sentry.sdk.name"]).toBeUndefined(); - const second = JSON.parse(lines[1]); + const second = JSON.parse(at(lines, 1)); expect(second.level).toBe("debug"); expect(second.message).toBe("Cache hit"); }); @@ -960,7 +961,7 @@ describe("formatItemJson", () => { const event = { timestamp: 1_700_000_000 }; const lines = formatItemJson("attachment", event, serverHeader); expect(lines).toHaveLength(1); - const parsed = JSON.parse(lines[0]); + const parsed = JSON.parse(at(lines, 0)); expect(parsed.type).toBe("attachment"); }); @@ -970,7 +971,7 @@ describe("formatItemJson", () => { { timestamp: "2026-09-08\u009b", event_id: "event\u202e-123" }, serverHeader, ); - const parsed = JSON.parse(lines[0]); + const parsed = JSON.parse(at(lines, 0)); expect(parsed).toMatchObject({ type: "attachment", @@ -993,7 +994,7 @@ describe("formatItemJson", () => { }, serverHeader, ); - expect(JSON.parse(logLines[0]).attributes).toEqual({ + expect(JSON.parse(at(logLines, 0)).attributes).toEqual({ nested: { child: "unsafevalue" }, }); }); @@ -1001,7 +1002,7 @@ describe("formatItemJson", () => { test("detects browser source in JSON", () => { const event = { timestamp: 1_700_000_000, message: "error" }; const lines = formatItemJson("error", event, browserHeader); - const parsed = JSON.parse(lines[0]); + const parsed = JSON.parse(at(lines, 0)); expect(parsed.source).toBe("browser"); }); @@ -1011,11 +1012,11 @@ describe("formatItemJson", () => { contexts: { trace: { op: "http.server", data: { "order.id": "42" } } }, }; const without = JSON.parse( - formatItemJson("transaction", event, serverHeader)[0], + at(formatItemJson("transaction", event, serverHeader), 0), ); expect(without.attributes).toBeUndefined(); const withAttrs = JSON.parse( - formatItemJson("transaction", event, serverHeader, true)[0], + at(formatItemJson("transaction", event, serverHeader, true), 0), ); expect(withAttrs.attributes.user).toEqual({ "order.id": "42" }); }); @@ -1173,8 +1174,8 @@ describe("standalone span support", () => { const payload = { items: [aiSpan, mcpSpan] }; const lines = formatSpanItem(payload, cfHeader); expect(lines).toHaveLength(2); - expect(stripAnsi(lines[0])).toContain("gen_ai"); - expect(stripAnsi(lines[1])).toContain("mcp"); + expect(stripAnsi(at(lines, 0))).toContain("gen_ai"); + expect(stripAnsi(at(lines, 1))).toContain("mcp"); }); test("returns empty for missing items", () => { @@ -1188,7 +1189,7 @@ describe("standalone span support", () => { const payload = { items: [aiSpan] }; const lines = formatItem("span", payload, cfHeader, "span"); expect(lines.length).toBeGreaterThanOrEqual(1); - expect(stripAnsi(lines[0])).toContain("gen_ai"); + expect(stripAnsi(at(lines, 0))).toContain("gen_ai"); }); }); @@ -1197,7 +1198,7 @@ describe("standalone span support", () => { const payload = { items: [aiSpan] }; const lines = formatItemJson("span", payload, cfHeader); expect(lines).toHaveLength(1); - const parsed = JSON.parse(lines[0]); + const parsed = JSON.parse(at(lines, 0)); expect(parsed.type).toBe("span"); expect(parsed.trace_id).toBe("a".repeat(32)); expect(parsed.span_id).toBe("b".repeat(16)); diff --git a/packages/cli/test/lib/formatters/log.test.ts b/packages/cli/test/lib/formatters/log.test.ts index 8a2d760ace..b587f4548d 100644 --- a/packages/cli/test/lib/formatters/log.test.ts +++ b/packages/cli/test/lib/formatters/log.test.ts @@ -19,19 +19,20 @@ import type { SentryLog, TraceItemAttribute, } from "../../../src/types/index.js"; +import { at } from "../../helpers.js"; /** Force rendered (TTY) mode for a describe block */ function useRenderedMode() { let savedPlain: string | undefined; beforeEach(() => { - savedPlain = process.env.SENTRY_PLAIN_OUTPUT; - process.env.SENTRY_PLAIN_OUTPUT = "0"; + savedPlain = process.env["SENTRY_PLAIN_OUTPUT"]; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; }); afterEach(() => { if (savedPlain === undefined) { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } else { - process.env.SENTRY_PLAIN_OUTPUT = savedPlain; + process.env["SENTRY_PLAIN_OUTPUT"] = savedPlain; } }); } @@ -40,14 +41,14 @@ function useRenderedMode() { function usePlainMode() { let savedPlain: string | undefined; beforeEach(() => { - savedPlain = process.env.SENTRY_PLAIN_OUTPUT; - process.env.SENTRY_PLAIN_OUTPUT = "1"; + savedPlain = process.env["SENTRY_PLAIN_OUTPUT"]; + process.env["SENTRY_PLAIN_OUTPUT"] = "1"; }); afterEach(() => { if (savedPlain === undefined) { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } else { - process.env.SENTRY_PLAIN_OUTPUT = savedPlain; + process.env["SENTRY_PLAIN_OUTPUT"] = savedPlain; } }); } @@ -627,7 +628,7 @@ describe("buildLogRowCells", () => { test("first cell contains full log ID", () => { const log = createTestLog(); const cells = buildLogRowCells(log); - expect(stripAnsi(cells[0])).toContain("test-id-123"); + expect(stripAnsi(at(cells, 0))).toContain("test-id-123"); }); test("appends extra field cells when provided", () => { diff --git a/packages/cli/test/lib/formatters/output.test.ts b/packages/cli/test/lib/formatters/output.test.ts index e510d93fa2..664489af08 100644 --- a/packages/cli/test/lib/formatters/output.test.ts +++ b/packages/cli/test/lib/formatters/output.test.ts @@ -313,7 +313,7 @@ describe("renderCommandOutput", () => { const calls: number[] = []; const config: OutputConfig<{ n: number }> = { human: () => ({ - render: (d) => { + render: (d: { n: number }) => { calls.push(d.n); return `#${d.n}`; }, @@ -335,8 +335,8 @@ describe("renderCommandOutput", () => { const w = createTestWriter(); const config: OutputConfig<{ value: string }> = { human: () => ({ - render: (d) => `[${d.value}]`, - finalize: (hint) => `=== END ===${hint ? `\n${hint}` : ""}`, + render: (d: { value: string }) => `[${d.value}]`, + finalize: (hint?: string) => `=== END ===${hint ? `\n${hint}` : ""}`, }), }; diff --git a/packages/cli/test/lib/formatters/semantic-display.test.ts b/packages/cli/test/lib/formatters/semantic-display.test.ts index e88bceb2e6..67fe1aecba 100644 --- a/packages/cli/test/lib/formatters/semantic-display.test.ts +++ b/packages/cli/test/lib/formatters/semantic-display.test.ts @@ -14,6 +14,7 @@ import { inferSemanticOp, mergeTransactionAttributes, } from "../../../src/lib/formatters/semantic-display.js"; +import { at } from "../../helpers.js"; describe("formatSemanticSpanDisplay", () => { describe("GenAI spans", () => { @@ -544,7 +545,7 @@ describe("collectSpanAttributes", () => { }; const collected = collectSpanAttributes(event); expect(collected).toHaveLength(2); - expect(inferSemanticOp(collected[1])).toBe("gen_ai"); + expect(inferSemanticOp(at(collected, 1))).toBe("gen_ai"); }); test("skips spans without a data object", () => { diff --git a/packages/cli/test/lib/formatters/sql.property.test.ts b/packages/cli/test/lib/formatters/sql.property.test.ts index 1bb86ac179..2858ebdf86 100644 --- a/packages/cli/test/lib/formatters/sql.property.test.ts +++ b/packages/cli/test/lib/formatters/sql.property.test.ts @@ -28,20 +28,20 @@ let originalPlainOutput: string | undefined; let originalNoColor: string | undefined; beforeEach(() => { - originalPlainOutput = process.env.SENTRY_PLAIN_OUTPUT; - originalNoColor = process.env.NO_COLOR; + originalPlainOutput = process.env["SENTRY_PLAIN_OUTPUT"]; + originalNoColor = process.env["NO_COLOR"]; }); afterEach(() => { if (originalPlainOutput !== undefined) { - process.env.SENTRY_PLAIN_OUTPUT = originalPlainOutput; + process.env["SENTRY_PLAIN_OUTPUT"] = originalPlainOutput; } else { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } if (originalNoColor !== undefined) { - process.env.NO_COLOR = originalNoColor; + process.env["NO_COLOR"] = originalNoColor; } else { - delete process.env.NO_COLOR; + delete process.env["NO_COLOR"]; } }); @@ -127,7 +127,7 @@ describe("property: isDbSpanOp", () => { describe("property: colorizeSql", () => { test("stripping ANSI preserves original text content (case-insensitive)", () => { - process.env.SENTRY_PLAIN_OUTPUT = "0"; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; fcAssert( property(sqlStringArb, (sql) => { const colorized = colorizeSql(sql); @@ -140,7 +140,7 @@ describe("property: colorizeSql", () => { }); test("plain mode returns input unchanged (identity)", () => { - process.env.SENTRY_PLAIN_OUTPUT = "1"; + process.env["SENTRY_PLAIN_OUTPUT"] = "1"; fcAssert( property(sqlStringArb, (sql) => { expect(colorizeSql(sql)).toBe(sql); @@ -150,7 +150,7 @@ describe("property: colorizeSql", () => { }); test("is deterministic: same input always gives same output", () => { - process.env.SENTRY_PLAIN_OUTPUT = "0"; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; fcAssert( property(sqlStringArb, (sql) => { expect(colorizeSql(sql)).toBe(colorizeSql(sql)); @@ -160,7 +160,7 @@ describe("property: colorizeSql", () => { }); test("idempotent strip: stripAnsi(colorizeSql(x)) == stripAnsi(colorizeSql(stripAnsi(colorizeSql(x))))", () => { - process.env.SENTRY_PLAIN_OUTPUT = "0"; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; fcAssert( property(sqlStringArb, (sql) => { const once = stripAnsi(colorizeSql(sql)); @@ -172,7 +172,7 @@ describe("property: colorizeSql", () => { }); test("never returns empty for non-empty input", () => { - process.env.SENTRY_PLAIN_OUTPUT = "0"; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; fcAssert( property(sqlStringArb, (sql) => { if (sql.length > 0) { diff --git a/packages/cli/test/lib/formatters/sql.test.ts b/packages/cli/test/lib/formatters/sql.test.ts index 912028a28c..18604275f1 100644 --- a/packages/cli/test/lib/formatters/sql.test.ts +++ b/packages/cli/test/lib/formatters/sql.test.ts @@ -22,20 +22,20 @@ let originalPlainOutput: string | undefined; let originalNoColor: string | undefined; beforeEach(() => { - originalPlainOutput = process.env.SENTRY_PLAIN_OUTPUT; - originalNoColor = process.env.NO_COLOR; + originalPlainOutput = process.env["SENTRY_PLAIN_OUTPUT"]; + originalNoColor = process.env["NO_COLOR"]; }); afterEach(() => { if (originalPlainOutput !== undefined) { - process.env.SENTRY_PLAIN_OUTPUT = originalPlainOutput; + process.env["SENTRY_PLAIN_OUTPUT"] = originalPlainOutput; } else { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } if (originalNoColor !== undefined) { - process.env.NO_COLOR = originalNoColor; + process.env["NO_COLOR"] = originalNoColor; } else { - delete process.env.NO_COLOR; + delete process.env["NO_COLOR"]; } }); @@ -79,13 +79,13 @@ describe("isDbSpanOp", () => { describe("colorizeSql", () => { test("returns original text in plain mode", () => { - process.env.SENTRY_PLAIN_OUTPUT = "1"; + process.env["SENTRY_PLAIN_OUTPUT"] = "1"; const sql = "SELECT id, name FROM users WHERE id = %s"; expect(colorizeSql(sql)).toBe(sql); }); test("returns string with ANSI codes in TTY mode for SQL with keywords", () => { - process.env.SENTRY_PLAIN_OUTPUT = "0"; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; const sql = "SELECT id FROM users"; const result = colorizeSql(sql); // Should contain ANSI escape codes @@ -95,7 +95,7 @@ describe("colorizeSql", () => { }); test("colorizes SQL keywords", () => { - process.env.SENTRY_PLAIN_OUTPUT = "0"; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; const result = colorizeSql("SELECT * FROM users"); // Keywords should be colored (different from plain text) expect(result).not.toBe("SELECT * FROM users"); @@ -103,20 +103,20 @@ describe("colorizeSql", () => { }); test("colorizes parameters", () => { - process.env.SENTRY_PLAIN_OUTPUT = "0"; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; const result = colorizeSql("SELECT * FROM users WHERE id = %s"); expect(result).toContain("\x1b["); expect(stripAnsi(result)).toBe("SELECT * FROM users WHERE id = %s"); }); test("handles empty string", () => { - process.env.SENTRY_PLAIN_OUTPUT = "0"; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; const result = colorizeSql(""); expect(result).toBe(""); }); test("handles non-SQL content gracefully", () => { - process.env.SENTRY_PLAIN_OUTPUT = "0"; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; const input = "GET /api/users/123"; const result = colorizeSql(input); // Should not crash; stripped output should contain original text @@ -126,7 +126,7 @@ describe("colorizeSql", () => { describe("formatSqlBlock", () => { test("returns compact single-line with header in plain mode", () => { - process.env.SENTRY_PLAIN_OUTPUT = "1"; + process.env["SENTRY_PLAIN_OUTPUT"] = "1"; const sql = "SELECT id, name FROM users WHERE id = %s"; const result = formatSqlBlock(sql); expect(result).toContain("─── Query ───"); @@ -136,7 +136,7 @@ describe("formatSqlBlock", () => { }); test("returns multi-line formatted SQL with header in TTY mode", () => { - process.env.SENTRY_PLAIN_OUTPUT = "0"; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; const sql = "SELECT id, name FROM users WHERE id = %s"; const result = formatSqlBlock(sql); expect(result).toContain("─── Query ───"); @@ -151,7 +151,7 @@ describe("formatSqlBlock", () => { }); test("does not reformat SQL in plain mode", () => { - process.env.SENTRY_PLAIN_OUTPUT = "1"; + process.env["SENTRY_PLAIN_OUTPUT"] = "1"; const sql = "SELECT id FROM users WHERE active = true"; const result = formatSqlBlock(sql); // The raw SQL should appear exactly as-is (not reformatted) @@ -159,7 +159,7 @@ describe("formatSqlBlock", () => { }); test("handles simple queries", () => { - process.env.SENTRY_PLAIN_OUTPUT = "0"; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; const sql = "SELECT 1"; const result = formatSqlBlock(sql); expect(stripAnsi(result)).toContain("SELECT"); diff --git a/packages/cli/test/lib/formatters/table.test.ts b/packages/cli/test/lib/formatters/table.test.ts index 0948640ad9..fe246553ee 100644 --- a/packages/cli/test/lib/formatters/table.test.ts +++ b/packages/cli/test/lib/formatters/table.test.ts @@ -8,6 +8,7 @@ import { tableCell } from "@sentry/toolkit-core/markdown"; import { describe, expect, test, vi } from "vitest"; import { type Column, writeTable } from "../../../src/lib/formatters/table.js"; +import type { Writer } from "../../../src/types/index.js"; type Row = { name: string; count: number; status: string }; @@ -24,7 +25,7 @@ function stripAnsi(str: string): string { } function capture(items: Row[], cols = columns): string { - const write = vi.fn(() => true); + const write = vi.fn(() => true); writeTable({ write }, items, cols); return stripAnsi(write.mock.calls.map((c) => c[0]).join("")); } @@ -85,7 +86,7 @@ describe("writeTable", () => { const cols: Column<{ v: string }>[] = [ { header: "VERY_LONG_HEADER", value: (r) => r.v }, ]; - const write = vi.fn(() => true); + const write = vi.fn(() => true); writeTable({ write }, [{ v: "x" }], cols); const output = stripAnsi(write.mock.calls.map((c) => c[0]).join("")); expect(output).toContain("VERY_LONG_HEADER"); @@ -99,20 +100,20 @@ describe("writeTable", () => { describe("writeTable (TTY mode)", () => { const saved = { - plain: process.env.SENTRY_PLAIN_OUTPUT, + plain: process.env["SENTRY_PLAIN_OUTPUT"], columns: process.stdout.columns, }; function withTty(fn: () => void): void { - process.env.SENTRY_PLAIN_OUTPUT = "0"; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; process.stdout.columns = 120; try { fn(); } finally { if (saved.plain !== undefined) { - process.env.SENTRY_PLAIN_OUTPUT = saved.plain; + process.env["SENTRY_PLAIN_OUTPUT"] = saved.plain; } else { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } process.stdout.columns = saved.columns; } @@ -120,7 +121,7 @@ describe("writeTable (TTY mode)", () => { test("renders Unicode box-drawing borders", () => { withTty(() => { - const write = vi.fn(() => true); + const write = vi.fn(() => true); writeTable({ write }, [{ name: "a", count: 1, status: "ok" }], columns); const output = write.mock.calls.map((c) => c[0]).join(""); expect(stripAnsi(output)).toContain("│"); @@ -130,7 +131,7 @@ describe("writeTable (TTY mode)", () => { test("renders content in ANSI mode", () => { withTty(() => { - const write = vi.fn(() => true); + const write = vi.fn(() => true); writeTable( { write }, [{ name: "alice", count: 42, status: "active" }], @@ -146,7 +147,7 @@ describe("writeTable (TTY mode)", () => { test("passes rowSeparator option to renderer", () => { withTty(() => { - const write = vi.fn(() => true); + const write = vi.fn(() => true); writeTable( { write }, [ @@ -168,7 +169,7 @@ describe("writeTable (TTY mode)", () => { test("passes rowSeparator color string to renderer", () => { withTty(() => { - const write = vi.fn(() => true); + const write = vi.fn(() => true); const color = "\x1b[38;2;137;130;148m"; writeTable( { write }, @@ -190,7 +191,7 @@ describe("writeTable (TTY mode)", () => { const cols: Column<{ v: string }>[] = [ { header: "VAL", value: (r) => r.v, minWidth: 10 }, ]; - const write = vi.fn(() => true); + const write = vi.fn(() => true); const longText = "a".repeat(200); writeTable({ write }, [{ v: longText }], cols, { truncate: true }); const output = stripAnsi(write.mock.calls.map((c) => c[0]).join("")); @@ -201,7 +202,7 @@ describe("writeTable (TTY mode)", () => { test("respects column alignment", () => { withTty(() => { - const write = vi.fn(() => true); + const write = vi.fn(() => true); writeTable({ write }, [{ name: "x", count: 42, status: "ok" }], columns); const output = stripAnsi(write.mock.calls.map((c) => c[0]).join("")); // Right-aligned COUNT should have leading space before 42 @@ -219,32 +220,32 @@ describe("writeTable (TTY mode)", () => { describe("writeTable (plain mode)", () => { const saved = { - plain: process.env.SENTRY_PLAIN_OUTPUT, - noColor: process.env.NO_COLOR, + plain: process.env["SENTRY_PLAIN_OUTPUT"], + noColor: process.env["NO_COLOR"], }; function withPlain(fn: () => void): void { - process.env.SENTRY_PLAIN_OUTPUT = "1"; - process.env.NO_COLOR = undefined; + process.env["SENTRY_PLAIN_OUTPUT"] = "1"; + process.env["NO_COLOR"] = undefined; try { fn(); } finally { if (saved.plain !== undefined) { - process.env.SENTRY_PLAIN_OUTPUT = saved.plain; + process.env["SENTRY_PLAIN_OUTPUT"] = saved.plain; } else { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } if (saved.noColor !== undefined) { - process.env.NO_COLOR = saved.noColor; + process.env["NO_COLOR"] = saved.noColor; } else { - delete process.env.NO_COLOR; + delete process.env["NO_COLOR"]; } } } test("emits box-drawing table with stripped markdown", () => { withPlain(() => { - const write = vi.fn(() => true); + const write = vi.fn(() => true); writeTable( { write }, [{ name: "alice", count: 1, status: "ok" }], @@ -263,7 +264,7 @@ describe("writeTable (plain mode)", () => { const cols: Column<{ v: string }>[] = [ { header: "VAL", value: (r) => tableCell(r.v) }, ]; - const write = vi.fn(() => true); + const write = vi.fn(() => true); writeTable({ write }, [{ v: "a|b" }], cols); const output = write.mock.calls.map((c) => c[0]).join(""); // Content is visible in box-drawing table diff --git a/packages/cli/test/lib/formatters/trace.property.test.ts b/packages/cli/test/lib/formatters/trace.property.test.ts index 043a5a2c0b..3cbb763195 100644 --- a/packages/cli/test/lib/formatters/trace.property.test.ts +++ b/packages/cli/test/lib/formatters/trace.property.test.ts @@ -10,7 +10,6 @@ import { constantFrom, double, assert as fcAssert, - option, property, record, stringMatching, @@ -76,29 +75,20 @@ const transactionItemArb = record({ /** Generate a flat TraceSpan (no children) */ function makeSpanArb(): import("fast-check").Arbitrary { - return record({ - span_id: hexId32Arb, - op: option( - constantFrom("http.server", "db.query", "cache.get", "http.client"), - { - nil: undefined, - }, - ), - description: option( - constantFrom("GET /api", "SELECT *", "Redis GET", null), - { - nil: undefined, - }, - ), - start_timestamp: unixTimestampArb, - timestamp: unixTimestampArb, - project_slug: option(slugArb, { nil: undefined }), - transaction: option(transactionNameArb, { nil: undefined }), - "transaction.op": option( - constantFrom("http.server", "browser", "celery_task"), - { nil: undefined }, - ), - }); + // Keys outside requiredKeys are sometimes absent, like unset API fields. + return record( + { + span_id: hexId32Arb, + op: constantFrom("http.server", "db.query", "cache.get", "http.client"), + description: constantFrom("GET /api", "SELECT *", "Redis GET", null), + start_timestamp: unixTimestampArb, + timestamp: unixTimestampArb, + project_slug: slugArb, + transaction: transactionNameArb, + "transaction.op": constantFrom("http.server", "browser", "celery_task"), + }, + { requiredKeys: ["span_id", "start_timestamp", "timestamp"] }, + ); } /** Generate a list of flat TraceSpans (1-10) */ diff --git a/packages/cli/test/lib/formatters/trace.test.ts b/packages/cli/test/lib/formatters/trace.test.ts index c0a3e6871a..af2ea53634 100644 --- a/packages/cli/test/lib/formatters/trace.test.ts +++ b/packages/cli/test/lib/formatters/trace.test.ts @@ -43,14 +43,14 @@ function stripAnsi(str: string): string { function useRenderedMode() { let savedPlain: string | undefined; beforeEach(() => { - savedPlain = process.env.SENTRY_PLAIN_OUTPUT; - process.env.SENTRY_PLAIN_OUTPUT = "0"; + savedPlain = process.env["SENTRY_PLAIN_OUTPUT"]; + process.env["SENTRY_PLAIN_OUTPUT"] = "0"; }); afterEach(() => { if (savedPlain === undefined) { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } else { - process.env.SENTRY_PLAIN_OUTPUT = savedPlain; + process.env["SENTRY_PLAIN_OUTPUT"] = savedPlain; } }); } @@ -59,14 +59,14 @@ function useRenderedMode() { function usePlainMode() { let savedPlain: string | undefined; beforeEach(() => { - savedPlain = process.env.SENTRY_PLAIN_OUTPUT; - process.env.SENTRY_PLAIN_OUTPUT = "1"; + savedPlain = process.env["SENTRY_PLAIN_OUTPUT"]; + process.env["SENTRY_PLAIN_OUTPUT"] = "1"; }); afterEach(() => { if (savedPlain === undefined) { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } else { - process.env.SENTRY_PLAIN_OUTPUT = savedPlain; + process.env["SENTRY_PLAIN_OUTPUT"] = savedPlain; } }); } diff --git a/packages/cli/test/lib/fuzzy.test.ts b/packages/cli/test/lib/fuzzy.test.ts index 8baf7b4aa4..0d13e51b24 100644 --- a/packages/cli/test/lib/fuzzy.test.ts +++ b/packages/cli/test/lib/fuzzy.test.ts @@ -14,6 +14,7 @@ import { levenshtein, } from "../../src/lib/fuzzy.js"; import { DEFAULT_NUM_RUNS } from "../model-based/helpers.js"; +import { at } from "../helpers.js"; // Short strings to keep Levenshtein computation fast in property tests const shortStringArb = string({ minLength: 0, maxLength: 20 }); @@ -321,7 +322,7 @@ describe("property: fuzzyMatch", () => { fcAssert( property(candidatesArb, (candidates) => { // Pick the first candidate as partial - const partial = candidates[0]; + const partial = at(candidates, 0); const result = fuzzyMatch(partial, candidates); expect(result).toContain(partial); }), diff --git a/packages/cli/test/lib/games/score.test.ts b/packages/cli/test/lib/games/score.test.ts index d480e992bc..d3e4b6f002 100644 --- a/packages/cli/test/lib/games/score.test.ts +++ b/packages/cli/test/lib/games/score.test.ts @@ -1,4 +1,5 @@ -import { type Client, getCurrentScope, metrics } from "@sentry/node"; +import type { Client } from "@sentry/core"; +import { getCurrentScope, metrics } from "@sentry/node"; import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; import { getPlayerHandle } from "../../../src/lib/games/player.js"; import { diff --git a/packages/cli/test/lib/ghcr.test.ts b/packages/cli/test/lib/ghcr.test.ts index d1bfa9d8fe..0394633afd 100644 --- a/packages/cli/test/lib/ghcr.test.ts +++ b/packages/cli/test/lib/ghcr.test.ts @@ -23,6 +23,7 @@ import { listTags, type OciManifest, } from "../../src/lib/ghcr.js"; +import { without } from "../helpers.js"; /** Store original fetch for restoration */ let originalFetch: typeof globalThis.fetch; @@ -236,8 +237,8 @@ describe("fetchNightlyManifest", () => { const result = await fetchNightlyManifest("my-token"); expect(result).toEqual(manifest); - expect(capturedHeaders.authorization).toBe("Bearer my-token"); - expect(capturedHeaders.accept).toBe( + expect(capturedHeaders["authorization"]).toBe("Bearer my-token"); + expect(capturedHeaders["accept"]).toBe( "application/vnd.oci.image.manifest.v1+json", ); }); @@ -292,7 +293,7 @@ describe("getNightlyVersion", () => { }); test("throws UpgradeError when annotations object is absent", () => { - const manifest = makeManifest({ annotations: undefined }); + const manifest = without(makeManifest(), "annotations"); expect(() => getNightlyVersion(manifest)).toThrow(UpgradeError); }); @@ -387,7 +388,7 @@ describe("downloadNightlyBlob", () => { expect(requestCount).toBe(2); expect(response.status).toBe(200); // Auth header must NOT be forwarded to Azure - expect(secondRequestHeaders.authorization).toBeUndefined(); + expect(secondRequestHeaders["authorization"]).toBeUndefined(); const body = await response.arrayBuffer(); expect(new Uint8Array(body)).toEqual(binaryContent); }); diff --git a/packages/cli/test/lib/help-positional.test.ts b/packages/cli/test/lib/help-positional.test.ts index f4a15f8145..e11b57c65f 100644 --- a/packages/cli/test/lib/help-positional.test.ts +++ b/packages/cli/test/lib/help-positional.test.ts @@ -12,7 +12,12 @@ * and verify help output is shown when resolution fails. */ -import { generateHelpTextForAllCommands, run } from "@stricli/core"; +import { + type Application, + type CommandContext, + generateHelpTextForAllCommands, + run, +} from "@stricli/core"; import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; import { app } from "../../src/app.js"; import type { SentryContext } from "../../src/context.js"; @@ -269,9 +274,11 @@ describe("help command unchanged", () => { }); test("project create --help shows the required paired syntax", () => { - const help = generateHelpTextForAllCommands(app).find( - ([route]) => route === "sentry project create", - )?.[1]; + // Stricli types help generation for CommandContext apps only, though it + // never runs a command. Narrow cast until its declaration is generic. + const help = generateHelpTextForAllCommands( + app as Application, + ).find(([route]) => route === "sentry project create")?.[1]; expect(help).toContain( "sentry project create [/]:...", diff --git a/packages/cli/test/lib/http1-dispatcher.test.ts b/packages/cli/test/lib/http1-dispatcher.test.ts index 8387db2244..5a5eca3c01 100644 --- a/packages/cli/test/lib/http1-dispatcher.test.ts +++ b/packages/cli/test/lib/http1-dispatcher.test.ts @@ -64,11 +64,15 @@ describe("createHttp1Dispatcher", () => { describe("destroyHttp1Dispatcher", () => { test("destroys the dispatcher", async () => { - const dispatcher = new FakeAgent(); + const agent = new FakeAgent(); + global[GLOBAL_DISPATCHER_V2] = agent; + const dispatcher = createHttp1Dispatcher(); + expect(dispatcher).toBeInstanceOf(FakeAgent); await destroyHttp1Dispatcher(dispatcher); - expect(dispatcher.destroyed).toBe(true); + expect(dispatcher).toHaveProperty("destroyed", true); + expect(agent.destroyed).toBe(false); }); test("resolves for no dispatcher", async () => { diff --git a/packages/cli/test/lib/index.test.ts b/packages/cli/test/lib/index.test.ts index a5f2c85dab..81c818142d 100644 --- a/packages/cli/test/lib/index.test.ts +++ b/packages/cli/test/lib/index.test.ts @@ -69,8 +69,8 @@ describe("createSentrySDK() library API", () => { test("sdk.run throws when auth is required but missing", async () => { // Clear the preload's test auth token so the auth guard fires. - const savedToken = process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_AUTH_TOKEN; + const savedToken = process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_AUTH_TOKEN"]; try { // Use cwd:/tmp to prevent DSN scanning of the repo root which finds // real DSNs and triggers async project resolution that can outlive the test. @@ -87,7 +87,7 @@ describe("createSentrySDK() library API", () => { } finally { // Restore the preload token for other tests if (savedToken !== undefined) { - process.env.SENTRY_AUTH_TOKEN = savedToken; + process.env["SENTRY_AUTH_TOKEN"] = savedToken; } } }); @@ -97,10 +97,12 @@ describe("createSentrySDK() library API", () => { const envBefore = { ...process.env }; await sdk.run("--version"); // Check that no new SENTRY_OUTPUT_FORMAT key leaked - expect(process.env.SENTRY_OUTPUT_FORMAT).toBe( - envBefore.SENTRY_OUTPUT_FORMAT, + expect(process.env["SENTRY_OUTPUT_FORMAT"]).toBe( + envBefore["SENTRY_OUTPUT_FORMAT"], + ); + expect(process.env["SENTRY_AUTH_TOKEN"]).toBe( + envBefore["SENTRY_AUTH_TOKEN"], ); - expect(process.env.SENTRY_AUTH_TOKEN).toBe(envBefore.SENTRY_AUTH_TOKEN); }); test("process.env is unchanged after failed call", async () => { @@ -111,8 +113,8 @@ describe("createSentrySDK() library API", () => { } catch { // expected } - expect(process.env.SENTRY_OUTPUT_FORMAT).toBe( - envBefore.SENTRY_OUTPUT_FORMAT, + expect(process.env["SENTRY_OUTPUT_FORMAT"]).toBe( + envBefore["SENTRY_OUTPUT_FORMAT"], ); }); diff --git a/packages/cli/test/lib/ini.test.ts b/packages/cli/test/lib/ini.test.ts index b7c7bbd3f2..438d1838c2 100644 --- a/packages/cli/test/lib/ini.test.ts +++ b/packages/cli/test/lib/ini.test.ts @@ -22,118 +22,120 @@ describe("parseIni", () => { test("strips UTF-8 BOM", () => { const result = parseIni("\uFEFF[defaults]\norg = my-org"); - expect(result.defaults?.org).toBe("my-org"); + expect(result["defaults"]?.["org"]).toBe("my-org"); }); test("handles Windows line endings (CRLF)", () => { const result = parseIni( "[defaults]\r\norg = my-org\r\nproject = my-proj\r\n", ); - expect(result.defaults?.org).toBe("my-org"); - expect(result.defaults?.project).toBe("my-proj"); + expect(result["defaults"]?.["org"]).toBe("my-org"); + expect(result["defaults"]?.["project"]).toBe("my-proj"); }); test("global keys (before any section header)", () => { const result = parseIni("key = value\n[section]\nother = data"); - expect(result[""]?.key).toBe("value"); - expect(result.section?.other).toBe("data"); + expect(result[""]?.["key"]).toBe("value"); + expect(result["section"]?.["other"]).toBe("data"); }); test("section names are lowercased", () => { const result = parseIni("[Defaults]\nOrg = my-org"); - expect(result.defaults?.org).toBe("my-org"); - expect(result.Defaults).toBeUndefined(); + expect(result["defaults"]?.["org"]).toBe("my-org"); + expect(result["Defaults"]).toBeUndefined(); }); test("key names are lowercased", () => { const result = parseIni("[auth]\nToken = secret123"); - expect(result.auth?.token).toBe("secret123"); - expect(result.auth?.Token).toBeUndefined(); + expect(result["auth"]?.["token"]).toBe("secret123"); + expect(result["auth"]?.["Token"]).toBeUndefined(); }); test("strips matching double quotes from values", () => { const result = parseIni('[auth]\ntoken = "my-secret-token"'); - expect(result.auth?.token).toBe("my-secret-token"); + expect(result["auth"]?.["token"]).toBe("my-secret-token"); }); test("strips matching single quotes from values", () => { const result = parseIni("[auth]\ntoken = 'my-secret-token'"); - expect(result.auth?.token).toBe("my-secret-token"); + expect(result["auth"]?.["token"]).toBe("my-secret-token"); }); test("does not strip mismatched quotes", () => { const result = parseIni("[auth]\ntoken = \"my-secret-token'"); - expect(result.auth?.token).toBe("\"my-secret-token'"); + expect(result["auth"]?.["token"]).toBe("\"my-secret-token'"); }); test("preserves quotes in middle of value", () => { const result = parseIni( '[defaults]\nurl = https://example.com/path?foo="bar"', ); - expect(result.defaults?.url).toBe('https://example.com/path?foo="bar"'); + expect(result["defaults"]?.["url"]).toBe( + 'https://example.com/path?foo="bar"', + ); }); test("empty value after = sign", () => { const result = parseIni("[defaults]\norg =\n"); - expect(result.defaults?.org).toBe(""); + expect(result["defaults"]?.["org"]).toBe(""); }); test("value with leading/trailing spaces is trimmed", () => { const result = parseIni("[defaults]\norg = my-org "); - expect(result.defaults?.org).toBe("my-org"); + expect(result["defaults"]?.["org"]).toBe("my-org"); }); test("duplicate keys: last value wins", () => { const result = parseIni("[defaults]\norg = first\norg = second"); - expect(result.defaults?.org).toBe("second"); + expect(result["defaults"]?.["org"]).toBe("second"); }); test("duplicate sections: merged", () => { const result = parseIni( "[defaults]\norg = my-org\n[defaults]\nproject = my-proj", ); - expect(result.defaults?.org).toBe("my-org"); - expect(result.defaults?.project).toBe("my-proj"); + expect(result["defaults"]?.["org"]).toBe("my-org"); + expect(result["defaults"]?.["project"]).toBe("my-proj"); }); test("duplicate section with duplicate key: last wins", () => { const result = parseIni( "[defaults]\norg = first\n[defaults]\norg = second", ); - expect(result.defaults?.org).toBe("second"); + expect(result["defaults"]?.["org"]).toBe("second"); }); test("malformed line (no = sign) is skipped", () => { const result = parseIni("[defaults]\nthis is not valid\norg = works"); - expect(result.defaults?.org).toBe("works"); - expect(Object.keys(result.defaults ?? {})).toEqual(["org"]); + expect(result["defaults"]?.["org"]).toBe("works"); + expect(Object.keys(result["defaults"] ?? {})).toEqual(["org"]); }); test("line with = but empty key is skipped", () => { const result = parseIni("[defaults]\n = value\norg = works"); - expect(result.defaults?.org).toBe("works"); - expect(Object.keys(result.defaults ?? {})).toEqual(["org"]); + expect(result["defaults"]?.["org"]).toBe("works"); + expect(Object.keys(result["defaults"] ?? {})).toEqual(["org"]); }); test("unclosed section header is skipped", () => { const result = parseIni("[defaults\norg = my-org"); // Falls through as a malformed line, org goes into global section - expect(result[""]?.org).toBe("my-org"); + expect(result[""]?.["org"]).toBe("my-org"); }); test("section header with whitespace inside", () => { const result = parseIni("[ defaults ]\norg = my-org"); - expect(result.defaults?.org).toBe("my-org"); + expect(result["defaults"]?.["org"]).toBe("my-org"); }); test("inline # in value is preserved (not treated as comment)", () => { const result = parseIni("[auth]\ntoken = abc#def"); - expect(result.auth?.token).toBe("abc#def"); + expect(result["auth"]?.["token"]).toBe("abc#def"); }); test("inline ; in value is preserved (not treated as comment)", () => { const result = parseIni("[auth]\ntoken = abc;def"); - expect(result.auth?.token).toBe("abc;def"); + expect(result["auth"]?.["token"]).toBe("abc;def"); }); test("real-world .sentryclirc from old sentry-cli", () => { @@ -147,26 +149,26 @@ token = sntrys_eyJpYXQiOjE3MTkzODM1MjQuNjQ0OTgyfQ==_abc123 `; const result = parseIni(content); - expect(result.defaults?.url).toBe("https://sentry.io/"); - expect(result.defaults?.org).toBe("my-org"); - expect(result.defaults?.project).toBe("my-project"); - expect(result.auth?.token).toBe( + expect(result["defaults"]?.["url"]).toBe("https://sentry.io/"); + expect(result["defaults"]?.["org"]).toBe("my-org"); + expect(result["defaults"]?.["project"]).toBe("my-project"); + expect(result["auth"]?.["token"]).toBe( "sntrys_eyJpYXQiOjE3MTkzODM1MjQuNjQ0OTgyfQ==_abc123", ); }); test("key with no spaces around = sign", () => { const result = parseIni("[defaults]\norg=my-org"); - expect(result.defaults?.org).toBe("my-org"); + expect(result["defaults"]?.["org"]).toBe("my-org"); }); test("key with extra spaces around = sign", () => { const result = parseIni("[defaults]\norg = my-org"); - expect(result.defaults?.org).toBe("my-org"); + expect(result["defaults"]?.["org"]).toBe("my-org"); }); test("value containing = sign", () => { const result = parseIni("[auth]\ntoken = abc=def=ghi"); - expect(result.auth?.token).toBe("abc=def=ghi"); + expect(result["auth"]?.["token"]).toBe("abc=def=ghi"); }); }); diff --git a/packages/cli/test/lib/install-ps1-script.test.ts b/packages/cli/test/lib/install-ps1-script.test.ts index 56412df8b0..0585460cda 100644 --- a/packages/cli/test/lib/install-ps1-script.test.ts +++ b/packages/cli/test/lib/install-ps1-script.test.ts @@ -27,6 +27,7 @@ import { type ServedAsset, toolkitDownload, } from "./install-scenarios.js"; +import { at, must } from "../helpers.js"; const installScript = join(import.meta.dirname, "..", "..", "install.ps1"); const hasPwsh = @@ -124,7 +125,7 @@ describe.skipIf(!hasPwsh)("PowerShell install script", () => { writeFileSync(harnessPath, harness); env = { - PATH: process.env.PATH, + PATH: process.env["PATH"], HOME: join(testDir, "home"), USERPROFILE: join(testDir, "home"), TMPDIR: testDir, @@ -137,7 +138,7 @@ describe.skipIf(!hasPwsh)("PowerShell install script", () => { GITHUB_PATH: join(testDir, "github-path"), }; applyScenario( - { ...INSTALL_SCENARIOS[0], name: "default" }, + { ...at(INSTALL_SCENARIOS, 0), name: "default" }, served, testDir, env, @@ -211,20 +212,20 @@ describe.skipIf(!hasPwsh)("PowerShell install script", () => { }); test("runs sentry init with the downloaded binary when SENTRY_INIT=1", () => { - env.SENTRY_INIT = "1"; + env["SENTRY_INIT"] = "1"; const result = run(); expect(result.status, result.stdout + result.stderr).toBe(0); expect(recorded("post-args")).toEqual(["init"]); - const [initBinary] = recorded("post-binary"); - expect(initBinary?.startsWith(join(testDir, "sentry-install-"))).toBe(true); + const initBinary = must(recorded("post-binary")[0], "the init binary"); + expect(initBinary.startsWith(join(testDir, "sentry-install-"))).toBe(true); expect(existsSync(initBinary)).toBe(false); }); test("fails when sentry init fails", () => { - env.SENTRY_INIT = "1"; - env.SENTRY_TEST_POST_EXIT = "7"; + env["SENTRY_INIT"] = "1"; + env["SENTRY_TEST_POST_EXIT"] = "7"; const result = run(); @@ -236,7 +237,7 @@ describe.skipIf(!hasPwsh)("PowerShell install script", () => { }); test("passes --no-modify-path to setup when SENTRY_NO_MODIFY_PATH=1", () => { - env.SENTRY_NO_MODIFY_PATH = "1"; + env["SENTRY_NO_MODIFY_PATH"] = "1"; const result = run(); @@ -248,28 +249,28 @@ describe.skipIf(!hasPwsh)("PowerShell install script", () => { { name: "non-Windows hosts", setup: () => { - delete env.OS; + delete env["OS"]; }, message: "This installer is for Windows", }, { name: "unsupported architectures", setup: () => { - env.PROCESSOR_ARCHITECTURE = "ARM64"; + env["PROCESSOR_ARCHITECTURE"] = "ARM64"; }, message: "only windows-x64 is supported", }, { name: "the nightly channel", setup: () => { - env.SENTRY_VERSION = "nightly"; + env["SENTRY_VERSION"] = "nightly"; }, message: "sentry cli upgrade nightly", }, { name: "a failed setup", setup: () => { - env.SENTRY_TEST_SETUP_EXIT = "3"; + env["SENTRY_TEST_SETUP_EXIT"] = "3"; }, message: "sentry cli setup failed with exit code 3", }, diff --git a/packages/cli/test/lib/install-scenarios.ts b/packages/cli/test/lib/install-scenarios.ts index 402332a614..66f122602b 100644 --- a/packages/cli/test/lib/install-scenarios.ts +++ b/packages/cli/test/lib/install-scenarios.ts @@ -111,31 +111,35 @@ export function applyScenario( const rawFile = join(dir, "served-asset"); writeFileSync(gzFile, served.gz); writeFileSync(rawFile, served.raw); - env.SENTRY_TEST_GZ_FILE = gzFile; - env.SENTRY_TEST_RAW_FILE = rawFile; - env.SENTRY_TEST_LATEST_VERSION = LATEST_VERSION; - env.SENTRY_TEST_REGISTRY_STATUS = String(scenario.registry.status); + env["SENTRY_TEST_GZ_FILE"] = gzFile; + env["SENTRY_TEST_RAW_FILE"] = rawFile; + env["SENTRY_TEST_LATEST_VERSION"] = LATEST_VERSION; + env["SENTRY_TEST_REGISTRY_STATUS"] = String(scenario.registry.status); const body = join(dir, "registry.json"); writeFileSync( body, scenario.registry.status === 200 ? registryTemplate(served, { - tamper: scenario.registry.tamper, - missing: scenario.registry.missingAsset, + ...(scenario.registry.tamper !== undefined && { + tamper: scenario.registry.tamper, + }), + ...(scenario.registry.missingAsset !== undefined && { + missing: scenario.registry.missingAsset, + }), }) : "", ); - env.SENTRY_TEST_REGISTRY_BODY = body; + env["SENTRY_TEST_REGISTRY_BODY"] = body; for (const [index, page] of (scenario.releases ?? []).entries()) { const file = join(dir, `releases-${index + 1}.json`); writeFileSync(file, JSON.stringify(page, null, 2)); env[`SENTRY_TEST_RELEASES_PAGE_${index + 1}`] = file; } if (scenario.gzMissing) { - env.SENTRY_TEST_GZ_MISSING = "1"; + env["SENTRY_TEST_GZ_MISSING"] = "1"; } if (scenario.version !== undefined) { - env.SENTRY_VERSION = scenario.version; + env["SENTRY_VERSION"] = scenario.version; } } diff --git a/packages/cli/test/lib/install-script.test.ts b/packages/cli/test/lib/install-script.test.ts index ced2aa6093..61a8aa4fad 100644 --- a/packages/cli/test/lib/install-script.test.ts +++ b/packages/cli/test/lib/install-script.test.ts @@ -28,6 +28,7 @@ import { type ServedAsset, toolkitDownload, } from "./install-scenarios.js"; +import { at } from "../helpers.js"; const installScript = join(import.meta.dirname, "..", "..", "install"); const downloadedExecutable = `#!/usr/bin/env bash @@ -93,7 +94,7 @@ describe("install script", () => { TMPDIR: testDir, }; applyScenario( - { ...INSTALL_SCENARIOS[0], name: "default" }, + { ...at(INSTALL_SCENARIOS, 0), name: "default" }, served, testDir, env, @@ -216,7 +217,7 @@ esac }, ])("parses $name registry metadata", ({ format }) => { writeFileSync( - env.SENTRY_TEST_REGISTRY_BODY as string, + env["SENTRY_TEST_REGISTRY_BODY"] as string, format(registryTemplate(served, {})), ); const result = spawnSync("bash", [installScript, "--no-modify-path"], { @@ -261,8 +262,8 @@ esac }); writeFileSync(gzipPath, gzipSync(downloadedExecutable)); - env.SENTRY_TEST_GZIP = gzipPath; - env.SENTRY_TEST_NIGHTLY_REDIRECT = redirect ? "1" : "0"; + env["SENTRY_TEST_GZIP"] = gzipPath; + env["SENTRY_TEST_NIGHTLY_REDIRECT"] = redirect ? "1" : "0"; writeFileSync( join(binDir, "curl"), `#!/usr/bin/env bash @@ -523,9 +524,9 @@ process.exitCode = result.status ?? 1; secondPage, '[\n {\n "tag_name": "cli@0.46.0",\n "prerelease": false\n }\n]\n', ); - env.SENTRY_TEST_RELEASES_PAGE_1 = firstPage; - env.SENTRY_TEST_RELEASES_PAGE_2 = secondPage; - env.SENTRY_TEST_REGISTRY_STATUS = "503"; + env["SENTRY_TEST_RELEASES_PAGE_1"] = firstPage; + env["SENTRY_TEST_RELEASES_PAGE_2"] = secondPage; + env["SENTRY_TEST_REGISTRY_STATUS"] = "503"; const result = spawnSync("bash", [installScript, "--no-modify-path"], { env, encoding: "utf8", @@ -549,8 +550,8 @@ process.exitCode = result.status ?? 1; firstPage, '[\n {\n "tag_name": "cli@0.47.0-dev.1",\n "prerelease": false\n },\n {\n "tag_name": "cli@0.46.0",\n "prerelease": false\n }\n]\n', ); - env.SENTRY_TEST_RELEASES_PAGE_1 = firstPage; - env.SENTRY_TEST_REGISTRY_STATUS = "503"; + env["SENTRY_TEST_RELEASES_PAGE_1"] = firstPage; + env["SENTRY_TEST_REGISTRY_STATUS"] = "503"; const result = spawnSync("bash", [installScript, "--no-modify-path"], { env, encoding: "utf8", @@ -585,8 +586,8 @@ process.exitCode = result.status ?? 1; }, ]), ); - env.SENTRY_TEST_RELEASES_PAGE_1 = firstPage; - env.SENTRY_TEST_REGISTRY_STATUS = "503"; + env["SENTRY_TEST_RELEASES_PAGE_1"] = firstPage; + env["SENTRY_TEST_REGISTRY_STATUS"] = "503"; const result = spawnSync("bash", [installScript, "--no-modify-path"], { env, encoding: "utf8", @@ -615,8 +616,8 @@ process.exitCode = result.status ?? 1; } ]`, ); - env.SENTRY_TEST_RELEASES_PAGE_1 = firstPage; - env.SENTRY_TEST_REGISTRY_STATUS = "503"; + env["SENTRY_TEST_RELEASES_PAGE_1"] = firstPage; + env["SENTRY_TEST_REGISTRY_STATUS"] = "503"; const result = spawnSync("bash", [installScript, "--no-modify-path"], { env, encoding: "utf8", @@ -875,7 +876,7 @@ exec /usr/bin/gunzip "$@" }); test("connects setup to the controlling terminal and cleans up after setup", () => { - env.SENTRY_TEST_KEEP_TEMP_BINARY = "1"; + env["SENTRY_TEST_KEEP_TEMP_BINARY"] = "1"; const result = runInTerminal(); expect(result.status, result.stdout + result.stderr).toBe(0); expect(recorded("setup-tty")).toEqual([ @@ -906,15 +907,18 @@ exec /usr/bin/gunzip "$@" expected: ["0:false", "1:true", "2:true", "controlling:false"], }, ])("skips login when $name", ({ redirect, detached, expected }) => { - const result = runInTerminal({ redirect, detached }); + const result = runInTerminal({ + ...(redirect !== undefined && { redirect }), + ...(detached !== undefined && { detached }), + }); expect(result.status, result.stdout + result.stderr).toBe(0); expect(recorded("setup-tty")).toEqual(expected); expect(recorded("post-args")).toEqual([]); }); test("runs init after setup, which keeps the terminal, when SENTRY_INIT is set", () => { - env.SENTRY_INIT = "1"; - env.SENTRY_TEST_POST_EXIT = "7"; + env["SENTRY_INIT"] = "1"; + env["SENTRY_TEST_POST_EXIT"] = "7"; const result = runInTerminal(); expect(result.status, result.stdout + result.stderr).toBe(7); expect(recorded("setup-tty")).toEqual([ @@ -928,7 +932,7 @@ exec /usr/bin/gunzip "$@" }); test("runs init without a terminal when SENTRY_INIT is set", () => { - env.SENTRY_INIT = "1"; + env["SENTRY_INIT"] = "1"; const result = spawnSync("bash", [installScript, "--version", "0.31.0"], { env, encoding: "utf8", @@ -942,12 +946,12 @@ exec /usr/bin/gunzip "$@" test("initializes the downloaded binary even after setup deletes it", () => { // A stale install that is not where setup puts the new binary must not be // the one that runs init. - const staleDir = join(env.HOME!, ".local", "bin"); + const staleDir = join(env["HOME"]!, ".local", "bin"); mkdirSync(staleDir, { recursive: true }); writeFileSync(join(staleDir, "sentry"), downloadedExecutable); chmodSync(join(staleDir, "sentry"), 0o755); - env.PATH = `${staleDir}:${env.PATH}`; - env.SENTRY_INIT = "1"; + env["PATH"] = `${staleDir}:${env["PATH"]}`; + env["SENTRY_INIT"] = "1"; const result = runInTerminal(); expect(result.status, result.stdout + result.stderr).toBe(0); @@ -963,7 +967,7 @@ exec /usr/bin/gunzip "$@" test.each([1, 130])( "preserves setup failure or interruption exit %i", (exitCode) => { - env.SENTRY_TEST_SETUP_EXIT = String(exitCode); + env["SENTRY_TEST_SETUP_EXIT"] = String(exitCode); const result = runInTerminal(); expect(result.status, result.stdout + result.stderr).toBe(exitCode); expect(recorded("post-args")).toEqual([]); @@ -972,7 +976,7 @@ exec /usr/bin/gunzip "$@" ); test.each([1, 130])("preserves non-interactive setup exit %i", (exitCode) => { - env.SENTRY_TEST_SETUP_EXIT = String(exitCode); + env["SENTRY_TEST_SETUP_EXIT"] = String(exitCode); const result = spawnSync("bash", [installScript, "--version", "0.31.0"], { env, encoding: "utf8", diff --git a/packages/cli/test/lib/interactive-login.test.ts b/packages/cli/test/lib/interactive-login.test.ts index 0e4828f362..533fc3a284 100644 --- a/packages/cli/test/lib/interactive-login.test.ts +++ b/packages/cli/test/lib/interactive-login.test.ts @@ -17,6 +17,7 @@ import { expect, test, vi, + type MockInstance, } from "vitest"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as browser from "../../src/lib/browser.js"; @@ -39,14 +40,14 @@ import type { TokenResponse } from "../../src/types/index.js"; // Force plain output for predictable string matching let origPlain: string | undefined; beforeAll(() => { - origPlain = process.env.SENTRY_PLAIN_OUTPUT; - process.env.SENTRY_PLAIN_OUTPUT = "1"; + origPlain = process.env["SENTRY_PLAIN_OUTPUT"]; + process.env["SENTRY_PLAIN_OUTPUT"] = "1"; }); afterAll(() => { if (origPlain === undefined) { - delete process.env.SENTRY_PLAIN_OUTPUT; + delete process.env["SENTRY_PLAIN_OUTPUT"]; } else { - process.env.SENTRY_PLAIN_OUTPUT = origPlain; + process.env["SENTRY_PLAIN_OUTPUT"] = origPlain; } }); @@ -113,13 +114,15 @@ describe("buildDeviceFlowDisplay", () => { }); describe("runInteractiveLogin", () => { - let performDeviceFlowSpy: ReturnType; - let completeOAuthFlowSpy: ReturnType; - let openBrowserSpy: ReturnType; - let generateQRCodeSpy: ReturnType; - let setupCopyKeyListenerSpy: ReturnType; - let setUserInfoSpy: ReturnType; - let getDbPathSpy: ReturnType; + let performDeviceFlowSpy: MockInstance<(typeof oauth)["performDeviceFlow"]>; + let completeOAuthFlowSpy: MockInstance<(typeof oauth)["completeOAuthFlow"]>; + let openBrowserSpy: MockInstance<(typeof browser)["openBrowser"]>; + let generateQRCodeSpy: MockInstance<(typeof qrcode)["generateQRCode"]>; + let setupCopyKeyListenerSpy: MockInstance< + (typeof clipboard)["setupCopyKeyListener"] + >; + let setUserInfoSpy: MockInstance<(typeof dbUser)["setUserInfo"]>; + let getDbPathSpy: MockInstance<(typeof dbInstance)["getDbPath"]>; /** Helper to build a mock TokenResponse with a user whose fields may be null. */ function makeTokenResponse(user?: { diff --git a/packages/cli/test/lib/introspect.property.test.ts b/packages/cli/test/lib/introspect.property.test.ts index a67652fc5b..00d01534d3 100644 --- a/packages/cli/test/lib/introspect.property.test.ts +++ b/packages/cli/test/lib/introspect.property.test.ts @@ -10,7 +10,6 @@ import { boolean, constantFrom, assert as fcAssert, - oneof, property, record, string, @@ -30,6 +29,7 @@ import { resolveCommandPath, } from "../../src/lib/introspect.js"; import { DEFAULT_NUM_RUNS } from "../model-based/helpers.js"; +import { must } from "../helpers.js"; // --------------------------------------------------------------------------- // Arbitraries @@ -121,7 +121,7 @@ describe("property: extractFlags", () => { for (const flag of result) { if ( flag.kind === "boolean" && - flags[flag.name].optional === undefined + must(flags[flag.name]).optional === undefined ) { expect(flag.optional).toBe(true); } @@ -136,9 +136,7 @@ describe("property: getPositionalString", () => { test("tuple always produces angle-bracket placeholders", () => { fcAssert( property( - array( - record({ placeholder: oneof(string(), constantFrom(undefined)) }), - ), + array(record({ placeholder: string() }, { requiredKeys: [] })), (params) => { const result = getPositionalString({ kind: "tuple", @@ -159,7 +157,7 @@ describe("property: getPositionalString", () => { property(string(), (placeholder) => { const result = getPositionalString({ kind: "array", - parameter: { placeholder: placeholder || undefined }, + parameter: placeholder ? { placeholder } : {}, }); expect(result).toContain("..."); }), diff --git a/packages/cli/test/lib/introspect.test.ts b/packages/cli/test/lib/introspect.test.ts index 3a484f294e..cbd6142806 100644 --- a/packages/cli/test/lib/introspect.test.ts +++ b/packages/cli/test/lib/introspect.test.ts @@ -45,6 +45,7 @@ import { resolveCommandPath, } from "../../src/lib/introspect.js"; import { sanitizeIssueQuery } from "../../src/lib/search-query.js"; +import { at } from "../helpers.js"; // --------------------------------------------------------------------------- // Test fixtures @@ -244,7 +245,7 @@ describe("extractFlags", () => { verbose: { kind: "boolean", hidden: true }, }; const result = extractFlags(flags); - expect(result[0].hidden).toBe(true); + expect(at(result, 0).hidden).toBe(true); }); }); @@ -285,7 +286,7 @@ describe("buildCommandInfo", () => { expect(info.fullDescription).toBe("List all the things."); expect(info.positional).toBe(""); expect(info.flags).toHaveLength(1); - expect(info.flags[0].name).toBe("limit"); + expect(at(info.flags, 0).name).toBe("limit"); expect(info.aliases).toEqual({ l: "limit" }); expect(info.examples).toEqual([ "# List things in an org\nsentry thing list myorg", @@ -354,8 +355,8 @@ describe("extractRouteGroupCommands", () => { const commands = extractRouteGroupCommands(routeMap, "thing"); expect(commands).toHaveLength(2); - expect(commands[0].path).toBe("sentry thing list"); - expect(commands[1].path).toBe("sentry thing view"); + expect(at(commands, 0).path).toBe("sentry thing list"); + expect(at(commands, 1).path).toBe("sentry thing view"); }); test("skips route map entries (only extracts commands)", () => { @@ -369,7 +370,7 @@ describe("extractRouteGroupCommands", () => { const commands = extractRouteGroupCommands(routeMap, "parent"); expect(commands).toHaveLength(1); - expect(commands[0].path).toBe("sentry parent cmd"); + expect(at(commands, 0).path).toBe("sentry parent cmd"); }); }); @@ -397,14 +398,14 @@ describe("extractAllRoutes", () => { expect(routes).toHaveLength(2); // Route group - expect(routes[0].name).toBe("issue"); - expect(routes[0].brief).toBe("Manage issues"); - expect(routes[0].commands).toHaveLength(2); + expect(at(routes, 0).name).toBe("issue"); + expect(at(routes, 0).brief).toBe("Manage issues"); + expect(at(routes, 0).commands).toHaveLength(2); // Standalone command - expect(routes[1].name).toBe("api"); - expect(routes[1].commands).toHaveLength(1); - expect(routes[1].commands[0].path).toBe("sentry api"); + expect(at(routes, 1).name).toBe("api"); + expect(at(routes, 1).commands).toHaveLength(1); + expect(at(at(routes, 1).commands, 0).path).toBe("sentry api"); }); test("skips hidden entries", () => { @@ -418,7 +419,7 @@ describe("extractAllRoutes", () => { const routes = extractAllRoutes(topLevel); expect(routes).toHaveLength(1); - expect(routes[0].name).toBe("visible"); + expect(at(routes, 0).name).toBe("visible"); }); }); @@ -555,8 +556,9 @@ describe("extractCommandCompletions", () => { }); expect( - extractCommandCompletions(makeRouteMap([makeEntry("create", create)])) - .create?.flagNames, + extractCommandCompletions(makeRouteMap([makeEntry("create", create)]))[ + "create" + ]?.flagNames, ).toEqual({ "--json": { brief: "Output as JSON" }, "--tag": { brief: "A tag", aliases: ["-t"], variadic: true }, diff --git a/packages/cli/test/lib/issue-1568-routing.focused.test.ts b/packages/cli/test/lib/issue-1568-routing.focused.test.ts index 3fcd1da95f..899729cae7 100644 --- a/packages/cli/test/lib/issue-1568-routing.focused.test.ts +++ b/packages/cli/test/lib/issue-1568-routing.focused.test.ts @@ -36,12 +36,12 @@ function orgToken(url: string): string { } test("invalid SENTRY_HOST never falls through to a lower-priority URL", () => { - process.env.SENTRY_HOST = "https://user:password@example.com"; - process.env.SENTRY_URL = "https://lower-priority.example.com"; + process.env["SENTRY_HOST"] = "https://user:password@example.com"; + process.env["SENTRY_URL"] = "https://lower-priority.example.com"; expect(() => getConfiguredSentryUrl()).toThrow(ConfigError); }); test("an invalid active token claim never falls through to SaaS", () => { - process.env.SENTRY_AUTH_TOKEN = orgToken("ftp://invalid.example.com"); + process.env["SENTRY_AUTH_TOKEN"] = orgToken("ftp://invalid.example.com"); expect(() => getEnvTokenHost()).toThrow(ConfigError); }); diff --git a/packages/cli/test/lib/issue-arguments.test.ts b/packages/cli/test/lib/issue-arguments.test.ts index 159f83ea49..a462c35c15 100644 --- a/packages/cli/test/lib/issue-arguments.test.ts +++ b/packages/cli/test/lib/issue-arguments.test.ts @@ -111,8 +111,8 @@ describe("parseIssueArgument", () => { parsed: { type: "explicit-org-numeric", org: "acme", numericId: "123" }, baseUrl: "https://sentry.example.com", }); - expect(process.env.SENTRY_HOST).toBeUndefined(); - expect(process.env.SENTRY_URL).toBeUndefined(); + expect(process.env["SENTRY_HOST"]).toBeUndefined(); + expect(process.env["SENTRY_URL"]).toBeUndefined(); }); test("reads short IDs from issue URLs", () => { @@ -190,8 +190,8 @@ describe("parseIssueArguments", () => { { usageHint }, ); expect(issue?.baseUrl).toBe("https://sentry.example.com"); - expect(process.env.SENTRY_HOST).toBeUndefined(); - expect(process.env.SENTRY_URL).toBeUndefined(); + expect(process.env["SENTRY_HOST"]).toBeUndefined(); + expect(process.env["SENTRY_URL"]).toBeUndefined(); }); test.each([[[]], [[" \n "]]])("requires an issue: %j", (args) => { diff --git a/packages/cli/test/lib/list-command.test.ts b/packages/cli/test/lib/list-command.test.ts index fd043667c7..4bc3b8042c 100644 --- a/packages/cli/test/lib/list-command.test.ts +++ b/packages/cli/test/lib/list-command.test.ts @@ -5,7 +5,14 @@ */ import { execFileSync } from "node:child_process"; -import { afterEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { advancePaginationState, buildPaginationContextKey, @@ -19,7 +26,7 @@ import { import type { OrgListConfig } from "../../src/lib/org-list.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as orgListModule from "../../src/lib/org-list.js"; -import { useTestConfigDir } from "../helpers.js"; +import { useTestConfigDir, loadCommand } from "../helpers.js"; describe("query pagination hints", () => { useTestConfigDir("query-pagination-hints-"); @@ -88,9 +95,7 @@ function makeFakeConfig( entityPlural: "widgets", commandPrefix: () => "sentry widget list", listForOrg: vi.fn(() => Promise.resolve([])), - listPaginated: vi.fn(() => - Promise.resolve({ data: [] as FakeEntity[], nextCursor: undefined }), - ), + listPaginated: vi.fn(() => Promise.resolve({ data: [] as FakeEntity[] })), withOrg: (entity, orgSlug) => ({ ...entity, orgSlug }), displayTable: vi.fn(() => ""), ...overrides, @@ -110,7 +115,9 @@ function createContext() { } describe("buildOrgListCommand", () => { - let dispatchSpy: ReturnType; + let dispatchSpy: + | MockInstance<(typeof orgListModule)["dispatchOrgScopedList"]> + | undefined; afterEach(() => { dispatchSpy?.mockRestore(); @@ -131,7 +138,7 @@ describe("buildOrgListCommand", () => { const config = makeFakeConfig(); const docs: OrgListCommandDocs = { brief: "List widgets" }; const cmd = buildOrgListCommand(config, docs, "widget"); - const func = await cmd.loader(); + const func = await loadCommand(cmd); const { context } = createContext(); // Stricli loader returns CommandModule | CommandFunction union; @@ -163,7 +170,7 @@ describe("buildOrgListCommand", () => { { brief: "List widgets" }, "widget", ); - const func = await cmd.loader(); + const func = await loadCommand(cmd); const { context } = createContext(); await (func as any).call(context, { limit: 30, json: false }, "my-org/"); @@ -183,7 +190,7 @@ describe("buildOrgListCommand", () => { { brief: "List widgets" }, "widget", ); - const func = await cmd.loader(); + const func = await loadCommand(cmd); const { context } = createContext(); await (func as any).call(context, { limit: 30, json: false }); diff --git a/packages/cli/test/lib/mcp-auth.test.ts b/packages/cli/test/lib/mcp-auth.test.ts index 1daeac0097..d7643f3232 100644 --- a/packages/cli/test/lib/mcp-auth.test.ts +++ b/packages/cli/test/lib/mcp-auth.test.ts @@ -81,8 +81,10 @@ describe("resolveCliMcpCredential", () => { await clearAuth(); // Env tokens skip the stored-row normalization, so a pasted newline would // otherwise reach the MCP server as a broken Authorization header. - process.env.SENTRY_AUTH_TOKEN = "env-token\n"; - process.env.SENTRY_HOST = "https://sentry.io"; + // Env tokens skip the stored-row normalization, so a pasted newline would + // otherwise reach the MCP server as a broken Authorization header. + process.env["SENTRY_AUTH_TOKEN"] = "env-token\n"; + process.env["SENTRY_HOST"] = "https://sentry.io"; await expect( resolveCliMcpAccessToken({ @@ -94,8 +96,8 @@ describe("resolveCliMcpCredential", () => { test("rejects an env token with embedded invalid characters", async () => { await clearAuth(); - process.env.SENTRY_AUTH_TOKEN = "env token with space"; - process.env.SENTRY_HOST = "https://sentry.io"; + process.env["SENTRY_AUTH_TOKEN"] = "env token with space"; + process.env["SENTRY_HOST"] = "https://sentry.io"; await expect( resolveCliMcpAccessToken({ @@ -118,8 +120,8 @@ async function targetFlags(args: string[], sentryUrl?: string) { describe("withConfiguredTarget", () => { test("uses SENTRY_HOST before SENTRY_URL for self-hosted instances", async () => { - process.env.SENTRY_HOST = "http://sentry.internal:9000"; - process.env.SENTRY_URL = "https://sentry.example.com"; + process.env["SENTRY_HOST"] = "http://sentry.internal:9000"; + process.env["SENTRY_URL"] = "https://sentry.example.com"; expect(await targetFlags([])).toEqual({ host: "sentry.internal:9000", @@ -137,7 +139,7 @@ describe("withConfiguredTarget", () => { }); test("translates a secure SENTRY_HOST origin into a host flag", async () => { - process.env.SENTRY_HOST = "https://sentry.example.com"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; // A documented `SENTRY_HOST=https://…` export must not reach the MCP // config raw (it rejects origins); it becomes a plain --host instead. diff --git a/packages/cli/test/lib/mcp-command.test.ts b/packages/cli/test/lib/mcp-command.test.ts index 67ff64d73a..97d005f746 100644 --- a/packages/cli/test/lib/mcp-command.test.ts +++ b/packages/cli/test/lib/mcp-command.test.ts @@ -233,12 +233,12 @@ describe("running `mcp`", () => { vi.spyOn(process, "cwd").mockImplementation(() => { throw Object.assign(new Error("uv_cwd"), { code: "ENOENT" }); }); - const savedPwd = process.env.PWD; - process.env.PWD = "/deleted/worktree"; + const savedPwd = process.env["PWD"]; + process.env["PWD"] = "/deleted/worktree"; try { await runCli(["mcp", "--host=sentry.example.com"], SENTRY_CLI); } finally { - process.env.PWD = savedPwd; + process.env["PWD"] = savedPwd; vi.mocked(process.cwd).mockRestore(); } diff --git a/packages/cli/test/lib/mcp-login.test.ts b/packages/cli/test/lib/mcp-login.test.ts index 108d43427c..ef7b35a7fe 100644 --- a/packages/cli/test/lib/mcp-login.test.ts +++ b/packages/cli/test/lib/mcp-login.test.ts @@ -112,7 +112,7 @@ describe("serveMcp login fallback", () => { test("logs in over plain HTTP for SENTRY_HOST with --insecure-http", async () => { registerLoginTrustAnchor("http://sentry.internal:9000"); - process.env.SENTRY_HOST = "sentry.internal:9000"; + process.env["SENTRY_HOST"] = "sentry.internal:9000"; await serve(["--insecure-http"]); expect(state.loginHosts).toEqual(["http://sentry.internal:9000"]); diff --git a/packages/cli/test/lib/mcp-start.test.ts b/packages/cli/test/lib/mcp-start.test.ts index 5ac42a4747..c42dd9746e 100644 --- a/packages/cli/test/lib/mcp-start.test.ts +++ b/packages/cli/test/lib/mcp-start.test.ts @@ -68,7 +68,9 @@ vi.mock("../../src/lib/mcp/scope-check.js", () => ({ assertMcpScopeExists: vi.fn( async (config: { organizationSlug?: string }, accessToken: string) => { scopeChecks.calls.push({ - organizationSlug: config.organizationSlug, + ...(config.organizationSlug !== undefined && { + organizationSlug: config.organizationSlug, + }), accessToken, }); if (scopeChecks.result) { @@ -166,7 +168,7 @@ describe("serveMcp credential wiring", () => { setAuthToken("cli-session-token", undefined, undefined, { host: "https://sentry.io", }); - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; const { options } = await start([]); expect(options.accessToken).toBe("env-token"); @@ -174,14 +176,14 @@ describe("serveMcp credential wiring", () => { expect(options.credentialRouter).toBeUndefined(); // Refreshes stay on the env token, and the process env is left alone. await expect(options.refreshAccessToken?.()).resolves.toBe("env-token"); - expect(process.env.SENTRY_FORCE_ENV_TOKEN).toBeUndefined(); + expect(process.env["SENTRY_FORCE_ENV_TOKEN"]).toBeUndefined(); }); test("serves the legacy SENTRY_TOKEN over a stored login", async () => { setAuthToken("cli-session-token", undefined, undefined, { host: "https://sentry.io", }); - process.env.SENTRY_TOKEN = "legacy-env-token"; + process.env["SENTRY_TOKEN"] = "legacy-env-token"; const { options } = await start([]); expect(options.accessToken).toBe("legacy-env-token"); @@ -232,7 +234,7 @@ describe("serveMcp scope", () => { }); test("checks the scope with a static token", async () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; await start(["--org", "acme"]); expect(scopeChecks.calls).toEqual([ @@ -269,7 +271,7 @@ describe("serveMcp account pinning", () => { beforeEach(async () => { await clearAuth(); refreshedWith.length = 0; - process.env.SENTRY_CLIENT_ID = "test-client-id"; + process.env["SENTRY_CLIENT_ID"] = "test-client-id"; // Each refresh rotates the access token of whichever refresh token it got. globalThis.fetch = async (input, init) => { expect(new Request(input).url).toBe("https://sentry.io/oauth/token/"); @@ -385,7 +387,9 @@ describe("serveMcp account pinning", () => { // Removed after the pin check but before the credential read, so the // CLI's account selection falls back to the remaining account. - refreshHooks.before = () => removeAccount(a, { promoteNext: true }); + refreshHooks.before = async () => { + await removeAccount(a, { promoteNext: true }); + }; await expect(refreshStartupCredential(options)).rejects.toThrow( "The account this MCP server started with is no longer available", @@ -393,8 +397,8 @@ describe("serveMcp account pinning", () => { }); test("keeps an env token after a stored login appears", async () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; - process.env.SENTRY_HOST = "https://sentry.io"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; + process.env["SENTRY_HOST"] = "https://sentry.io"; const { options } = await start([]); expect(options.accessToken).toBe("env-token"); @@ -456,7 +460,7 @@ describe("serveMcp account routing", () => { beforeEach(async () => { await clearAuth(); refreshedWith.length = 0; - process.env.SENTRY_CLIENT_ID = "test-client-id"; + process.env["SENTRY_CLIENT_ID"] = "test-client-id"; globalThis.fetch = async (input, init) => { expect(new Request(input).url).toBe("https://sentry.io/oauth/token/"); const body = init?.body; @@ -604,20 +608,20 @@ describe("serveMcp deprecated --access-token", () => { // The env-token path: a refresh re-reads the same env token. await expect(options.refreshAccessToken?.()).resolves.toBe("static-token"); // Mapped in an env copy; the process environment is left alone. - expect(process.env.SENTRY_AUTH_TOKEN).toBeUndefined(); - expect(process.env.SENTRY_FORCE_ENV_TOKEN).toBeUndefined(); + expect(process.env["SENTRY_AUTH_TOKEN"]).toBeUndefined(); + expect(process.env["SENTRY_FORCE_ENV_TOKEN"]).toBeUndefined(); }); test("serves the same as SENTRY_AUTH_TOKEN with SENTRY_FORCE_ENV_TOKEN=1", async () => { setAuthToken("cli-session-token", undefined, undefined, { host: "https://sentry.io", }); - process.env.SENTRY_AUTH_TOKEN = "env-token"; - process.env.SENTRY_FORCE_ENV_TOKEN = "1"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; + process.env["SENTRY_FORCE_ENV_TOKEN"] = "1"; const fromEnv = await start([]); const refreshedFromEnv = await fromEnv.options.refreshAccessToken?.(); - delete process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_FORCE_ENV_TOKEN; + delete process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_FORCE_ENV_TOKEN"]; served.calls = []; const fromFlag = await start(["--access-token=env-token"]); @@ -630,14 +634,14 @@ describe("serveMcp deprecated --access-token", () => { test("uses SENTRY_ACCESS_TOKEN without a CLI session", async () => { await clearAuth(); - process.env.SENTRY_ACCESS_TOKEN = "env-static-token"; + process.env["SENTRY_ACCESS_TOKEN"] = "env-static-token"; const { options } = await start([]); expect(options.accessToken).toBe("env-static-token"); }); test("prefers --access-token over SENTRY_ACCESS_TOKEN", async () => { - process.env.SENTRY_ACCESS_TOKEN = "env-static-token"; + process.env["SENTRY_ACCESS_TOKEN"] = "env-static-token"; const { options } = await start(["--access-token", "flag-token"]); expect(options.accessToken).toBe("flag-token"); @@ -658,8 +662,8 @@ describe("serveMcp deprecated --access-token", () => { }); test("overrides SENTRY_AUTH_TOKEN and SENTRY_TOKEN", async () => { - process.env.SENTRY_AUTH_TOKEN = "env-auth-token"; - process.env.SENTRY_TOKEN = "env-legacy-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-auth-token"; + process.env["SENTRY_TOKEN"] = "env-legacy-token"; const { options } = await start(["--access-token=flag-token"]); expect(options.accessToken).toBe("flag-token"); @@ -679,7 +683,7 @@ describe("serveMcp deprecated --access-token", () => { }); test("names SENTRY_ACCESS_TOKEN in its hint when that is the source", async () => { - process.env.SENTRY_ACCESS_TOKEN = "env-static-token"; + process.env["SENTRY_ACCESS_TOKEN"] = "env-static-token"; await start([]); expect(output.stdout).toEqual([]); @@ -702,7 +706,7 @@ describe("serveMcp deprecated --access-token", () => { }); test("warns about deprecated target flags and still serves them", async () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; const { config } = await start([ "--host=sentry.internal:9000", "--insecure-http", @@ -771,8 +775,8 @@ describe("serveMcp deprecated --access-token", () => { }); test("routes SENTRY_HOST to the static token target", async () => { - process.env.SENTRY_ACCESS_TOKEN = "env-static-token"; - process.env.SENTRY_HOST = "https://sentry.example.com"; + process.env["SENTRY_ACCESS_TOKEN"] = "env-static-token"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; const { config } = await start([]); expect(config.sentryHost).toBe("sentry.example.com"); @@ -840,7 +844,7 @@ describe("serveMcp .sentryclirc URLs", () => { test("refuses to send a static token to a self-hosted URL from a repo .sentryclirc", async () => { await inRcDir("https://evil.example.com"); - process.env.SENTRY_ACCESS_TOKEN = "env-static-token"; + process.env["SENTRY_ACCESS_TOKEN"] = "env-static-token"; await expect(serve([])).rejects.toBeInstanceOf(HostScopeError); await expect(serve(["--access-token=static-token"])).rejects.toBeInstanceOf( @@ -878,7 +882,7 @@ describe("serveMcp .sentryclirc URLs", () => { expect(fromFlag.options.accessToken).toBe(token); served.calls = []; - process.env.SENTRY_ACCESS_TOKEN = token; + process.env["SENTRY_ACCESS_TOKEN"] = token; const fromEnv = await start([]); expect(fromEnv.options.accessToken).toBe(token); }); @@ -917,8 +921,8 @@ describe("serveMcp .sentryclirc URLs", () => { }); test("serves the env token on the self-hosted rc URL it is configured for", async () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; - process.env.SENTRY_URL = "https://sentry.example.com"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; + process.env["SENTRY_URL"] = "https://sentry.example.com"; captureEnvTokenHost(); await inRcDir("https://sentry.example.com"); @@ -930,8 +934,8 @@ describe("serveMcp .sentryclirc URLs", () => { }); test("serves the env token over http with --insecure-http on its startup SENTRY_HOST", async () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; - process.env.SENTRY_HOST = "sentry.internal:9000"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; + process.env["SENTRY_HOST"] = "sentry.internal:9000"; captureEnvTokenHost(); const { config, options } = await start(["--insecure-http"]); @@ -941,7 +945,7 @@ describe("serveMcp .sentryclirc URLs", () => { }); test("scopes the env token to an explicit --host over the rc URL", async () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; captureEnvTokenHost(); await inRcDir("https://evil.example.com"); @@ -951,8 +955,8 @@ describe("serveMcp .sentryclirc URLs", () => { }); test("serves the env token over a token in the same .sentryclirc", async () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; - process.env.SENTRY_URL = "https://sentry.example.com"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; + process.env["SENTRY_URL"] = "https://sentry.example.com"; captureEnvTokenHost(); await inRcDir("https://sentry.example.com", "rc-token"); @@ -966,7 +970,7 @@ describe("serveMcp .sentryclirc URLs", () => { url: "https://sentry.example.com", org: "acme", }); - process.env.SENTRY_AUTH_TOKEN = token; + process.env["SENTRY_AUTH_TOKEN"] = token; captureEnvTokenHost(); await inRcDir("https://sentry.example.com"); @@ -975,7 +979,7 @@ describe("serveMcp .sentryclirc URLs", () => { }); test("refuses to send an env token with no host claim to the rc URL", async () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; captureEnvTokenHost(); await inRcDir("https://evil.example.com"); @@ -984,7 +988,7 @@ describe("serveMcp .sentryclirc URLs", () => { }); test("refuses an env org token whose claim does not match the rc URL", async () => { - process.env.SENTRY_AUTH_TOKEN = mintSntrysToken({ + process.env["SENTRY_AUTH_TOKEN"] = mintSntrysToken({ iat: 1, url: "https://sentry.example.com", org: "acme", @@ -1009,7 +1013,7 @@ describe("serveMcp .sentryclirc URLs", () => { host: "https://sentry.io", }); await inRcDir("https://sentry.io", "rc-token"); - expect(process.env.SENTRY_AUTH_TOKEN).toBe("rc-token"); + expect(process.env["SENTRY_AUTH_TOKEN"]).toBe("rc-token"); const { options } = await start([]); expect(options.accessToken).toBe("cli-session-token"); @@ -1048,7 +1052,7 @@ describe("serveMcp .sentryclirc URLs", () => { }); test("refuses to send an env token with no host claim to an rc URL without a stored login", async () => { - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; captureEnvTokenHost(); await inRcDir("https://evil.example.com"); @@ -1062,7 +1066,7 @@ describe("serveMcp .sentryclirc URLs", () => { setAuthToken("cli-session-token", undefined, undefined, { host: "https://sentry.example.com", }); - process.env.SENTRY_AUTH_TOKEN = "env-token"; + process.env["SENTRY_AUTH_TOKEN"] = "env-token"; captureEnvTokenHost(); await inRcDir("https://sentry.example.com"); @@ -1090,7 +1094,7 @@ describe("serveMcp .sentryclirc URLs", () => { await expect( serve(["--access-token=static-token", "--insecure-http"]), ).rejects.toBeInstanceOf(HostScopeError); - process.env.SENTRY_ACCESS_TOKEN = "env-static-token"; + process.env["SENTRY_ACCESS_TOKEN"] = "env-static-token"; await expect(serve([])).rejects.toBeInstanceOf(HostScopeError); expect(served.calls).toHaveLength(0); @@ -1104,7 +1108,7 @@ describe("serveMcp .sentryclirc URLs", () => { }); test("serves a static token on the rc URL its startup SENTRY_URL names", async () => { - process.env.SENTRY_URL = "https://sentry.example.com"; + process.env["SENTRY_URL"] = "https://sentry.example.com"; captureEnvTokenHost(); await inRcDir("https://sentry.example.com"); diff --git a/packages/cli/test/lib/mcp/config.test.ts b/packages/cli/test/lib/mcp/config.test.ts index 8a7615c54b..7aeb1e8e21 100644 --- a/packages/cli/test/lib/mcp/config.test.ts +++ b/packages/cli/test/lib/mcp/config.test.ts @@ -6,10 +6,19 @@ import { ValidationError } from "../../../src/lib/errors.js"; function finalize(input: Partial) { return finalizeMcpConfig({ agentProviderFromFlag: false, + insecureHttp: false, + allSkills: false, + experimental: false, ...input, }); } +/** Whether the config grants `skill`, including names that are not skills. */ +function grants(cfg: ReturnType, skill: string): boolean { + const skills: ReadonlySet = cfg.finalSkills; + return skills.has(skill); +} + describe("finalizeMcpConfig", () => { it("normalizes host from URL", () => { const cfg = finalize({ @@ -165,7 +174,7 @@ describe("finalizeMcpConfig", () => { expect(cfg.finalSkills.has("project-management")).toBe(true); expect(cfg.finalSkills.has("seer")).toBe(true); expect(cfg.finalSkills.has("docs")).toBe(false); - expect(cfg.finalSkills.has("preprod")).toBe(false); + expect(grants(cfg, "preprod")).toBe(false); }); it("grants all active skills with --all-skills", () => { @@ -178,7 +187,7 @@ describe("finalizeMcpConfig", () => { expect(cfg.finalSkills.has("project-management")).toBe(true); expect(cfg.finalSkills.has("seer")).toBe(true); expect(cfg.finalSkills.has("docs")).toBe(false); - expect(cfg.finalSkills.has("preprod")).toBe(false); + expect(grants(cfg, "preprod")).toBe(false); }); // Self-hosted defaults @@ -254,7 +263,7 @@ describe("finalizeMcpConfig", () => { expect(cfg.finalSkills.has("triage")).toBe(true); expect(cfg.finalSkills.has("project-management")).toBe(true); expect(cfg.finalSkills.has("docs")).toBe(false); - expect(cfg.finalSkills.has("preprod")).toBe(false); + expect(grants(cfg, "preprod")).toBe(false); }); it("removes disabled skills when combined with --skills", () => { diff --git a/packages/cli/test/lib/mcp/disabled-skills-warning.test.ts b/packages/cli/test/lib/mcp/disabled-skills-warning.test.ts index e98b20636e..e23ab90ee8 100644 --- a/packages/cli/test/lib/mcp/disabled-skills-warning.test.ts +++ b/packages/cli/test/lib/mcp/disabled-skills-warning.test.ts @@ -8,7 +8,13 @@ function warningsFor(input: Partial): string[] { const warn = vi.spyOn(logger, "warn").mockImplementation(() => undefined); const log = vi.spyOn(console, "log"); warnIneffectiveDisabledSkills( - finalizeMcpConfig({ agentProviderFromFlag: false, ...input }), + finalizeMcpConfig({ + agentProviderFromFlag: false, + insecureHttp: false, + allSkills: false, + experimental: false, + ...input, + }), ); // stdout carries the MCP transport, so nothing may be logged there. expect(log).not.toHaveBeenCalled(); diff --git a/packages/cli/test/lib/mcp/parse-flags.ts b/packages/cli/test/lib/mcp/parse-flags.ts index 76338c15fd..bd319e2923 100644 --- a/packages/cli/test/lib/mcp/parse-flags.ts +++ b/packages/cli/test/lib/mcp/parse-flags.ts @@ -47,7 +47,7 @@ export async function parseMcpArgs(args: readonly string[]): Promise { parameters: (mcpCommand as unknown as { parameters: McpParameters }) .parameters, func(flags, scope) { - parsed = { flags, scope }; + parsed = { flags, ...(scope !== undefined && { scope }) }; }, }); await run( diff --git a/packages/cli/test/lib/mcp/telemetry-init-scope.test.ts b/packages/cli/test/lib/mcp/telemetry-init-scope.test.ts index 7a02d3b8da..042bcbeca5 100644 --- a/packages/cli/test/lib/mcp/telemetry-init-scope.test.ts +++ b/packages/cli/test/lib/mcp/telemetry-init-scope.test.ts @@ -18,7 +18,8 @@ afterEach(async () => { test("binds the client when init runs inside the command's pre-init span", async () => { // Disabled, so the client never sends; it is still created and bound. - process.env.SENTRY_CLI_NO_TELEMETRY = "1"; + // Disabled, so the client never sends; it is still created and bound. + process.env["SENTRY_CLI_NO_TELEMETRY"] = "1"; // `buildCommand` wraps every command in a `withTracing("exec")` span. await Sentry.startSpan({ name: "exec", onlyIfParent: true }, async () => { await Promise.resolve(); diff --git a/packages/cli/test/lib/mcp/telemetry.test.ts b/packages/cli/test/lib/mcp/telemetry.test.ts index 7cd3f3afde..0d3e1905db 100644 --- a/packages/cli/test/lib/mcp/telemetry.test.ts +++ b/packages/cli/test/lib/mcp/telemetry.test.ts @@ -76,11 +76,11 @@ async function openStore() { const { getDatabase } = await import("../../../src/lib/db/index.js"); const { createEnvelopeStore } = await import("../../../src/lib/telemetry/offline-store.js"); - const optedOut = process.env.SENTRY_CLI_NO_TELEMETRY; - process.env.SENTRY_CLI_NO_TELEMETRY = "1"; + const optedOut = process.env["SENTRY_CLI_NO_TELEMETRY"]; + process.env["SENTRY_CLI_NO_TELEMETRY"] = "1"; getDatabase(); if (optedOut === undefined) { - delete process.env.SENTRY_CLI_NO_TELEMETRY; + delete process.env["SENTRY_CLI_NO_TELEMETRY"]; } return { store: createEnvelopeStore(), @@ -128,15 +128,15 @@ describe("initMcpTelemetry", () => { // A server started from a project shell or IDE inherits the app's DSN. test("ignores SENTRY_DSN and DEFAULT_SENTRY_DSN from the environment", async () => { const appDsn = "https://key@o1.ingest.sentry.io/1"; - process.env.SENTRY_DSN = appDsn; - process.env.DEFAULT_SENTRY_DSN = appDsn; + process.env["SENTRY_DSN"] = appDsn; + process.env["DEFAULT_SENTRY_DSN"] = appDsn; const options = await initOptions(); expect(options.dsn).toBe(SENTRY_CLI_DSN); expect(options.enabled).toBe(true); }); test("ignores SENTRY_RELEASE so the reported release stays ours", async () => { - process.env.SENTRY_RELEASE = "spoofed"; + process.env["SENTRY_RELEASE"] = "spoofed"; const options = await initOptions(); expect(options.release).toBe(CLI_VERSION); }); @@ -208,7 +208,7 @@ describe("initMcpTelemetry", () => { const { store, storedCount } = await openStore(); await store.push(eventEnvelope("stored")); expect(storedCount()).toBe(1); - process.env.SENTRY_CLI_NO_TELEMETRY = "1"; + process.env["SENTRY_CLI_NO_TELEMETRY"] = "1"; await initOptions(); diff --git a/packages/cli/test/lib/oauth.test.ts b/packages/cli/test/lib/oauth.test.ts index e6d0ce2939..a6763b4421 100644 --- a/packages/cli/test/lib/oauth.test.ts +++ b/packages/cli/test/lib/oauth.test.ts @@ -24,6 +24,7 @@ import { resolveOAuthScopeString, } from "../../src/lib/oauth.js"; import { DEFAULT_NUM_RUNS } from "../model-based/helpers.js"; +import { at } from "../helpers.js"; const knownScopeArb = constantFrom(...SENTRY_SCOPES); @@ -228,20 +229,26 @@ describe("setup-code exchange", () => { expires_in: 3600, refresh_token: "refresh-token", }; - const fetch = vi.fn().mockResolvedValue(Response.json(token)); + const fetch = vi + .fn() + .mockResolvedValue(Response.json(token)); vi.stubGlobal("fetch", fetch); expect( await exchangeSetupCode("private-code", "https://sentry.example.com"), ).toEqual(token); expect(fetch).toHaveBeenCalledTimes(1); - const [url, init] = fetch.mock.calls[0]; + const [url, init] = at(fetch.mock.calls, 0); expect(url).toBe("https://sentry.example.com/oauth/token/"); - expect(init.redirect).toBe("error"); - expect(init.body.get("grant_type")).toBe( + expect(init?.redirect).toBe("error"); + const body = init?.body; + if (!(body instanceof URLSearchParams)) { + throw new Error("Expected a form-encoded token request body"); + } + expect(body.get("grant_type")).toBe( "urn:sentry:params:oauth:grant-type:setup_code", ); - expect(init.body.get("setup_code")).toBe("private-code"); - expect(init.body.get("client_id")).toBeTruthy(); + expect(body.get("setup_code")).toBe("private-code"); + expect(body.get("client_id")).toBeTruthy(); }); test.each([ diff --git a/packages/cli/test/lib/omit-undefined.test.ts b/packages/cli/test/lib/omit-undefined.test.ts new file mode 100644 index 0000000000..dc99f20d3c --- /dev/null +++ b/packages/cli/test/lib/omit-undefined.test.ts @@ -0,0 +1,17 @@ +import { describe, expect, test } from "vitest"; +import { omitUndefined } from "../../src/lib/omit-undefined.js"; + +describe("omitUndefined", () => { + test("drops undefined values and keeps every other value", () => { + const result = omitUndefined({ + cursor: undefined, + limit: 0, + query: "", + flag: false, + parent: null, + }); + + expect(result).toEqual({ limit: 0, query: "", flag: false, parent: null }); + expect("cursor" in result).toBe(false); + }); +}); diff --git a/packages/cli/test/lib/org-list-budget.test.ts b/packages/cli/test/lib/org-list-budget.test.ts index 4cb9cada2a..a0bf18b8b0 100644 --- a/packages/cli/test/lib/org-list-budget.test.ts +++ b/packages/cli/test/lib/org-list-budget.test.ts @@ -19,7 +19,11 @@ type Page = { function page(items: string[], nextCursor?: string): FetchResult { return { success: true, - data: { items, hasMore: !!nextCursor, nextCursor }, + data: { + items, + hasMore: !!nextCursor, + ...(nextCursor !== undefined && { nextCursor }), + }, }; } diff --git a/packages/cli/test/lib/org-list.test.ts b/packages/cli/test/lib/org-list.test.ts index 12c75709ea..4b61d0ce2e 100644 --- a/packages/cli/test/lib/org-list.test.ts +++ b/packages/cli/test/lib/org-list.test.ts @@ -6,17 +6,21 @@ * dispatchOrgScopedList (with and without overrides, metadata-only config). */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; vi.mock("../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -25,12 +29,8 @@ import * as apiClient from "../../src/lib/api-client.js"; vi.mock("../../src/lib/db/defaults.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -44,12 +44,8 @@ import * as paginationDb from "../../src/lib/db/pagination.js"; vi.mock("../../src/lib/db/regions.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../mock-exports.js"); + return mockFunctionExports(actual); }); import { @@ -75,12 +71,8 @@ import { vi.mock("../../src/lib/polling.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -89,12 +81,8 @@ import * as polling from "../../src/lib/polling.js"; vi.mock("../../src/lib/region.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -103,22 +91,19 @@ import * as region from "../../src/lib/region.js"; vi.mock("../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as resolveTarget from "../../src/lib/resolve-target.js"; +import { at } from "../helpers.js"; /** * Bypass the withProgress spinner in all tests — prevents real stderr * timers from piling up during full-suite runs and causing 5s timeouts. */ -let withProgressSpy: ReturnType; +let withProgressSpy: MockInstance<(typeof polling)["withProgress"]>; beforeEach(() => { withProgressSpy = vi .spyOn(polling, "withProgress") @@ -134,6 +119,9 @@ afterEach(() => { type FakeEntity = { id: string; name: string }; type FakeWithOrg = FakeEntity & { orgSlug: string }; +type ListPaginated = NonNullable< + OrgListConfig["listPaginated"] +>; function makeConfig( overrides?: Partial>, @@ -143,8 +131,8 @@ function makeConfig( entityPlural: "widgets", commandPrefix: () => "sentry widget list", listForOrg: vi.fn(() => Promise.resolve([])), - listPaginated: vi.fn(() => - Promise.resolve({ data: [] as FakeEntity[], nextCursor: undefined }), + listPaginated: vi.fn(() => + Promise.resolve({ data: [] as FakeEntity[] }), ), withOrg: (entity, orgSlug) => ({ ...entity, orgSlug }), displayTable: vi.fn(() => ""), @@ -158,11 +146,6 @@ const META_ONLY: ListCommandMeta = { commandPrefix: () => "sentry thing list", }; -function createStdout() { - const write = vi.fn((_chunk: string) => true); - return { writer: { write }, write }; -} - // --------------------------------------------------------------------------- // isOrgListConfig // --------------------------------------------------------------------------- @@ -220,7 +203,9 @@ describe("fetchOrgSafe", () => { // --------------------------------------------------------------------------- describe("fetchAllOrgs", () => { - let listOrganizationsSpy: ReturnType; + let listOrganizationsSpy: MockInstance< + (typeof apiClient)["listOrganizations"] + >; beforeEach(() => { listOrganizationsSpy = vi.spyOn(apiClient, "listOrganizations"); @@ -243,8 +228,8 @@ describe("fetchAllOrgs", () => { const result = await fetchAllOrgs(config); expect(result).toHaveLength(2); - expect(result[0].orgSlug).toBe("org-a"); - expect(result[1].orgSlug).toBe("org-b"); + expect(at(result, 0).orgSlug).toBe("org-a"); + expect(at(result, 1).orgSlug).toBe("org-b"); }); test("skips orgs with non-auth errors", async () => { @@ -264,7 +249,7 @@ describe("fetchAllOrgs", () => { const result = await fetchAllOrgs(config); expect(result).toHaveLength(1); - expect(result[0].orgSlug).toBe("org-b"); + expect(at(result, 0).orgSlug).toBe("org-b"); }); test("rethrows AuthError from any org", async () => { @@ -305,7 +290,7 @@ describe("handleOrgAll", () => { test("returns ListResult with hasMore=true and nextCursor", async () => { const items: FakeEntity[] = [{ id: "1", name: "A" }]; const config = makeConfig({ - listPaginated: vi.fn(() => + listPaginated: vi.fn(() => Promise.resolve({ data: items, nextCursor: "next:123" }), ), }); @@ -323,12 +308,12 @@ describe("handleOrgAll", () => { // paginate() wraps the server cursor with the walk's page size. expect(result.nextCursor).toContain("next:123"); expect(result.items).toHaveLength(1); - expect(result.items[0].orgSlug).toBe("my-org"); + expect(at(result.items, 0).orgSlug).toBe("my-org"); }); test("caps perPage at API_MAX_PER_PAGE when limit exceeds it", async () => { - const listPaginated = vi.fn(() => - Promise.resolve({ data: [] as FakeEntity[], nextCursor: undefined }), + const listPaginated = vi.fn(() => + Promise.resolve({ data: [] as FakeEntity[] }), ); const config = makeConfig({ listPaginated }); @@ -348,8 +333,8 @@ describe("handleOrgAll", () => { }); test("passes limit through as perPage when below API_MAX_PER_PAGE", async () => { - const listPaginated = vi.fn(() => - Promise.resolve({ data: [] as FakeEntity[], nextCursor: undefined }), + const listPaginated = vi.fn(() => + Promise.resolve({ data: [] as FakeEntity[] }), ); const config = makeConfig({ listPaginated }); @@ -370,10 +355,9 @@ describe("handleOrgAll", () => { test("returns ListResult with hasMore=false when no nextCursor", async () => { const config = makeConfig({ - listPaginated: vi.fn(() => + listPaginated: vi.fn(() => Promise.resolve({ data: [{ id: "1", name: "A" }], - nextCursor: undefined, }), ), }); @@ -394,8 +378,8 @@ describe("handleOrgAll", () => { test("returns hint with 'no entities found' when empty", async () => { const config = makeConfig({ - listPaginated: vi.fn(() => - Promise.resolve({ data: [] as FakeEntity[], nextCursor: undefined }), + listPaginated: vi.fn(() => + Promise.resolve({ data: [] as FakeEntity[] }), ), }); @@ -414,7 +398,7 @@ describe("handleOrgAll", () => { test("returns hint with next page info when more available", async () => { const config = makeConfig({ - listPaginated: vi.fn(() => + listPaginated: vi.fn(() => Promise.resolve({ data: [{ id: "1", name: "A" }], nextCursor: "x" }), ), }); @@ -434,7 +418,7 @@ describe("handleOrgAll", () => { test("calls advancePaginationState when nextCursor present", async () => { const config = makeConfig({ - listPaginated: vi.fn(() => + listPaginated: vi.fn(() => Promise.resolve({ data: [{ id: "1", name: "A" }], nextCursor: "cursor:abc", @@ -461,10 +445,9 @@ describe("handleOrgAll", () => { test("calls advancePaginationState with undefined when no nextCursor", async () => { const config = makeConfig({ - listPaginated: vi.fn(() => + listPaginated: vi.fn(() => Promise.resolve({ data: [{ id: "1", name: "A" }], - nextCursor: undefined, }), ), }); @@ -487,24 +470,22 @@ describe("handleOrgAll", () => { }); test("auto-paginates when limit exceeds API_MAX_PER_PAGE and never requests a larger page", async () => { - const listPaginated = vi.fn( - (_org: string, opts: { cursor?: string; perPage: number }) => { - expect(opts.perPage).toBeLessThanOrEqual(100); - // OffsetPaginator cursors: ::. - const [size = 0, page = 0] = (opts.cursor ?? "0:0:0") - .split(":") - .map(Number); - const offset = size * page; - const data = Array.from({ length: opts.perPage }, (_, i) => ({ - id: String(offset + i), - name: `W${offset + i}`, - })); - return Promise.resolve({ - data, - nextCursor: `${opts.perPage}:${offset / opts.perPage + 1}:0`, - }); - }, - ); + const listPaginated = vi.fn((_org, opts) => { + expect(opts.perPage).toBeLessThanOrEqual(100); + // OffsetPaginator cursors: ::. + const [size = 0, page = 0] = (opts.cursor ?? "0:0:0") + .split(":") + .map(Number); + const offset = size * page; + const data = Array.from({ length: opts.perPage }, (_, i) => ({ + id: String(offset + i), + name: `W${offset + i}`, + })); + return Promise.resolve({ + data, + nextCursor: `${opts.perPage}:${offset / opts.perPage + 1}:0`, + }); + }); const config = makeConfig({ listPaginated }); const result = await handleOrgAll({ @@ -535,7 +516,7 @@ describe("handleOrgAll", () => { org: "my-org", flags: { limit: 30, json: true }, contextKey: "key", - cursor: result.nextCursor, + cursor: result.nextCursor ?? undefined, direction: "next", }); expect(next.items.map((item) => item.id)).toEqual( @@ -565,7 +546,7 @@ describe("handleExplicitOrg", () => { }); expect(result.items).toHaveLength(1); - expect(result.items[0].orgSlug).toBe("my-org"); + expect(at(result.items, 0).orgSlug).toBe("my-org"); }); test("includes org-scoped note in header when noteOrgScoped=true", async () => { @@ -636,7 +617,7 @@ describe("handleExplicitProject", () => { expect(listForProject).toHaveBeenCalledWith("my-org", "my-proj"); expect(result.items).toHaveLength(1); - expect(result.items[0].orgSlug).toBe("my-org"); + expect(at(result.items, 0).orgSlug).toBe("my-org"); }); test("throws when listForProject is not defined on config", async () => { @@ -675,7 +656,9 @@ describe("handleExplicitProject", () => { // --------------------------------------------------------------------------- describe("handleProjectSearch", () => { - let findProjectsBySlugSpy: ReturnType; + let findProjectsBySlugSpy: MockInstance< + (typeof apiClient)["findProjectsBySlug"] + >; beforeEach(() => { findProjectsBySlugSpy = vi.spyOn(apiClient, "findProjectsBySlug"); @@ -724,7 +707,7 @@ describe("handleProjectSearch", () => { }); expect(listForProject).toHaveBeenCalledWith("org-a", "my-proj"); - expect(result.items[0].orgSlug).toBe("org-a"); + expect(at(result.items, 0).orgSlug).toBe("org-a"); }); test("reuses fuzzy project data without a second slug search", async () => { @@ -770,7 +753,7 @@ describe("handleProjectSearch", () => { }); expect(listForOrg).toHaveBeenCalledWith("org-a"); - expect(result.items[0].orgSlug).toBe("org-a"); + expect(at(result.items, 0).orgSlug).toBe("org-a"); }); test("deduplicates orgs when multiple projects share one org", async () => { @@ -797,7 +780,7 @@ describe("handleProjectSearch", () => { test("calls orgAllFallback when slug matches an org and fallback provided", async () => { findProjectsBySlugSpy.mockResolvedValue({ projects: [], - orgs: [{ slug: "acme-corp", name: "Acme Corp" }], + orgs: [{ id: "1", slug: "acme-corp", name: "Acme Corp" }], }); const config = makeConfig(); const fallback = vi.fn(() => @@ -815,7 +798,7 @@ describe("handleProjectSearch", () => { test("throws ResolutionError when slug matches an org but no fallback", async () => { findProjectsBySlugSpy.mockResolvedValue({ projects: [], - orgs: [{ slug: "acme-corp", name: "Acme Corp" }], + orgs: [{ id: "2", slug: "acme-corp", name: "Acme Corp" }], }); const config = makeConfig(); @@ -855,8 +838,8 @@ describe("handleProjectSearch", () => { { orgSlug: "org-a", slug: "my-proj", id: "1", name: "My Project" }, ], orgs: [ - { slug: "org-a", name: "Org A" }, - { slug: "org-b", name: "Org B" }, + { id: "3", slug: "org-a", name: "Org A" }, + { id: "4", slug: "org-b", name: "Org B" }, ], }); const listForOrg = vi.fn(() => @@ -880,12 +863,22 @@ describe("handleProjectSearch", () => { // --------------------------------------------------------------------------- describe("dispatchOrgScopedList", () => { - let getDefaultOrganizationSpy: ReturnType; - let resolveAllTargetsSpy: ReturnType; - let advancePaginationStateSpy: ReturnType; - let hasPreviousPageSpy: ReturnType; - let resolveCursorSpy: ReturnType; - let resolveEffectiveOrgSpy: ReturnType; + let getDefaultOrganizationSpy: MockInstance< + (typeof defaults)["getDefaultOrganization"] + >; + let resolveAllTargetsSpy: MockInstance< + (typeof resolveTarget)["resolveAllTargets"] + >; + let advancePaginationStateSpy: MockInstance< + (typeof paginationDb)["advancePaginationState"] + >; + let hasPreviousPageSpy: MockInstance< + (typeof paginationDb)["hasPreviousPage"] + >; + let resolveCursorSpy: MockInstance<(typeof paginationDb)["resolveCursor"]>; + let resolveEffectiveOrgSpy: MockInstance< + (typeof region)["resolveEffectiveOrg"] + >; beforeEach(() => { getDefaultOrganizationSpy = vi.spyOn(defaults, "getDefaultOrganization"); @@ -921,12 +914,10 @@ describe("dispatchOrgScopedList", () => { test("throws ValidationError when --cursor used outside org-all mode", async () => { const config = makeConfig(); - const { writer } = createStdout(); await expect( dispatchOrgScopedList({ config, - stdout: writer, cwd: "/tmp", flags: { limit: 10, json: false, cursor: "some-cursor" }, parsed: { type: "explicit", org: "my-org", project: "my-proj" }, @@ -936,12 +927,10 @@ describe("dispatchOrgScopedList", () => { test("error message includes entity plural name", async () => { const config = makeConfig(); - const { writer } = createStdout(); try { await dispatchOrgScopedList({ config, - stdout: writer, cwd: "/tmp", flags: { limit: 10, json: false, cursor: "x" }, parsed: { type: "auto-detect" }, @@ -956,15 +945,13 @@ describe("dispatchOrgScopedList", () => { test("delegates to handleOrgAll for org-all mode and returns ListResult", async () => { const items: FakeEntity[] = [{ id: "1", name: "A" }]; const config = makeConfig({ - listPaginated: vi.fn(() => - Promise.resolve({ data: items, nextCursor: undefined }), + listPaginated: vi.fn(() => + Promise.resolve({ data: items }), ), }); - const { writer } = createStdout(); const result = await dispatchOrgScopedList({ config, - stdout: writer, cwd: "/tmp", flags: { limit: 10, json: true }, parsed: { type: "org-all", org: "my-org" }, @@ -979,11 +966,9 @@ describe("dispatchOrgScopedList", () => { Promise.resolve([{ id: "1", name: "T" }]), ); const config = makeConfig({ listForProject }); - const { writer } = createStdout(); const result = await dispatchOrgScopedList({ config, - stdout: writer, cwd: "/tmp", flags: { limit: 10, json: true }, parsed: { type: "explicit", org: "my-org", project: "my-proj" }, @@ -997,11 +982,9 @@ describe("dispatchOrgScopedList", () => { test("explicit mode falls back to org-scoped with note when no listForProject", async () => { const listForOrg = vi.fn(() => Promise.resolve([{ id: "1", name: "R" }])); const config = makeConfig({ listForOrg }); // no listForProject - const { writer } = createStdout(); const result = await dispatchOrgScopedList({ config, - stdout: writer, cwd: "/tmp", flags: { limit: 10, json: false }, parsed: { type: "explicit", org: "my-org", project: "my-proj" }, @@ -1013,14 +996,12 @@ describe("dispatchOrgScopedList", () => { test("override replaces default handler for that mode", async () => { const config = makeConfig(); - const { writer } = createStdout(); const overrideCalled = vi.fn(() => Promise.resolve({ items: [] } as ListResult), ); await dispatchOrgScopedList({ config, - stdout: writer, cwd: "/tmp", flags: { limit: 10, json: false }, parsed: { type: "auto-detect" }, @@ -1035,18 +1016,16 @@ describe("dispatchOrgScopedList", () => { test("override does not affect other modes", async () => { const items: FakeEntity[] = [{ id: "1", name: "A" }]; const config = makeConfig({ - listPaginated: vi.fn(() => - Promise.resolve({ data: items, nextCursor: undefined }), + listPaginated: vi.fn(() => + Promise.resolve({ data: items }), ), }); - const { writer } = createStdout(); const autoDetectOverride = vi.fn(() => Promise.resolve({ items: [] } as ListResult), ); const result = await dispatchOrgScopedList({ config, - stdout: writer, cwd: "/tmp", flags: { limit: 10, json: true }, parsed: { type: "org-all", org: "my-org" }, @@ -1061,14 +1040,12 @@ describe("dispatchOrgScopedList", () => { }); test("metadata-only config with full overrides dispatches correctly", async () => { - const { writer } = createStdout(); const handler = vi.fn(() => Promise.resolve({ items: [] } as ListResult), ); await dispatchOrgScopedList({ config: META_ONLY, - stdout: writer, cwd: "/tmp", flags: { limit: 10, json: false }, parsed: { type: "explicit", org: "my-org", project: "my-proj" }, @@ -1084,12 +1061,9 @@ describe("dispatchOrgScopedList", () => { }); test("metadata-only config without override for invoked mode throws", async () => { - const { writer } = createStdout(); - await expect( dispatchOrgScopedList({ config: META_ONLY, - stdout: writer, cwd: "/tmp", flags: { limit: 10, json: false }, parsed: { type: "auto-detect" }, @@ -1126,8 +1100,8 @@ describe("dispatchOrgScopedList", () => { const items: FakeEntity[] = [{ id: "1", name: "Widget A" }]; const config = makeConfig({ - listPaginated: vi.fn(() => - Promise.resolve({ data: items, nextCursor: undefined }), + listPaginated: vi.fn(() => + Promise.resolve({ data: items }), ), }); @@ -1243,7 +1217,11 @@ describe("dispatchOrgScopedList", () => { }); expect(handler).toHaveBeenCalledTimes(1); - expect(handler.mock.calls[0]?.[0].parsed.type).toBe("project-search"); + expect(handler).toHaveBeenCalledWith( + expect.objectContaining({ + parsed: expect.objectContaining({ type: "project-search" }), + }), + ); }); }); }); @@ -1258,7 +1236,9 @@ describe("dispatchOrgScopedList name filter", () => { { id: "2", name: "api" }, { id: "3", name: "web-backend" }, ]; - let resolveEffectiveOrgSpy: ReturnType; + let resolveEffectiveOrgSpy: MockInstance< + (typeof region)["resolveEffectiveOrg"] + >; beforeEach(() => { resolveEffectiveOrgSpy = vi @@ -1272,8 +1252,8 @@ describe("dispatchOrgScopedList name filter", () => { function filterConfig() { return makeConfig({ - listPaginated: vi.fn(() => - Promise.resolve({ data: WIDGETS, nextCursor: undefined }), + listPaginated: vi.fn(() => + Promise.resolve({ data: WIDGETS }), ), namesOf: (widget) => [widget.name], }); @@ -1327,10 +1307,10 @@ describe("dispatchOrgScopedList name filter", () => { }); test("walks every page, so matches past the first page are kept", async () => { - const listPaginated = vi.fn((_org: string, opts: { cursor?: string }) => + const listPaginated = vi.fn((_org, opts) => Promise.resolve( opts.cursor - ? { data: [{ id: "9", name: "web-late" }], nextCursor: undefined } + ? { data: [{ id: "9", name: "web-late" }] } : { data: WIDGETS, nextCursor: "page-2" }, ), ); @@ -1352,7 +1332,7 @@ describe("dispatchOrgScopedList name filter", () => { test("API errors propagate instead of reading as no matches", async () => { const config = makeConfig({ - listPaginated: vi.fn(() => + listPaginated: vi.fn(() => Promise.reject(new ApiError("Organization not found", 404)), ), namesOf: (widget) => [widget.name], diff --git a/packages/cli/test/lib/paginate.property.test.ts b/packages/cli/test/lib/paginate.property.test.ts index b5e74a3c5d..e4a409fa6f 100644 --- a/packages/cli/test/lib/paginate.property.test.ts +++ b/packages/cli/test/lib/paginate.property.test.ts @@ -43,7 +43,7 @@ function genericOffsetPaginator(total: number): FetchPage { const data = Array.from({ length: end - offset }, (_, i) => offset + i); return Promise.resolve({ data, - nextCursor: end < total ? `0:${end}:0` : undefined, + ...(end < total && { nextCursor: `0:${end}:0` }), }); }; } @@ -67,7 +67,7 @@ function offsetPaginator(total: number): FetchPage { } return Promise.resolve({ data: results.slice(0, limit), - nextCursor: results.length > limit ? `${limit}:${page + 1}:0` : undefined, + ...(results.length > limit && { nextCursor: `${limit}:${page + 1}:0` }), }); }; } diff --git a/packages/cli/test/lib/positional-parse.test.ts b/packages/cli/test/lib/positional-parse.test.ts index d9ee1ec107..bf4d084877 100644 --- a/packages/cli/test/lib/positional-parse.test.ts +++ b/packages/cli/test/lib/positional-parse.test.ts @@ -9,6 +9,7 @@ import { ArgumentParseError, buildApplication, + type Command, type CommandContext, ExitCode, run, @@ -70,7 +71,7 @@ type EchoTarget = OrgProjectTarget>>; /** Run `test cmd ...args` through Stricli, as the CLI does. */ async function runCommand( - command: ReturnType, + command: Command, args: string[], ): Promise<{ stderr: string; exitCode: number | undefined }> { const app = buildApplication( diff --git a/packages/cli/test/lib/proguard.property.test.ts b/packages/cli/test/lib/proguard.property.test.ts index 8d994ea197..ec69a379f7 100644 --- a/packages/cli/test/lib/proguard.property.test.ts +++ b/packages/cli/test/lib/proguard.property.test.ts @@ -13,6 +13,7 @@ import { PROGUARD_NAMESPACE, } from "../../src/lib/proguard.js"; import { DEFAULT_NUM_RUNS } from "../model-based/helpers.js"; +import { at } from "../helpers.js"; /** Lowercase hyphenated UUID shape (8-4-4-4-12 hex). */ const UUID_RE = @@ -72,7 +73,7 @@ describe("proguard: computeProguardUuid", () => { const original = Buffer.from(bytes); const mutated = Buffer.from(bytes); // Flip the first byte to guarantee different content. - mutated[0] = (mutated[0] + 1) % 256; + mutated[0] = (at(mutated, 0) + 1) % 256; expect(computeProguardUuid(original)).not.toBe( computeProguardUuid(mutated), ); diff --git a/packages/cli/test/lib/project-context.test.ts b/packages/cli/test/lib/project-context.test.ts index 8665f31a70..c0f368ab20 100644 --- a/packages/cli/test/lib/project-context.test.ts +++ b/packages/cli/test/lib/project-context.test.ts @@ -49,6 +49,6 @@ test("applies the .sentryclirc env shim when the project-root cache write fails" await import("../../src/lib/project-context.js"); await preloadProjectContext(dir); - expect(process.env.SENTRY_AUTH_TOKEN).toBe("rc-token"); - expect(process.env.SENTRY_URL).toBe("https://sentry.example.com"); + expect(process.env["SENTRY_AUTH_TOKEN"]).toBe("rc-token"); + expect(process.env["SENTRY_URL"]).toBe("https://sentry.example.com"); }); diff --git a/packages/cli/test/lib/promises.property.test.ts b/packages/cli/test/lib/promises.property.test.ts index f3b69a1a8b..621e753c22 100644 --- a/packages/cli/test/lib/promises.property.test.ts +++ b/packages/cli/test/lib/promises.property.test.ts @@ -17,6 +17,7 @@ import { import { describe, expect, test } from "vitest"; import { anyTrue } from "../../src/lib/promises.js"; import { DEFAULT_NUM_RUNS } from "../model-based/helpers.js"; +import { at } from "../helpers.js"; describe("anyTrue properties", () => { test("returns true if and only if at least one predicate returns true", async () => { @@ -27,7 +28,9 @@ describe("anyTrue properties", () => { const items = results.map((_, i) => i); const expectedResult = results.includes(true); - const actualResult = await anyTrue(items, async (i) => results[i]); + const actualResult = await anyTrue(items, async (i) => + at(results, i), + ); expect(actualResult).toBe(expectedResult); }, diff --git a/packages/cli/test/lib/react-native/wrap-call.test.ts b/packages/cli/test/lib/react-native/wrap-call.test.ts index 8519a35012..bb0847771c 100644 --- a/packages/cli/test/lib/react-native/wrap-call.test.ts +++ b/packages/cli/test/lib/react-native/wrap-call.test.ts @@ -12,6 +12,7 @@ import { join } from "node:path"; import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; import type { SourceMapReport } from "../../../src/lib/react-native/wrap-call.js"; import { wrapCall } from "../../../src/lib/react-native/wrap-call.js"; +import { at } from "../../helpers.js"; vi.mock("node:child_process", async (importOriginal) => { const actual = await importOriginal(); @@ -67,7 +68,7 @@ describe("wrapCall", () => { expect(report.packager_bundle_path).toBe("/build/app.jsbundle"); expect(report.packager_sourcemap_path).toContain("app.jsbundle.map"); // The real node was invoked with the injected --sourcemap-output. - const [exe, args] = spawnMock.mock.calls[0]; + const [exe, args] = at(spawnMock.mock.calls, 0); expect(exe).toBe("node"); expect(args).toContain("--sourcemap-output"); }); @@ -79,7 +80,7 @@ describe("wrapCall", () => { SENTRY_RN_REAL_NODE_BINARY: "node", SENTRY_RN_REAL_HERMES_CLI_PATH: "/hermesc", }); - expect(spawnMock.mock.calls[0][0]).toBe("/hermesc"); + expect(at(spawnMock.mock.calls, 0)[0]).toBe("/hermesc"); expect(readReport().hermes_bundle_path).toBe("/build/app.hbc"); }); diff --git a/packages/cli/test/lib/react-native/xcode-env.test.ts b/packages/cli/test/lib/react-native/xcode-env.test.ts index fdab952c69..24cdbb0d25 100644 --- a/packages/cli/test/lib/react-native/xcode-env.test.ts +++ b/packages/cli/test/lib/react-native/xcode-env.test.ts @@ -81,9 +81,9 @@ describe("parseInfoPlistStrings", () => { CFBundleNameA & B `; const parsed = parseInfoPlistStrings(xml); - expect(parsed.CFBundleIdentifier).toBe("com.example.app"); - expect(parsed.CFBundleShortVersionString).toBe("1.2.3"); - expect(parsed.CFBundleName).toBe("A & B"); + expect(parsed["CFBundleIdentifier"]).toBe("com.example.app"); + expect(parsed["CFBundleShortVersionString"]).toBe("1.2.3"); + expect(parsed["CFBundleName"]).toBe("A & B"); }); }); diff --git a/packages/cli/test/lib/region.test.ts b/packages/cli/test/lib/region.test.ts index 8332d75d07..335543a795 100644 --- a/packages/cli/test/lib/region.test.ts +++ b/packages/cli/test/lib/region.test.ts @@ -19,96 +19,96 @@ useTestConfigDir("region-resolve-"); beforeEach(async () => { // Clear any SENTRY_HOST/SENTRY_URL override for most tests - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; // Set up auth token for API tests setAuthToken("test-token"); }); afterEach(() => { - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; }); describe("getSentryBaseUrl", () => { test("returns sentry.io by default", () => { - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; expect(getSentryBaseUrl()).toBe("https://sentry.io"); }); test("respects SENTRY_URL env var", () => { - process.env.SENTRY_URL = "https://sentry.mycompany.com"; + process.env["SENTRY_URL"] = "https://sentry.mycompany.com"; expect(getSentryBaseUrl()).toBe("https://sentry.mycompany.com"); }); test("respects SENTRY_HOST env var", () => { - process.env.SENTRY_HOST = "https://sentry.mycompany.com"; + process.env["SENTRY_HOST"] = "https://sentry.mycompany.com"; expect(getSentryBaseUrl()).toBe("https://sentry.mycompany.com"); }); test("SENTRY_HOST takes precedence over SENTRY_URL", () => { - process.env.SENTRY_HOST = "https://host.example.com"; - process.env.SENTRY_URL = "https://url.example.com"; + process.env["SENTRY_HOST"] = "https://host.example.com"; + process.env["SENTRY_URL"] = "https://url.example.com"; expect(getSentryBaseUrl()).toBe("https://host.example.com"); }); }); describe("isMultiRegionEnabled", () => { test("returns true for sentry.io (default)", () => { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; expect(isMultiRegionEnabled()).toBe(true); }); test("returns true for *.sentry.io URLs", () => { - process.env.SENTRY_URL = "https://us.sentry.io"; + process.env["SENTRY_URL"] = "https://us.sentry.io"; expect(isMultiRegionEnabled()).toBe(true); }); test("returns true for de.sentry.io", () => { - process.env.SENTRY_URL = "https://de.sentry.io"; + process.env["SENTRY_URL"] = "https://de.sentry.io"; expect(isMultiRegionEnabled()).toBe(true); }); test("returns false for self-hosted URLs", () => { - process.env.SENTRY_URL = "https://sentry.mycompany.com"; + process.env["SENTRY_URL"] = "https://sentry.mycompany.com"; expect(isMultiRegionEnabled()).toBe(false); }); test("returns false for localhost", () => { - process.env.SENTRY_URL = "http://localhost:9000"; + process.env["SENTRY_URL"] = "http://localhost:9000"; expect(isMultiRegionEnabled()).toBe(false); }); // Security edge cases - ensure proper URL parsing test("returns false for URL with sentry.io in path (not hostname)", () => { - process.env.SENTRY_URL = "https://evil.com/sentry.io"; + process.env["SENTRY_URL"] = "https://evil.com/sentry.io"; expect(isMultiRegionEnabled()).toBe(false); }); test("returns false for lookalike domain sentry.io.evil.com", () => { - process.env.SENTRY_URL = "https://sentry.io.evil.com"; + process.env["SENTRY_URL"] = "https://sentry.io.evil.com"; expect(isMultiRegionEnabled()).toBe(false); }); test("returns false for domain with sentry.io prefix", () => { - process.env.SENTRY_URL = "https://sentry.io-fake.com"; + process.env["SENTRY_URL"] = "https://sentry.io-fake.com"; expect(isMultiRegionEnabled()).toBe(false); }); test("returns false for invalid URL", () => { - process.env.SENTRY_URL = "not-a-valid-url"; + process.env["SENTRY_URL"] = "not-a-valid-url"; expect(isMultiRegionEnabled()).toBe(false); }); test("respects SENTRY_HOST for self-hosted", () => { - process.env.SENTRY_HOST = "https://sentry.mycompany.com"; + process.env["SENTRY_HOST"] = "https://sentry.mycompany.com"; expect(isMultiRegionEnabled()).toBe(false); }); test("SENTRY_HOST takes precedence over SENTRY_URL", () => { - process.env.SENTRY_HOST = "https://sentry.mycompany.com"; - process.env.SENTRY_URL = "https://us.sentry.io"; + process.env["SENTRY_HOST"] = "https://sentry.mycompany.com"; + process.env["SENTRY_URL"] = "https://us.sentry.io"; expect(isMultiRegionEnabled()).toBe(false); }); }); @@ -295,7 +295,10 @@ describe("resolveOrgRegion", () => { // The test's beforeEach stored an OAuth row with host = SaaS (since // SENTRY_URL was unset at store time). Re-scope the stored token to // the self-hosted host so the fetch-layer guard admits the request. - process.env.SENTRY_URL = "https://sentry.mycompany.com"; + // The test's beforeEach stored an OAuth row with host = SaaS (since + // SENTRY_URL was unset at store time). Re-scope the stored token to + // the self-hosted host so the fetch-layer guard admits the request. + process.env["SENTRY_URL"] = "https://sentry.mycompany.com"; setAuthToken("test-token", undefined, undefined, { host: "https://sentry.mycompany.com", }); diff --git a/packages/cli/test/lib/release-notes.test.ts b/packages/cli/test/lib/release-notes.test.ts index fc41b9f407..f657c3a154 100644 --- a/packages/cli/test/lib/release-notes.test.ts +++ b/packages/cli/test/lib/release-notes.test.ts @@ -25,7 +25,7 @@ import { fetchChangelog, parseCommitMessages, } from "../../src/lib/release-notes.js"; -import { mockFetch } from "../helpers.js"; +import { mockFetch, at } from "../helpers.js"; // ─────────────────────────── Fixtures ────────────────────────────────────── @@ -62,7 +62,7 @@ const SAMPLE_RELEASE_BODY = `### New Features ✨ - Bump Bun from 1.3.9 to 1.3.11 by @BYK in [#552](https://github.com/getsentry/cli/pull/552)`; function makeRelease(tagName: string, body?: string): GitHubRelease { - return { tag_name: tagName, assets: [], body }; + return { tag_name: tagName, assets: [], ...(body !== undefined && { body }) }; } // ─────────────────────── extractSections ──────────────────────────────────── @@ -109,7 +109,7 @@ describe("extractSections", () => { "### Performance\n\n- Optimize query execution\n- Reduce memory usage"; const sections = extractSections(body); expect(sections).toHaveLength(1); - expect(sections[0].category).toBe("performance"); + expect(at(sections, 0).category).toBe("performance"); }); }); @@ -229,7 +229,7 @@ describe("parseCommitMessages", () => { ]; const sections = parseCommitMessages(commits); - expect(sections[0].markdown).toContain("add pagination support"); + expect(at(sections, 0).markdown).toContain("add pagination support"); }); test("uses only first line of multi-line messages", () => { @@ -243,8 +243,8 @@ describe("parseCommitMessages", () => { ]; const sections = parseCommitMessages(commits); - expect(sections[0].markdown).toContain("short summary"); - expect(sections[0].markdown).not.toContain("Long description"); + expect(at(sections, 0).markdown).toContain("short summary"); + expect(at(sections, 0).markdown).not.toContain("Long description"); }); test("filters #skip-changelog commits", () => { diff --git a/packages/cli/test/lib/release-parse.property.test.ts b/packages/cli/test/lib/release-parse.property.test.ts index 52c4cdcc16..5b2be87686 100644 --- a/packages/cli/test/lib/release-parse.property.test.ts +++ b/packages/cli/test/lib/release-parse.property.test.ts @@ -11,12 +11,8 @@ import { DEFAULT_NUM_RUNS } from "../model-based/helpers.js"; vi.mock("../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking diff --git a/packages/cli/test/lib/replay-rrweb.test.ts b/packages/cli/test/lib/replay-rrweb.test.ts index ed97bd308b..19e2c39e7f 100644 --- a/packages/cli/test/lib/replay-rrweb.test.ts +++ b/packages/cli/test/lib/replay-rrweb.test.ts @@ -40,7 +40,7 @@ describe("toRRWebEvents", () => { [mouseMove(T0 + 2, 1)], ]); - expect(events.map((event) => event.type)).toEqual([4, 2, 3]); + expect(events.map((event) => event["type"])).toEqual([4, 2, 3]); }); test("keeps Sentry custom events", () => { @@ -55,7 +55,7 @@ describe("toRRWebEvents", () => { [fullSnapshot(T0), mouseMove(T0 + 100, 1), breadcrumb(T0 + 50)], ]); - expect(events.map((event) => event.type)).toEqual([2, 5, 3]); + expect(events.map((event) => event["type"])).toEqual([2, 5, 3]); }); test("keeps recorded order for events sharing a timestamp", () => { @@ -64,9 +64,9 @@ describe("toRRWebEvents", () => { [mouseMove(T0, 3)], ]); - expect(events.map((event) => (event.data as any).positions[0].id)).toEqual([ - 1, 2, 3, - ]); + expect( + events.map((event) => (event["data"] as any).positions[0].id), + ).toEqual([1, 2, 3]); }); test("converts second-resolution timestamps to milliseconds", () => { @@ -79,12 +79,12 @@ describe("toRRWebEvents", () => { [fullSnapshot(T0), mouseMove(T0 + 1000, 1), span], ]); - expect(events.map((event) => event.timestamp)).toEqual([ + expect(events.map((event) => event["timestamp"])).toEqual([ T0, T0 + 500, T0 + 1000, ]); - expect(events[1]?.data).toEqual(span.data); + expect(events[1]?.["data"]).toEqual(span.data); }); test("leaves event data untouched", () => { diff --git a/packages/cli/test/lib/resolve-effective-org.test.ts b/packages/cli/test/lib/resolve-effective-org.test.ts index 634534936b..09866b7ff7 100644 --- a/packages/cli/test/lib/resolve-effective-org.test.ts +++ b/packages/cli/test/lib/resolve-effective-org.test.ts @@ -250,10 +250,10 @@ describe("resolveEffectiveOrg with API refresh", () => { const { clearAuth } = await import("../../src/lib/db/auth.js"); await clearAuth(); - const savedAuthToken = process.env.SENTRY_AUTH_TOKEN; - const savedSentryToken = process.env.SENTRY_TOKEN; - delete process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_TOKEN; + const savedAuthToken = process.env["SENTRY_AUTH_TOKEN"]; + const savedSentryToken = process.env["SENTRY_TOKEN"]; + delete process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_TOKEN"]; const debugSpy = vi.spyOn(logger, "debug"); try { @@ -266,14 +266,14 @@ describe("resolveEffectiveOrg with API refresh", () => { } finally { debugSpy.mockRestore(); if (savedAuthToken === undefined) { - delete process.env.SENTRY_AUTH_TOKEN; + delete process.env["SENTRY_AUTH_TOKEN"]; } else { - process.env.SENTRY_AUTH_TOKEN = savedAuthToken; + process.env["SENTRY_AUTH_TOKEN"] = savedAuthToken; } if (savedSentryToken === undefined) { - delete process.env.SENTRY_TOKEN; + delete process.env["SENTRY_TOKEN"]; } else { - process.env.SENTRY_TOKEN = savedSentryToken; + process.env["SENTRY_TOKEN"] = savedSentryToken; } } }); diff --git a/packages/cli/test/lib/resolve-target-listing.test.ts b/packages/cli/test/lib/resolve-target-listing.test.ts index 30cccba51b..305fe24c25 100644 --- a/packages/cli/test/lib/resolve-target-listing.test.ts +++ b/packages/cli/test/lib/resolve-target-listing.test.ts @@ -6,17 +6,21 @@ * Uses spyOn to mock dependencies without real HTTP calls. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; vi.mock("../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -26,12 +30,8 @@ import { DEFAULT_SENTRY_URL } from "../../src/lib/constants.js"; vi.mock("../../src/lib/db/defaults.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -40,12 +40,8 @@ import * as defaults from "../../src/lib/db/defaults.js"; vi.mock("../../src/lib/db/auth.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -56,12 +52,8 @@ import { ContextError, ResolutionError } from "../../src/lib/errors.js"; vi.mock("../../src/lib/resolve-target.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([k, v]) => [ - k, - typeof v === "function" ? vi.fn(v) : v, - ]), - ); + const { mockFunctionExports } = await import("../mock-exports.js"); + return mockFunctionExports(actual); }); // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking @@ -81,8 +73,10 @@ import { const CWD = "/tmp/test-project"; describe("classifyProjectSearchTarget", () => { - let findProjectsBySlugSpy: ReturnType; - let listProjectsSpy: ReturnType; + let findProjectsBySlugSpy: MockInstance< + (typeof apiClient)["findProjectsBySlug"] + >; + let listProjectsSpy: MockInstance<(typeof apiClient)["listProjects"]>; beforeEach(() => { findProjectsBySlugSpy = vi.spyOn(apiClient, "findProjectsBySlug"); @@ -105,8 +99,8 @@ describe("classifyProjectSearchTarget", () => { }, ], orgs: [ - { slug: "acme", name: "Acme Org" }, - { slug: "other-org", name: "Other Org" }, + { id: "1", slug: "acme", name: "Acme Org" }, + { id: "2", slug: "other-org", name: "Other Org" }, ], }); @@ -121,7 +115,7 @@ describe("classifyProjectSearchTarget", () => { test("returns an exact organization only after the project search misses", async () => { findProjectsBySlugSpy.mockResolvedValue({ projects: [], - orgs: [{ slug: "acme", name: "Acme Org" }], + orgs: [{ id: "3", slug: "acme", name: "Acme Org" }], }); const result = await classifyProjectSearchTarget({ @@ -135,7 +129,7 @@ describe("classifyProjectSearchTarget", () => { test("recovers one fuzzy project after exact project and org misses", async () => { findProjectsBySlugSpy.mockResolvedValue({ projects: [], - orgs: [{ slug: "acme", name: "Acme Org" }], + orgs: [{ id: "4", slug: "acme", name: "Acme Org" }], }); listProjectsSpy.mockResolvedValue([ { id: "1", slug: "app-frontend", name: "App Frontend" }, @@ -156,7 +150,7 @@ describe("classifyProjectSearchTarget", () => { test("returns not-found after project, organization, and fuzzy misses", async () => { findProjectsBySlugSpy.mockResolvedValue({ projects: [], - orgs: [{ slug: "acme", name: "Acme Org" }], + orgs: [{ id: "5", slug: "acme", name: "Acme Org" }], }); listProjectsSpy.mockResolvedValue([]); @@ -211,8 +205,12 @@ describe("projectSearchNotFoundSuggestions", () => { // --------------------------------------------------------------------------- describe("resolveOrgsForListing", () => { - let getDefaultOrganizationSpy: ReturnType; - let resolveAllTargetsSpy: ReturnType; + let getDefaultOrganizationSpy: MockInstance< + (typeof defaults)["getDefaultOrganization"] + >; + let resolveAllTargetsSpy: MockInstance< + (typeof resolveTargetModule)["resolveAllTargets"] + >; beforeEach(() => { getDefaultOrganizationSpy = vi.spyOn(defaults, "getDefaultOrganization"); @@ -248,9 +246,24 @@ describe("resolveOrgsForListing", () => { test.skip("returns unique orgs from DSN detection when no default", async () => { resolveAllTargetsSpy.mockResolvedValue({ targets: [ - { org: "org-a", project: "proj-1" }, - { org: "org-a", project: "proj-2" }, // same org, different project - { org: "org-b", project: "proj-3" }, + { + orgDisplay: "org-a", + projectDisplay: "proj-1", + org: "org-a", + project: "proj-1", + }, + { + orgDisplay: "org-a", + projectDisplay: "proj-2", + org: "org-a", + project: "proj-2", + }, // same org, different project + { + orgDisplay: "org-b", + projectDisplay: "proj-3", + org: "org-b", + project: "proj-3", + }, ], }); @@ -270,8 +283,18 @@ describe("resolveOrgsForListing", () => { test.skip("propagates footer from DSN detection", async () => { resolveAllTargetsSpy.mockResolvedValue({ targets: [ - { org: "org-a", project: "proj-1" }, - { org: "org-b", project: "proj-2" }, + { + orgDisplay: "org-a", + projectDisplay: "proj-1", + org: "org-a", + project: "proj-1", + }, + { + orgDisplay: "org-b", + projectDisplay: "proj-2", + org: "org-b", + project: "proj-2", + }, ], footer: "Found 2 projects", }); @@ -283,7 +306,14 @@ describe("resolveOrgsForListing", () => { // oxlint-disable-next-line sentry-cli/no-skipped-tests -- vitest can't intercept same-file internal calls test.skip("propagates skippedSelfHosted from DSN detection", async () => { resolveAllTargetsSpy.mockResolvedValue({ - targets: [{ org: "org-a", project: "proj-1" }], + targets: [ + { + orgDisplay: "org-a", + projectDisplay: "proj-1", + org: "org-a", + project: "proj-1", + }, + ], skippedSelfHosted: 2, }); @@ -309,9 +339,15 @@ describe("resolveOrgsForListing", () => { // --------------------------------------------------------------------------- describe("resolveProjectBoundTarget", () => { - let findProjectsBySlugSpy: ReturnType; - let resolveOrgAndProjectSpy: ReturnType; - let listOrganizationsSpy: ReturnType; + let findProjectsBySlugSpy: MockInstance< + (typeof apiClient)["findProjectsBySlug"] + >; + let resolveOrgAndProjectSpy: MockInstance< + (typeof resolveTargetModule)["resolveOrgAndProject"] + >; + let listOrganizationsSpy: MockInstance< + (typeof apiClient)["listOrganizations"] + >; beforeEach(() => { findProjectsBySlugSpy = vi.spyOn(apiClient, "findProjectsBySlug"); @@ -356,7 +392,9 @@ describe("resolveProjectBoundTarget", () => { test("resolves project-search when single match found", async () => { findProjectsBySlugSpy.mockResolvedValue({ - projects: [{ orgSlug: "found-org", slug: "my-proj", name: "My Project" }], + projects: [ + { id: "6", orgSlug: "found-org", slug: "my-proj", name: "My Project" }, + ], orgs: [], }); @@ -383,8 +421,8 @@ describe("resolveProjectBoundTarget", () => { test("throws ResolutionError for project-search when multiple matches", async () => { findProjectsBySlugSpy.mockResolvedValue({ projects: [ - { orgSlug: "org-a", slug: "my-proj", name: "My Project" }, - { orgSlug: "org-b", slug: "my-proj", name: "My Project" }, + { id: "7", orgSlug: "org-a", slug: "my-proj", name: "My Project" }, + { id: "8", orgSlug: "org-b", slug: "my-proj", name: "My Project" }, ], orgs: [], }); @@ -439,7 +477,7 @@ describe("resolveProjectBoundTarget", () => { // Lines 1017-1023: slug matches an org but no project → org-as-project error findProjectsBySlugSpy.mockResolvedValue({ projects: [], - orgs: [{ slug: "acme-corp", name: "Acme Corp" }], + orgs: [{ id: "9", slug: "acme-corp", name: "Acme Corp" }], }); const parsed = { @@ -465,8 +503,12 @@ describe("resolveProjectBoundTarget", () => { // --------------------------------------------------------------------------- describe("resolveProjectBoundFromArg", () => { - let findProjectsBySlugSpy: ReturnType; - let resolveOrgAndProjectSpy: ReturnType; + let findProjectsBySlugSpy: MockInstance< + (typeof apiClient)["findProjectsBySlug"] + >; + let resolveOrgAndProjectSpy: MockInstance< + (typeof resolveTargetModule)["resolveOrgAndProject"] + >; beforeEach(async () => { findProjectsBySlugSpy = vi.spyOn(apiClient, "findProjectsBySlug"); @@ -493,7 +535,9 @@ describe("resolveProjectBoundFromArg", () => { test("resolves bare project slug string via project-search", async () => { findProjectsBySlugSpy.mockResolvedValue({ - projects: [{ orgSlug: "found-org", slug: "my-proj", name: "My Project" }], + projects: [ + { id: "10", orgSlug: "found-org", slug: "my-proj", name: "My Project" }, + ], orgs: [], }); @@ -532,9 +576,11 @@ describe("resolveProjectBoundFromArg", () => { // --------------------------------------------------------------------------- describe("resolveProjectBoundTargets", () => { - let getProjectSpy: ReturnType; - let listProjectsSpy: ReturnType; - let findProjectsBySlugSpy: ReturnType; + let getProjectSpy: MockInstance<(typeof apiClient)["getProject"]>; + let listProjectsSpy: MockInstance<(typeof apiClient)["listProjects"]>; + let findProjectsBySlugSpy: MockInstance< + (typeof apiClient)["findProjectsBySlug"] + >; const OPTS = { cwd: CWD, usageHint: "sentry issue list /" }; @@ -557,7 +603,11 @@ describe("resolveProjectBoundTargets", () => { }); test("explicit: resolves DSN-style org id to the real slug", async () => { - getProjectSpy.mockResolvedValue({ id: "42", slug: "my-proj" }); + getProjectSpy.mockResolvedValue({ + id: "42", + slug: "my-proj", + name: "My Proj", + }); const result = await resolveProjectBoundTargets( { type: "explicit", org: "o1081365", project: "my-proj" }, @@ -598,12 +648,12 @@ describe("resolveProjectBoundTargets", () => { // the org-a match — never leak org-b. findProjectsBySlugSpy.mockResolvedValue({ projects: [ - { orgSlug: "org-b", slug: "my-proj", name: "My Project" }, - { orgSlug: "my-org", slug: "my-proj", name: "My Project" }, + { id: "11", orgSlug: "org-b", slug: "my-proj", name: "My Project" }, + { id: "12", orgSlug: "my-org", slug: "my-proj", name: "My Project" }, ], orgs: [ - { slug: "org-b", name: "Org B" }, - { slug: "my-org", name: "My Org" }, + { id: "13", slug: "org-b", name: "Org B" }, + { id: "14", slug: "my-org", name: "My Org" }, ], }); @@ -640,11 +690,17 @@ describe("resolveProjectBoundTargets", () => { // --------------------------------------------------------------------------- describe("resolveOrgProjectOrGuide", () => { - let isAuthenticatedSpy: ReturnType; - let listOrganizationsSpy: ReturnType; - let listProjectsSpy: ReturnType; - let getDefaultOrgSpy: ReturnType; - let getDefaultProjectSpy: ReturnType; + let isAuthenticatedSpy: MockInstance<(typeof auth)["isAuthenticated"]>; + let listOrganizationsSpy: MockInstance< + (typeof apiClient)["listOrganizations"] + >; + let listProjectsSpy: MockInstance<(typeof apiClient)["listProjects"]>; + let getDefaultOrgSpy: MockInstance< + (typeof defaults)["getDefaultOrganization"] + >; + let getDefaultProjectSpy: MockInstance< + (typeof defaults)["getDefaultProject"] + >; beforeEach(() => { isAuthenticatedSpy = vi.spyOn(auth, "isAuthenticated"); @@ -671,7 +727,7 @@ describe("resolveOrgProjectOrGuide", () => { test("auto-selects the sole org/project for a single-org account", async () => { isAuthenticatedSpy.mockReturnValue(true); listOrganizationsSpy.mockResolvedValue([ - { slug: "solo", name: "Solo Inc" }, + { id: "15", slug: "solo", name: "Solo Inc" }, ]); listProjectsSpy.mockResolvedValue([ { id: "42", slug: "only-proj", name: "Only Project" }, @@ -689,8 +745,8 @@ describe("resolveOrgProjectOrGuide", () => { test("throws a ContextError listing accessible orgs for a multi-org account", async () => { isAuthenticatedSpy.mockReturnValue(true); listOrganizationsSpy.mockResolvedValue([ - { slug: "org-a", name: "Org A" }, - { slug: "org-b", name: "Org B" }, + { id: "16", slug: "org-a", name: "Org A" }, + { id: "17", slug: "org-b", name: "Org B" }, ]); try { @@ -723,7 +779,9 @@ describe("resolveOrgProjectOrGuide", () => { }); describe("resolveOrgOptionalTarget bare org slug", () => { - let findProjectsBySlugSpy: ReturnType; + let findProjectsBySlugSpy: MockInstance< + (typeof apiClient)["findProjectsBySlug"] + >; beforeEach(() => { findProjectsBySlugSpy = vi.spyOn(apiClient, "findProjectsBySlug"); @@ -736,7 +794,7 @@ describe("resolveOrgOptionalTarget bare org slug", () => { test("uses the organization when no project has that slug", async () => { findProjectsBySlugSpy.mockResolvedValue({ projects: [], - orgs: [{ slug: "acme-corp", name: "Acme Corp" }], + orgs: [{ id: "18", slug: "acme-corp", name: "Acme Corp" }], }); const result = await resolveOrgOptionalTarget( diff --git a/packages/cli/test/lib/resolve-target-picker.test.ts b/packages/cli/test/lib/resolve-target-picker.test.ts index f80e38f642..05154399c5 100644 --- a/packages/cli/test/lib/resolve-target-picker.test.ts +++ b/packages/cli/test/lib/resolve-target-picker.test.ts @@ -84,7 +84,7 @@ beforeEach(() => { "Test preload did not preserve the real fetch implementation", ); } - process.env.SENTRY_URL = server.url; + process.env["SENTRY_URL"] = server.url; setAuthToken("test-picker-token"); globalThis.fetch = realFetch; }); diff --git a/packages/cli/test/lib/resolve-target.mocked.test.ts b/packages/cli/test/lib/resolve-target.mocked.test.ts index d702cda37d..bc9fcbd2db 100644 --- a/packages/cli/test/lib/resolve-target.mocked.test.ts +++ b/packages/cli/test/lib/resolve-target.mocked.test.ts @@ -19,6 +19,21 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; // barrel dsn/index.js), then pass it through the mock below so the mocked // barrel still returns the real implementation for this export. import { formatMultipleProjectsFooter } from "../../src/lib/dsn/errors.js"; +import type { + findProjectByDsn, + findProjectsByPattern, + listOrganizationsUncached, +} from "../../src/lib/api-client.js"; +import type { + getDefaultOrganization, + getDefaultProject, +} from "../../src/lib/db/defaults.js"; +import type { getCachedDsn } from "../../src/lib/db/dsn-cache.js"; +import type { + getCachedProject, + getCachedProjectByDsnKey, +} from "../../src/lib/db/project-cache.js"; +import type { detectAllDsns, detectDsn } from "../../src/lib/dsn/index.js"; // ============================================================================ // Mock Setup - All dependency modules mocked before importing resolve-target @@ -44,10 +59,10 @@ const { mockListOrganizationsUncached, mockGetOrgByNumericId, } = vi.hoisted(() => ({ - mockGetDefaultOrganization: vi.fn(() => null), - mockGetDefaultProject: vi.fn(() => null), - mockDetectDsn: vi.fn(() => Promise.resolve(null)), - mockDetectAllDsns: vi.fn(() => + mockGetDefaultOrganization: vi.fn(() => null), + mockGetDefaultProject: vi.fn(() => null), + mockDetectDsn: vi.fn(() => Promise.resolve(null)), + mockDetectAllDsns: vi.fn(() => Promise.resolve({ primary: null, all: [], @@ -62,22 +77,30 @@ const { }), ), mockGetDsnSourceDescription: vi.fn(() => "SENTRY_DSN environment variable"), - mockGetCachedProject: vi.fn(() => null), + mockGetCachedProject: vi.fn(() => undefined), mockSetCachedProject: vi.fn(() => { /* no-op */ }), - mockGetCachedProjectByDsnKey: vi.fn(() => null), + mockGetCachedProjectByDsnKey: vi.fn( + () => undefined, + ), mockSetCachedProjectByDsnKey: vi.fn(() => { /* no-op */ }), - mockGetCachedDsn: vi.fn(() => null), + mockGetCachedDsn: vi.fn(() => undefined), mockSetCachedDsn: vi.fn(() => { /* no-op */ }), mockGetProject: vi.fn(() => Promise.resolve({ slug: "test", name: "Test" })), - mockFindProjectByDsn: vi.fn(() => Promise.resolve(null)), - mockFindProjectsByPattern: vi.fn(() => Promise.resolve([])), - mockListOrganizationsUncached: vi.fn(() => Promise.resolve([])), + mockFindProjectByDsn: vi.fn(() => + Promise.resolve(null), + ), + mockFindProjectsByPattern: vi.fn(() => + Promise.resolve([]), + ), + mockListOrganizationsUncached: vi.fn(() => + Promise.resolve([]), + ), mockGetOrgByNumericId: vi.fn( () => undefined as { slug: string; regionUrl: string } | undefined, ), @@ -161,6 +184,7 @@ import { resolveOrgAndProject, resolveOrgsForListing, } from "../../src/lib/resolve-target.js"; +import { at } from "../helpers.js"; /** Reset all mocks between tests */ function resetAllMocks() { @@ -199,9 +223,9 @@ function resetAllMocks() { mockGetDsnSourceDescription.mockReturnValue( "SENTRY_DSN environment variable", ); - mockGetCachedProject.mockReturnValue(null); - mockGetCachedProjectByDsnKey.mockReturnValue(null); - mockGetCachedDsn.mockReturnValue(null); + mockGetCachedProject.mockReturnValue(undefined); + mockGetCachedProjectByDsnKey.mockReturnValue(undefined); + mockGetCachedDsn.mockReturnValue(undefined); mockFindProjectsByPattern.mockResolvedValue([]); mockListOrganizationsUncached.mockResolvedValue([]); mockGetOrgByNumericId.mockReturnValue(undefined); @@ -253,6 +277,7 @@ describe("resolveOrg", () => { orgName: "Cached Organization", projectSlug: "project", projectName: "Project", + cachedAt: Date.now(), }); const result = await resolveOrg({ cwd: "/test" }); @@ -275,7 +300,7 @@ describe("resolveOrg", () => { orgId: "123", source: "env", }); - mockGetCachedProject.mockReturnValue(null); + mockGetCachedProject.mockReturnValue(undefined); mockListOrganizationsUncached.mockResolvedValue([]); const result = await resolveOrg({ cwd: "/test" }); @@ -298,7 +323,7 @@ describe("resolveOrg", () => { orgId: "1169445", source: "env", }); - mockGetCachedProject.mockReturnValue(null); + mockGetCachedProject.mockReturnValue(undefined); mockGetOrgByNumericId.mockReturnValue(undefined); mockListOrganizationsUncached.mockResolvedValue([ { id: "1169445", slug: "my-org", name: "My Org" }, @@ -320,7 +345,7 @@ describe("resolveOrg", () => { orgId: "123", source: "env", }); - mockGetCachedProject.mockReturnValue(null); + mockGetCachedProject.mockReturnValue(undefined); mockListOrganizationsUncached.mockRejectedValue(new Error("offline")); const result = await resolveOrg({ cwd: "/test" }); @@ -340,7 +365,7 @@ describe("resolveOrg", () => { orgId: "1169445", source: "env", }); - mockGetCachedProject.mockReturnValue(null); + mockGetCachedProject.mockReturnValue(undefined); mockGetOrgByNumericId.mockReturnValue({ slug: "my-org", regionUrl: "https://us.sentry.io", @@ -364,7 +389,7 @@ describe("resolveOrg", () => { orgId: "1169445", source: "env", }); - mockGetCachedProject.mockReturnValue(null); + mockGetCachedProject.mockReturnValue(undefined); // First call returns undefined (cache miss), second call returns slug // (after listOrganizationsUncached populates the cache) @@ -401,6 +426,7 @@ describe("resolveOrg", () => { orgName: "Cached Organization", projectSlug: "project", projectName: "Project", + cachedAt: Date.now(), }); const result = await resolveOrg({ cwd: "/test" }); @@ -485,6 +511,7 @@ describe("resolveFromDsn", () => { protocol: "https", publicKey: "abc", host: "o123.ingest.sentry.io", + projectId: "", orgId: "123", source: "env", }); @@ -510,6 +537,7 @@ describe("resolveFromDsn", () => { orgName: "Cached Organization", projectSlug: "cached-project", projectName: "Cached Project", + cachedAt: Date.now(), }); const result = await resolveFromDsn("/test"); @@ -561,7 +589,7 @@ describe("resolveFromDsn", () => { source: "env", sourcePath: "/test/.env", }); - mockGetCachedProject.mockReturnValue(null); + mockGetCachedProject.mockReturnValue(undefined); const result = await resolveFromDsn("/test"); @@ -583,7 +611,7 @@ describe("resolveFromDsn", () => { orgId: "1169445", source: "env", }); - mockGetCachedProject.mockReturnValue(null); + mockGetCachedProject.mockReturnValue(undefined); mockGetOrgByNumericId.mockReturnValue({ slug: "my-org", regionUrl: "https://us.sentry.io", @@ -667,6 +695,7 @@ describe("resolveOrgAndProject", () => { orgName: "DSN Org", projectSlug: "dsn-project", projectName: "DSN Project", + cachedAt: Date.now(), }); const result = await resolveOrgAndProject({ cwd: "/test" }); @@ -735,8 +764,8 @@ describe("resolveAllTargets", () => { }); expect(result.targets).toHaveLength(1); - expect(result.targets[0].org).toBe("my-org"); - expect(result.targets[0].project).toBe("my-project"); + expect(at(result.targets, 0).org).toBe("my-org"); + expect(at(result.targets, 0).project).toBe("my-project"); }); test("throws ContextError when only org provided", async () => { @@ -752,8 +781,8 @@ describe("resolveAllTargets", () => { const result = await resolveAllTargets({ cwd: "/test" }); expect(result.targets).toHaveLength(1); - expect(result.targets[0].org).toBe("default-org"); - expect(result.targets[0].project).toBe("default-project"); + expect(at(result.targets, 0).org).toBe("default-org"); + expect(at(result.targets, 0).project).toBe("default-project"); }); test("resolves multiple DSNs in monorepo", async () => { @@ -767,7 +796,7 @@ describe("resolveAllTargets", () => { host: "o123.ingest.sentry.io", projectId: "456", orgId: "123", - source: "env-file", + source: "env_file", sourcePath: "/test/monorepo/packages/frontend/.env", }, all: [ @@ -778,7 +807,7 @@ describe("resolveAllTargets", () => { host: "o123.ingest.sentry.io", projectId: "456", orgId: "123", - source: "env-file", + source: "env_file", sourcePath: "/test/monorepo/packages/frontend/.env", }, { @@ -788,7 +817,7 @@ describe("resolveAllTargets", () => { host: "o123.ingest.sentry.io", projectId: "789", orgId: "123", - source: "env-file", + source: "env_file", sourcePath: "/test/monorepo/packages/backend/.env", }, ], @@ -801,12 +830,14 @@ describe("resolveAllTargets", () => { orgName: "My Org", projectSlug: "frontend", projectName: "Frontend", + cachedAt: Date.now(), }) .mockReturnValueOnce({ orgSlug: "my-org", orgName: "My Org", projectSlug: "backend", projectName: "Backend", + cachedAt: Date.now(), }); mockGetDsnSourceDescription .mockReturnValueOnce("packages/frontend/.env") @@ -815,10 +846,10 @@ describe("resolveAllTargets", () => { const result = await resolveAllTargets({ cwd: "/test/monorepo" }); expect(result.targets).toHaveLength(2); - expect(result.targets[0].org).toBe("my-org"); - expect(result.targets[0].project).toBe("frontend"); - expect(result.targets[1].org).toBe("my-org"); - expect(result.targets[1].project).toBe("backend"); + expect(at(result.targets, 0).org).toBe("my-org"); + expect(at(result.targets, 0).project).toBe("frontend"); + expect(at(result.targets, 1).org).toBe("my-org"); + expect(at(result.targets, 1).project).toBe("backend"); }); test("deduplicates targets with same org+project", async () => { @@ -832,7 +863,7 @@ describe("resolveAllTargets", () => { host: "o123.ingest.sentry.io", projectId: "456", orgId: "123", - source: "env-file", + source: "env_file", sourcePath: "/test/.env", }, all: [ @@ -843,7 +874,7 @@ describe("resolveAllTargets", () => { host: "o123.ingest.sentry.io", projectId: "456", orgId: "123", - source: "env-file", + source: "env_file", sourcePath: "/test/.env", }, { @@ -865,6 +896,7 @@ describe("resolveAllTargets", () => { orgName: "My Org", projectSlug: "my-project", projectName: "My Project", + cachedAt: Date.now(), }); const result = await resolveAllTargets({ cwd: "/test" }); @@ -899,8 +931,8 @@ describe("resolveAllTargets", () => { const result = await resolveAllTargets({ cwd: "/home/user/my-app" }); expect(result.targets).toHaveLength(1); - expect(result.targets[0].org).toBe("inferred-org"); - expect(result.targets[0].project).toBe("my-app"); + expect(at(result.targets, 0).org).toBe("inferred-org"); + expect(at(result.targets, 0).project).toBe("my-app"); }); test("returns empty targets when a public-key DSN cannot be resolved", async () => { @@ -930,7 +962,7 @@ describe("resolveAllTargets", () => { hasMultiple: false, fingerprint: "", }); - mockGetCachedProjectByDsnKey.mockReturnValue(null); + mockGetCachedProjectByDsnKey.mockReturnValue(undefined); // findProjectByDsn returns null (project not found) mockFindProjectByDsn.mockResolvedValue(null); mockFindProjectRoot.mockResolvedValue({ @@ -970,13 +1002,13 @@ describe("resolveAllTargets", () => { hasMultiple: false, fingerprint: "", }); - mockGetCachedProject.mockReturnValue(null); + mockGetCachedProject.mockReturnValue(undefined); const result = await resolveAllTargets({ cwd: "/test" }); expect(result.targets).toHaveLength(1); - expect(result.targets[0].org).toBe("123"); - expect(result.targets[0].project).toBe("456"); + expect(at(result.targets, 0).org).toBe("123"); + expect(at(result.targets, 0).project).toBe("456"); // The DSN already identifies the target — no discovery API call. expect(mockGetProject).not.toHaveBeenCalled(); }); @@ -992,14 +1024,14 @@ describe("env var resolution: SENTRY_ORG + SENTRY_PROJECT", () => { }); afterEach(() => { - delete process.env.SENTRY_ORG; - delete process.env.SENTRY_PROJECT; + delete process.env["SENTRY_ORG"]; + delete process.env["SENTRY_PROJECT"]; }); // --- resolveOrg --- test("resolveOrg: returns org from SENTRY_ORG when no CLI flag", async () => { - process.env.SENTRY_ORG = "env-org"; + process.env["SENTRY_ORG"] = "env-org"; const result = await resolveOrg({ cwd: "/test" }); @@ -1010,7 +1042,7 @@ describe("env var resolution: SENTRY_ORG + SENTRY_PROJECT", () => { }); test("resolveOrg: CLI flag takes priority over env var", async () => { - process.env.SENTRY_ORG = "env-org"; + process.env["SENTRY_ORG"] = "env-org"; const result = await resolveOrg({ org: "flag-org", cwd: "/test" }); @@ -1018,7 +1050,7 @@ describe("env var resolution: SENTRY_ORG + SENTRY_PROJECT", () => { }); test("resolveOrg: SENTRY_PROJECT=org/project combo provides org", async () => { - process.env.SENTRY_PROJECT = "combo-org/combo-project"; + process.env["SENTRY_PROJECT"] = "combo-org/combo-project"; const result = await resolveOrg({ cwd: "/test" }); @@ -1026,8 +1058,8 @@ describe("env var resolution: SENTRY_ORG + SENTRY_PROJECT", () => { }); test("resolveOrg: combo SENTRY_PROJECT overrides SENTRY_ORG", async () => { - process.env.SENTRY_ORG = "env-org"; - process.env.SENTRY_PROJECT = "combo-org/combo-project"; + process.env["SENTRY_ORG"] = "env-org"; + process.env["SENTRY_PROJECT"] = "combo-org/combo-project"; const result = await resolveOrg({ cwd: "/test" }); @@ -1038,8 +1070,8 @@ describe("env var resolution: SENTRY_ORG + SENTRY_PROJECT", () => { // --- resolveOrgAndProject --- test("resolveOrgAndProject: uses SENTRY_ORG + SENTRY_PROJECT", async () => { - process.env.SENTRY_ORG = "env-org"; - process.env.SENTRY_PROJECT = "env-project"; + process.env["SENTRY_ORG"] = "env-org"; + process.env["SENTRY_PROJECT"] = "env-project"; const result = await resolveOrgAndProject({ cwd: "/test" }); @@ -1053,7 +1085,7 @@ describe("env var resolution: SENTRY_ORG + SENTRY_PROJECT", () => { }); test("resolveOrgAndProject: SENTRY_PROJECT=org/project combo works", async () => { - process.env.SENTRY_PROJECT = "my-org/my-project"; + process.env["SENTRY_PROJECT"] = "my-org/my-project"; const result = await resolveOrgAndProject({ cwd: "/test" }); @@ -1064,8 +1096,8 @@ describe("env var resolution: SENTRY_ORG + SENTRY_PROJECT", () => { }); test("resolveOrgAndProject: CLI flags take priority over env vars", async () => { - process.env.SENTRY_ORG = "env-org"; - process.env.SENTRY_PROJECT = "env-project"; + process.env["SENTRY_ORG"] = "env-org"; + process.env["SENTRY_PROJECT"] = "env-project"; const result = await resolveOrgAndProject({ org: "flag-org", @@ -1078,7 +1110,7 @@ describe("env var resolution: SENTRY_ORG + SENTRY_PROJECT", () => { }); test("resolveOrgAndProject: SENTRY_ORG alone (no project) falls through", async () => { - process.env.SENTRY_ORG = "env-org"; + process.env["SENTRY_ORG"] = "env-org"; // No SENTRY_PROJECT — resolveFromEnvVars returns org-only, but // resolveOrgAndProject requires project, so it falls through @@ -1089,8 +1121,8 @@ describe("env var resolution: SENTRY_ORG + SENTRY_PROJECT", () => { }); test("resolveOrgAndProject: env vars beat config defaults", async () => { - process.env.SENTRY_ORG = "env-org"; - process.env.SENTRY_PROJECT = "env-project"; + process.env["SENTRY_ORG"] = "env-org"; + process.env["SENTRY_PROJECT"] = "env-project"; mockGetDefaultOrganization.mockReturnValue("default-org"); mockGetDefaultProject.mockReturnValue("default-project"); @@ -1105,8 +1137,8 @@ describe("env var resolution: SENTRY_ORG + SENTRY_PROJECT", () => { // --- resolveAllTargets --- test("resolveAllTargets: uses SENTRY_ORG + SENTRY_PROJECT", async () => { - process.env.SENTRY_ORG = "env-org"; - process.env.SENTRY_PROJECT = "env-project"; + process.env["SENTRY_ORG"] = "env-org"; + process.env["SENTRY_PROJECT"] = "env-project"; const result = await resolveAllTargets({ cwd: "/test" }); @@ -1117,7 +1149,7 @@ describe("env var resolution: SENTRY_ORG + SENTRY_PROJECT", () => { }); test("resolveAllTargets: SENTRY_PROJECT=org/project combo", async () => { - process.env.SENTRY_PROJECT = "combo-org/combo-proj"; + process.env["SENTRY_PROJECT"] = "combo-org/combo-proj"; const result = await resolveAllTargets({ cwd: "/test" }); @@ -1127,8 +1159,8 @@ describe("env var resolution: SENTRY_ORG + SENTRY_PROJECT", () => { }); test("resolveAllTargets: env vars beat config defaults", async () => { - process.env.SENTRY_ORG = "env-org"; - process.env.SENTRY_PROJECT = "env-project"; + process.env["SENTRY_ORG"] = "env-org"; + process.env["SENTRY_PROJECT"] = "env-project"; mockGetDefaultOrganization.mockReturnValue("default-org"); mockGetDefaultProject.mockReturnValue("default-project"); @@ -1141,7 +1173,7 @@ describe("env var resolution: SENTRY_ORG + SENTRY_PROJECT", () => { // --- resolveOrgsForListing --- test("resolveOrgsForListing: returns org from SENTRY_ORG when no flag or defaults", async () => { - process.env.SENTRY_ORG = "env-org"; + process.env["SENTRY_ORG"] = "env-org"; const result = await resolveOrgsForListing(undefined, "/test"); @@ -1151,8 +1183,8 @@ describe("env var resolution: SENTRY_ORG + SENTRY_PROJECT", () => { // --- Edge cases --- test("whitespace-only env vars are ignored", async () => { - process.env.SENTRY_ORG = " "; - process.env.SENTRY_PROJECT = " "; + process.env["SENTRY_ORG"] = " "; + process.env["SENTRY_PROJECT"] = " "; const result = await resolveOrgAndProject({ cwd: "/test" }); @@ -1161,7 +1193,7 @@ describe("env var resolution: SENTRY_ORG + SENTRY_PROJECT", () => { }); test("SENTRY_PROJECT with trailing slash is treated as invalid combo", async () => { - process.env.SENTRY_PROJECT = "my-org/"; + process.env["SENTRY_PROJECT"] = "my-org/"; const result = await resolveOrgAndProject({ cwd: "/test" }); @@ -1170,7 +1202,7 @@ describe("env var resolution: SENTRY_ORG + SENTRY_PROJECT", () => { }); test("SENTRY_PROJECT with leading slash is treated as invalid combo", async () => { - process.env.SENTRY_PROJECT = "/my-project"; + process.env["SENTRY_PROJECT"] = "/my-project"; const result = await resolveOrgAndProject({ cwd: "/test" }); @@ -1182,8 +1214,11 @@ describe("env var resolution: SENTRY_ORG + SENTRY_PROJECT", () => { // Regression: SENTRY_PROJECT="org/" + SENTRY_ORG="my-org" must NOT // produce project="org/" — the malformed combo should be discarded // and only the org from SENTRY_ORG should be returned. - process.env.SENTRY_ORG = "my-org"; - process.env.SENTRY_PROJECT = "other-org/"; + // Regression: SENTRY_PROJECT="org/" + SENTRY_ORG="my-org" must NOT + // produce project="org/" — the malformed combo should be discarded + // and only the org from SENTRY_ORG should be returned. + process.env["SENTRY_ORG"] = "my-org"; + process.env["SENTRY_PROJECT"] = "other-org/"; const result = await resolveOrgAndProject({ cwd: "/test" }); @@ -1194,8 +1229,8 @@ describe("env var resolution: SENTRY_ORG + SENTRY_PROJECT", () => { }); test("malformed SENTRY_PROJECT with slash still provides org via SENTRY_ORG", async () => { - process.env.SENTRY_ORG = "my-org"; - process.env.SENTRY_PROJECT = "other-org/"; + process.env["SENTRY_ORG"] = "my-org"; + process.env["SENTRY_PROJECT"] = "other-org/"; const result = await resolveOrg({ cwd: "/test" }); diff --git a/packages/cli/test/lib/resolve-target.test.ts b/packages/cli/test/lib/resolve-target.test.ts index 6956bf0417..eb5338eef4 100644 --- a/packages/cli/test/lib/resolve-target.test.ts +++ b/packages/cli/test/lib/resolve-target.test.ts @@ -44,7 +44,12 @@ import { resetCacheState, } from "../../src/lib/response-cache.js"; import { resetAuthenticatedFetch } from "../../src/lib/sentry-client.js"; -import { mintSntrysToken, mockFetch, useTestConfigDir } from "../helpers.js"; +import { + mintSntrysToken, + mockFetch, + must, + useTestConfigDir, +} from "../helpers.js"; // ============================================================================ // Arbitraries for Property-Based Testing @@ -212,32 +217,32 @@ describe("Environment variable resolution (SENTRY_ORG / SENTRY_PROJECT)", () => async () => new Response(JSON.stringify({ detail: "Not found" }), { status: 404 }), ); - delete process.env.SENTRY_ORG; - delete process.env.SENTRY_PROJECT; + delete process.env["SENTRY_ORG"]; + delete process.env["SENTRY_PROJECT"]; }); afterEach(() => { globalThis.fetch = originalFetch; - delete process.env.SENTRY_ORG; - delete process.env.SENTRY_PROJECT; + delete process.env["SENTRY_ORG"]; + delete process.env["SENTRY_PROJECT"]; }); // --- resolveOrg --- test("resolveOrg: returns org from SENTRY_ORG", async () => { - process.env.SENTRY_ORG = "test-org"; + process.env["SENTRY_ORG"] = "test-org"; const result = await resolveOrg({ cwd: "/tmp" }); expect(result?.org).toBe("test-org"); }); test("resolveOrg: SENTRY_PROJECT=org/project combo extracts org", async () => { - process.env.SENTRY_PROJECT = "combo-org/combo-project"; + process.env["SENTRY_PROJECT"] = "combo-org/combo-project"; const result = await resolveOrg({ cwd: "/tmp" }); expect(result?.org).toBe("combo-org"); }); test("resolveOrg: CLI flag takes priority over env var", async () => { - process.env.SENTRY_ORG = "env-org"; + process.env["SENTRY_ORG"] = "env-org"; const result = await resolveOrg({ org: "flag-org", cwd: "/tmp" }); expect(result?.org).toBe("flag-org"); }); @@ -245,8 +250,8 @@ describe("Environment variable resolution (SENTRY_ORG / SENTRY_PROJECT)", () => // --- resolveOrgAndProject --- test("resolveOrgAndProject: returns from SENTRY_ORG + SENTRY_PROJECT", async () => { - process.env.SENTRY_ORG = "test-org"; - process.env.SENTRY_PROJECT = "test-project"; + process.env["SENTRY_ORG"] = "test-org"; + process.env["SENTRY_PROJECT"] = "test-project"; const result = await resolveOrgAndProject({ cwd: "/tmp" }); expect(result?.org).toBe("test-org"); expect(result?.project).toBe("test-project"); @@ -254,7 +259,7 @@ describe("Environment variable resolution (SENTRY_ORG / SENTRY_PROJECT)", () => }); test("resolveOrgAndProject: SENTRY_PROJECT combo notation", async () => { - process.env.SENTRY_PROJECT = "my-org/my-project"; + process.env["SENTRY_PROJECT"] = "my-org/my-project"; const result = await resolveOrgAndProject({ cwd: "/tmp" }); expect(result?.org).toBe("my-org"); expect(result?.project).toBe("my-project"); @@ -262,16 +267,16 @@ describe("Environment variable resolution (SENTRY_ORG / SENTRY_PROJECT)", () => }); test("resolveOrgAndProject: env vars override config defaults", async () => { - process.env.SENTRY_ORG = "env-org"; - process.env.SENTRY_PROJECT = "env-project"; + process.env["SENTRY_ORG"] = "env-org"; + process.env["SENTRY_PROJECT"] = "env-project"; const result = await resolveOrgAndProject({ cwd: "/tmp" }); expect(result?.org).toBe("env-org"); expect(result?.project).toBe("env-project"); }); test("resolveOrgAndProject: CLI flags override env vars", async () => { - process.env.SENTRY_ORG = "env-org"; - process.env.SENTRY_PROJECT = "env-project"; + process.env["SENTRY_ORG"] = "env-org"; + process.env["SENTRY_PROJECT"] = "env-project"; const result = await resolveOrgAndProject({ org: "flag-org", project: "flag-project", @@ -284,8 +289,8 @@ describe("Environment variable resolution (SENTRY_ORG / SENTRY_PROJECT)", () => }); test("resolveOrgAndProject: ignores empty/whitespace-only values", async () => { - process.env.SENTRY_ORG = " "; - process.env.SENTRY_PROJECT = ""; + process.env["SENTRY_ORG"] = " "; + process.env["SENTRY_PROJECT"] = ""; // Both empty after trim — should not use env vars // This will fall through and return null since /tmp has no DSN const result = await resolveOrgAndProject({ cwd: "/tmp" }); @@ -296,7 +301,7 @@ describe("Environment variable resolution (SENTRY_ORG / SENTRY_PROJECT)", () => }); test("resolveOrgAndProject: SENTRY_ORG alone not enough for org+project", async () => { - process.env.SENTRY_ORG = "my-org"; + process.env["SENTRY_ORG"] = "my-org"; // No SENTRY_PROJECT — resolveFromEnvVars returns org-only // resolveOrgAndProject needs project, so env vars don't satisfy it const result = await resolveOrgAndProject({ cwd: "/tmp" }); @@ -307,8 +312,8 @@ describe("Environment variable resolution (SENTRY_ORG / SENTRY_PROJECT)", () => }); test("resolveOrgAndProject: trailing slash in combo is ignored (no project)", async () => { - process.env.SENTRY_PROJECT = "my-org/"; - process.env.SENTRY_ORG = "other-org"; + process.env["SENTRY_PROJECT"] = "my-org/"; + process.env["SENTRY_ORG"] = "other-org"; // Malformed combo — slash present but empty project // Should fall through; SENTRY_ORG provides org-only const result = await resolveOrgAndProject({ cwd: "/tmp" }); @@ -321,8 +326,8 @@ describe("Environment variable resolution (SENTRY_ORG / SENTRY_PROJECT)", () => // --- resolveAllTargets --- test("resolveAllTargets: returns target from SENTRY_ORG + SENTRY_PROJECT", async () => { - process.env.SENTRY_ORG = "test-org"; - process.env.SENTRY_PROJECT = "test-project"; + process.env["SENTRY_ORG"] = "test-org"; + process.env["SENTRY_PROJECT"] = "test-project"; const result = await resolveAllTargets({ cwd: "/tmp" }); expect(result.targets).toHaveLength(1); expect(result.targets[0]?.org).toBe("test-org"); @@ -330,15 +335,15 @@ describe("Environment variable resolution (SENTRY_ORG / SENTRY_PROJECT)", () => }); test("resolveAllTargets: env vars override config defaults", async () => { - process.env.SENTRY_ORG = "env-org"; - process.env.SENTRY_PROJECT = "env-project"; + process.env["SENTRY_ORG"] = "env-org"; + process.env["SENTRY_PROJECT"] = "env-project"; const result = await resolveAllTargets({ cwd: "/tmp" }); expect(result.targets[0]?.org).toBe("env-org"); }); test("resolveAllTargets: CLI flags override env vars", async () => { - process.env.SENTRY_ORG = "env-org"; - process.env.SENTRY_PROJECT = "env-project"; + process.env["SENTRY_ORG"] = "env-org"; + process.env["SENTRY_PROJECT"] = "env-project"; const result = await resolveAllTargets({ org: "flag-org", project: "flag-project", @@ -353,7 +358,7 @@ describe("Environment variable resolution (SENTRY_ORG / SENTRY_PROJECT)", () => // --- resolveOrgsForListing --- test("resolveOrgsForListing: returns org from env vars when no flag/defaults", async () => { - process.env.SENTRY_ORG = "env-org"; + process.env["SENTRY_ORG"] = "env-org"; const result = await resolveOrgsForListing(undefined, "/tmp"); expect(result.orgs).toContain("env-org"); }); @@ -377,7 +382,7 @@ describe("Environment variable resolution (SENTRY_ORG / SENTRY_PROJECT)", () => test("resolveOrgAndProject: org auth token org + SENTRY_PROJECT", async () => { useOrgAuthToken("token-org"); - process.env.SENTRY_PROJECT = "web"; + process.env["SENTRY_PROJECT"] = "web"; const result = await resolveOrgAndProject({ cwd: "/tmp" }); expect(result?.org).toBe("token-org"); expect(result?.project).toBe("web"); @@ -386,7 +391,7 @@ describe("Environment variable resolution (SENTRY_ORG / SENTRY_PROJECT)", () => test("resolveAllTargets: org auth token org + SENTRY_PROJECT", async () => { useOrgAuthToken("token-org"); - process.env.SENTRY_PROJECT = "web"; + process.env["SENTRY_PROJECT"] = "web"; const result = await resolveAllTargets({ cwd: "/tmp" }); expect(result.targets).toHaveLength(1); expect(result.targets[0]?.org).toBe("token-org"); @@ -395,7 +400,7 @@ describe("Environment variable resolution (SENTRY_ORG / SENTRY_PROJECT)", () => test("resolveOrg: SENTRY_ORG wins over the org auth token org", async () => { useOrgAuthToken("token-org"); - process.env.SENTRY_ORG = "env-org"; + process.env["SENTRY_ORG"] = "env-org"; const result = await resolveOrg({ cwd: "/tmp" }); expect(result?.org).toBe("env-org"); }); @@ -544,8 +549,8 @@ describe("fetchProjectId", () => { test("rethrows AuthError when not authenticated", async () => { // No auth token set — refreshToken() will throw AuthError - const saved = process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_AUTH_TOKEN; + const saved = process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_AUTH_TOKEN"]; setOrgRegion("test-org", DEFAULT_SENTRY_URL); try { @@ -554,7 +559,7 @@ describe("fetchProjectId", () => { ); } finally { if (saved !== undefined) { - process.env.SENTRY_AUTH_TOKEN = saved; + process.env["SENTRY_AUTH_TOKEN"] = saved; } } }); @@ -728,7 +733,7 @@ describe("resolveTargetSlugs", () => { }); test("reuses the metadata lookup performed by explicit target resolution", async () => { - const projectId = await fetchProjectId("test-org", "42"); + const projectId = must(await fetchProjectId("test-org", "42")); expect( await resolveTargetSlugs({ ...makeTarget("test-org", "42"), projectId }), ).toEqual({ ...canonical, projectId: 42 }); @@ -841,8 +846,8 @@ describe("resolveLogProjectId", () => { }); test("re-throws AuthError instead of swallowing it", async () => { - const saved = process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_AUTH_TOKEN; + const saved = process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_AUTH_TOKEN"]; setOrgRegion("test-org", DEFAULT_SENTRY_URL); try { @@ -851,7 +856,7 @@ describe("resolveLogProjectId", () => { ).rejects.toThrow(AuthError); } finally { if (saved !== undefined) { - process.env.SENTRY_AUTH_TOKEN = saved; + process.env["SENTRY_AUTH_TOKEN"] = saved; } } }); @@ -904,9 +909,8 @@ describe("tryFuzzyProjectRecovery", () => { const req = new Request(input, init); const url = req.url; // Match /organizations//projects/ - const orgMatch = url.match(/\/organizations\/([^/]+)\/projects/); - if (orgMatch) { - const org = orgMatch[1]; + const [, org] = url.match(/\/organizations\/([^/]+)\/projects/) ?? []; + if (org) { const slugs = projectsByOrg[org]; if (slugs) { const projects = slugs.map((slug, i) => ({ @@ -1089,14 +1093,14 @@ describe("resolveOrgOptionalTarget", () => { async () => new Response(JSON.stringify({ detail: "Not found" }), { status: 404 }), ); - delete process.env.SENTRY_ORG; - delete process.env.SENTRY_PROJECT; + delete process.env["SENTRY_ORG"]; + delete process.env["SENTRY_PROJECT"]; }); afterEach(() => { globalThis.fetch = originalFetch; - delete process.env.SENTRY_ORG; - delete process.env.SENTRY_PROJECT; + delete process.env["SENTRY_ORG"]; + delete process.env["SENTRY_PROJECT"]; }); test("org-all mode returns org without project", async () => { @@ -1126,7 +1130,7 @@ describe("resolveOrgOptionalTarget", () => { }); test("auto-detect mode returns org only when SENTRY_ORG is set", async () => { - process.env.SENTRY_ORG = "env-org"; + process.env["SENTRY_ORG"] = "env-org"; const parsed = parseOrgProjectArg(undefined); expect(parsed.type).toBe("auto-detect"); diff --git a/packages/cli/test/lib/response-cache.test.ts b/packages/cli/test/lib/response-cache.test.ts index 71cf686df7..00d38b199e 100644 --- a/packages/cli/test/lib/response-cache.test.ts +++ b/packages/cli/test/lib/response-cache.test.ts @@ -19,7 +19,7 @@ import { resetCacheState, storeCachedResponse, } from "../../src/lib/response-cache.js"; -import { useTestConfigDir } from "../helpers.js"; +import { must, useTestConfigDir } from "../helpers.js"; const getConfigDir = useTestConfigDir("response-cache-"); @@ -27,16 +27,16 @@ const getConfigDir = useTestConfigDir("response-cache-"); let savedNoCache: string | undefined; beforeEach(() => { - savedNoCache = process.env.SENTRY_NO_CACHE; - delete process.env.SENTRY_NO_CACHE; + savedNoCache = process.env["SENTRY_NO_CACHE"]; + delete process.env["SENTRY_NO_CACHE"]; resetCacheState(); }); afterEach(() => { if (savedNoCache !== undefined) { - process.env.SENTRY_NO_CACHE = savedNoCache; + process.env["SENTRY_NO_CACHE"] = savedNoCache; } else { - delete process.env.SENTRY_NO_CACHE; + delete process.env["SENTRY_NO_CACHE"]; } resetCacheState(); }); @@ -243,14 +243,14 @@ describe("cache bypass", () => { mockResponse(TEST_BODY), ); - process.env.SENTRY_NO_CACHE = "1"; + process.env["SENTRY_NO_CACHE"] = "1"; const cached = await getCachedResponse(TEST_METHOD, TEST_URL, {}); expect(cached).toBeUndefined(); }); test("SENTRY_NO_CACHE=1 bypasses cache writes", async () => { - process.env.SENTRY_NO_CACHE = "1"; + process.env["SENTRY_NO_CACHE"] = "1"; await storeCachedResponse( TEST_METHOD, @@ -260,7 +260,7 @@ describe("cache bypass", () => { ); // Remove the bypass to verify nothing was written - delete process.env.SENTRY_NO_CACHE; + delete process.env["SENTRY_NO_CACHE"]; const cached = await getCachedResponse(TEST_METHOD, TEST_URL, {}); expect(cached).toBeUndefined(); @@ -680,7 +680,7 @@ describe("entry format", () => { ); const [file] = await readdir(cacheDir()); - const raw = await readFile(join(cacheDir(), file), "utf-8"); + const raw = await readFile(join(cacheDir(), must(file)), "utf-8"); const stored = JSON.parse(raw) as { body: { encoding: string } }; expect(["zstd", "br"]).toContain(stored.body.encoding); expect(raw.length).toBeLessThan(text.length); diff --git a/packages/cli/test/lib/route-registry.test.ts b/packages/cli/test/lib/route-registry.test.ts index 41d4a1ad74..eaf4a30df7 100644 --- a/packages/cli/test/lib/route-registry.test.ts +++ b/packages/cli/test/lib/route-registry.test.ts @@ -30,7 +30,7 @@ function command(brief: string) { docs: { brief }, auth: false, async *func() { - yield; + // no-op }, }); } @@ -115,7 +115,7 @@ describe("route registry", () => { return; } // Only our own modules matter; `with { type }` imports are assets. - if (!RELATIVE_IMPORT.test(args.path) || args.with.type) { + if (!RELATIVE_IMPORT.test(args.path) || args.with["type"]) { return { path: args.path, external: true }; } const target = resolve(args.resolveDir, args.path).replace( diff --git a/packages/cli/test/lib/scan/concurrent.test.ts b/packages/cli/test/lib/scan/concurrent.test.ts index 7e95b40776..3899a616d5 100644 --- a/packages/cli/test/lib/scan/concurrent.test.ts +++ b/packages/cli/test/lib/scan/concurrent.test.ts @@ -108,9 +108,8 @@ describe("mapFilesConcurrentStream — streaming variant", () => { test("null or empty array skips emission", async () => { const collected: number[] = []; - for await (const item of mapFilesConcurrentStream( - emitRange(5), - async (i) => (i % 2 === 0 ? [i] : null), + for await (const item of mapFilesConcurrentStream(emitRange(5), async (i) => + i % 2 === 0 ? [i] : null, )) { collected.push(item); } diff --git a/packages/cli/test/lib/scan/grep.property.test.ts b/packages/cli/test/lib/scan/grep.property.test.ts index b82371871d..8fd81c814d 100644 --- a/packages/cli/test/lib/scan/grep.property.test.ts +++ b/packages/cli/test/lib/scan/grep.property.test.ts @@ -20,6 +20,7 @@ import { import { afterAll, describe, expect, test } from "vitest"; import { collectGrep } from "../../../src/lib/scan/grep.js"; import { DEFAULT_NUM_RUNS } from "../../model-based/helpers.js"; +import { at } from "../../helpers.js"; const ROOT = mkdtempSync(join(tmpdir(), "scan-grep-prop-")); @@ -81,7 +82,7 @@ function naiveGrep( for (const [path, content] of layout) { const lines = content.split("\n"); for (let i = 0; i < lines.length; i += 1) { - const line = lines[i]; + const line = at(lines, i); if (regex.test(line)) { out.push({ path, lineNum: i + 1, line }); } diff --git a/packages/cli/test/lib/scan/grep.test.ts b/packages/cli/test/lib/scan/grep.test.ts index d6de5f373d..5913be0f37 100644 --- a/packages/cli/test/lib/scan/grep.test.ts +++ b/packages/cli/test/lib/scan/grep.test.ts @@ -15,6 +15,7 @@ import { join } from "node:path"; import { afterAll, describe, expect, test } from "vitest"; import { ValidationError } from "../../../src/lib/errors.js"; import { collectGrep, grepFiles } from "../../../src/lib/scan/grep.js"; +import { at } from "../../helpers.js"; const ROOT = mkdtempSync(join(tmpdir(), "scan-grep-test-")); @@ -676,7 +677,7 @@ describe("collectGrep — literal prefilter fast path", () => { pattern: "Sentry\\.init", }); expect(matches).toHaveLength(1); - expect(matches[0].lineNum).toBe(2); + expect(at(matches, 0).lineNum).toBe(2); } finally { cleanup(); } diff --git a/packages/cli/test/lib/scanner-flags.integration.test.ts b/packages/cli/test/lib/scanner-flags.integration.test.ts index b199f61a32..ac9e6591ea 100644 --- a/packages/cli/test/lib/scanner-flags.integration.test.ts +++ b/packages/cli/test/lib/scanner-flags.integration.test.ts @@ -39,7 +39,7 @@ const emptyCwd = mkdtempSync(join(tmpdir(), "scanner-flags-cwd-")); /** Run the real app with a mock context, capturing stdout and stderr. */ async function runApp( args: string[], -): Promise<{ stdout: string; stderr: string; exitCode: number }> { +): Promise<{ stdout: string; stderr: string; exitCode: number | string }> { let stdout = ""; let stderr = ""; const captureStderr = { diff --git a/packages/cli/test/lib/sdk-invoke-isolation.focused.test.ts b/packages/cli/test/lib/sdk-invoke-isolation.focused.test.ts index ee033f8aaf..a13d7a224d 100644 --- a/packages/cli/test/lib/sdk-invoke-isolation.focused.test.ts +++ b/packages/cli/test/lib/sdk-invoke-isolation.focused.test.ts @@ -61,7 +61,12 @@ import { useTestConfigDir } from "../helpers.js"; useTestConfigDir("sdk-invoke-isolation-focused-"); -type InvocationResult = { header?: string; host?: string; token?: string }; +/** What the probe saw; each value is undefined when it was not set. */ +type InvocationResult = { + header: string | undefined; + host: string | undefined; + token: string | undefined; +}; describe("overlapping SDK invocation isolation", () => { beforeEach(() => { @@ -79,15 +84,15 @@ describe("overlapping SDK invocation isolation", () => { release.set(id, Promise.withResolvers()); } invocationState.handler = async (context, flags) => { - const id = String(flags.id); + const id = String(flags["id"]); started.get(id)?.resolve(); await release.get(id)?.promise; context.stdout.captureObject?.({ header: getCustomHeaders().find( ([name]) => name === "X-Invocation", )?.[1], - host: getEnv().SENTRY_HOST, - token: getEnv().SENTRY_AUTH_TOKEN, + host: getEnv()["SENTRY_HOST"], + token: getEnv()["SENTRY_AUTH_TOKEN"], } satisfies InvocationResult); }; @@ -122,7 +127,7 @@ describe("overlapping SDK invocation isolation", () => { const firstSet = Promise.withResolvers(); const secondRead = Promise.withResolvers(); invocationState.handler = async (context, flags) => { - if (flags.id === "first") { + if (flags["id"] === "first") { registerLoginTrustAnchor(anchor); disableResponseCache(); setLastCacheHitAgeForTesting(1000); diff --git a/packages/cli/test/lib/sdk-invoke.test.ts b/packages/cli/test/lib/sdk-invoke.test.ts index d8fcfc52f8..ba14f8c7f0 100644 --- a/packages/cli/test/lib/sdk-invoke.test.ts +++ b/packages/cli/test/lib/sdk-invoke.test.ts @@ -30,7 +30,7 @@ describe("applyFlagDefaults: parsed flags with defaults", () => { }, }; const result = applyFlagDefaults({}, flagDefs); - expect(result.period).toEqual({ type: "relative", period: "7d" }); + expect(result["period"]).toEqual({ type: "relative", period: "7d" }); }); test("calls parse on string default when flag value is undefined", () => { @@ -42,7 +42,7 @@ describe("applyFlagDefaults: parsed flags with defaults", () => { }, }; const result = applyFlagDefaults({ period: undefined }, flagDefs); - expect(result.period).toEqual({ type: "relative", period: "90d" }); + expect(result["period"]).toEqual({ type: "relative", period: "90d" }); }); test("preserves caller-provided value over default", () => { @@ -55,7 +55,7 @@ describe("applyFlagDefaults: parsed flags with defaults", () => { }; const callerValue = { type: "relative", period: "24h" }; const result = applyFlagDefaults({ period: callerValue }, flagDefs); - expect(result.period).toBe(callerValue); + expect(result["period"]).toBe(callerValue); }); test("handles parse function that returns a number", () => { @@ -67,7 +67,7 @@ describe("applyFlagDefaults: parsed flags with defaults", () => { }, }; const result = applyFlagDefaults({}, flagDefs); - expect(result.limit).toBe(25); + expect(result["limit"]).toBe(25); }); test("re-throws if parse function rejects its own default", () => { @@ -95,8 +95,8 @@ describe("applyFlagDefaults: boolean flags", () => { fresh: { kind: "boolean", default: false }, }; const result = applyFlagDefaults({}, flagDefs); - expect(result.json).toBe(false); - expect(result.fresh).toBe(false); + expect(result["json"]).toBe(false); + expect(result["fresh"]).toBe(false); }); test("preserves caller-provided boolean over default", () => { @@ -104,7 +104,7 @@ describe("applyFlagDefaults: boolean flags", () => { fresh: { kind: "boolean", default: false }, }; const result = applyFlagDefaults({ fresh: true }, flagDefs); - expect(result.fresh).toBe(true); + expect(result["fresh"]).toBe(true); }); }); @@ -130,15 +130,15 @@ describe("applyFlagDefaults: variadic flags", () => { { field: "title", environment: "prod", dataset: "spans" }, flagDefs, ); - expect(result.field).toEqual(["title"]); - expect(result.environment).toEqual(["prod"]); - expect(result.dataset).toBe("spans"); + expect(result["field"]).toEqual(["title"]); + expect(result["environment"]).toEqual(["prod"]); + expect(result["dataset"]).toBe("spans"); }); test("keeps caller arrays unchanged", () => { const fields = ["title", "count()"]; const result = applyFlagDefaults({ field: fields }, flagDefs); - expect(result.field).toBe(fields); + expect(result["field"]).toBe(fields); }); }); @@ -152,7 +152,7 @@ describe("applyFlagDefaults: enum flags", () => { sort: { kind: "enum", default: "date" }, }; const result = applyFlagDefaults({}, flagDefs); - expect(result.sort).toBe("date"); + expect(result["sort"]).toBe("date"); }); }); @@ -182,10 +182,10 @@ describe("applyFlagDefaults: undefined stripping", () => { flagDefs, ); expect("a" in result).toBe(false); - expect(result.b).toBeNull(); - expect(result.c).toBe(0); - expect(result.d).toBe(""); - expect(result.e).toBe(false); + expect(result["b"]).toBeNull(); + expect(result["c"]).toBe(0); + expect(result["d"]).toBe(""); + expect(result["e"]).toBe(false); }); }); @@ -212,13 +212,13 @@ describe("applyFlagDefaults: combined scenario", () => { }; const result = applyFlagDefaults({ limit: 50, query: undefined }, flagDefs); // period: default applied via parse - expect(result.period).toEqual({ type: "relative", period: "7d" }); + expect(result["period"]).toEqual({ type: "relative", period: "7d" }); // limit: caller value preserved - expect(result.limit).toBe(50); + expect(result["limit"]).toBe(50); // sort: default applied (raw) - expect(result.sort).toBe("date"); + expect(result["sort"]).toBe("date"); // fresh: default applied (raw) - expect(result.fresh).toBe(false); + expect(result["fresh"]).toBe(false); // query: undefined stripped, no default → absent expect("query" in result).toBe(false); }); @@ -228,6 +228,14 @@ describe("applyFlagDefaults: combined scenario", () => { // parseOutput — binary vs textual capture // --------------------------------------------------------------------------- +/** Narrow parsed output to bytes, failing clearly when it is not binary. */ +function asBytes(value: unknown): Uint8Array { + if (!(value instanceof Uint8Array)) { + throw new Error(`Expected Uint8Array output, got ${typeof value}`); + } + return value; +} + describe("parseOutput: binary output", () => { test("returns raw bytes when a chunk is a Uint8Array (no comma-decimal coercion)", () => { // PNG signature — a byte-for-byte round-trip is required so SDK/run() @@ -235,23 +243,20 @@ describe("parseOutput: binary output", () => { const png = new Uint8Array([ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, ]); - const result = parseOutput(undefined, [png]); + const result = parseOutput(undefined, [png]); expect(result).toBeInstanceOf(Uint8Array); - expect([...result]).toEqual([ + expect([...asBytes(result)]).toEqual([ 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, ]); }); test("concatenates mixed string and binary chunks as bytes", () => { - const result = parseOutput(undefined, [ - "AB", - new Uint8Array([0x00, 0xff]), - ]); - expect([...result]).toEqual([0x41, 0x42, 0x00, 0xff]); + const result = parseOutput(undefined, ["AB", new Uint8Array([0x00, 0xff])]); + expect([...asBytes(result)]).toEqual([0x41, 0x42, 0x00, 0xff]); }); test("still JSON-parses textual chunks", () => { - const result = parseOutput<{ ok: boolean }>(undefined, ['{"ok":true}']); + const result = parseOutput(undefined, ['{"ok":true}']); expect(result).toEqual({ ok: true }); }); diff --git a/packages/cli/test/lib/sdk-no-persistence.test.ts b/packages/cli/test/lib/sdk-no-persistence.test.ts index 799e981dfd..680a260892 100644 --- a/packages/cli/test/lib/sdk-no-persistence.test.ts +++ b/packages/cli/test/lib/sdk-no-persistence.test.ts @@ -22,7 +22,7 @@ import { } from "../../src/lib/db/auth.js"; import { closeDatabase, getDbPath } from "../../src/lib/db/index.js"; import { withEnv } from "../../src/lib/env.js"; -import { mockFetch } from "../helpers.js"; +import { mockFetch, must } from "../helpers.js"; const JSON_HEADERS = { "Content-Type": "application/json" }; @@ -102,6 +102,26 @@ function sentryApi(requests: RecordedRequest[]): typeof fetch { }); } +/** + * The generated SDK types a list result as one item, but a list called with + * `limit` resolves to a page. Check that shape at runtime. + */ +function asPage(result: T): { data: T[]; nextCursor?: string } { + if ( + typeof result !== "object" || + result === null || + !("data" in result) || + !Array.isArray(result.data) + ) { + throw new Error("Expected a paginated list result"); + } + const nextCursor = + "nextCursor" in result && typeof result.nextCursor === "string" + ? result.nextCursor + : undefined; + return { data: result.data, ...(nextCursor !== undefined && { nextCursor }) }; +} + describe("createSentrySDK() without persist", () => { let root: string; let configDir: string; @@ -168,15 +188,19 @@ describe("createSentrySDK() without persist", () => { test("pages a list with the returned cursor and rejects --cursor next", async () => { const client = sdk(); - const first = await client.team.list({ orgProject: "acme/", limit: 1 }); + const first = asPage( + await client.team.list({ orgProject: "acme/", limit: 1 }), + ); expect(first.data.map((team) => team.slug)).toEqual(["web"]); expect(first.nextCursor).toBeTruthy(); - const second = await client.team.list({ - orgProject: "acme/", - limit: 1, - cursor: first.nextCursor ?? undefined, - }); + const second = asPage( + await client.team.list({ + orgProject: "acme/", + limit: 1, + cursor: must(first.nextCursor, "a next cursor"), + }), + ); expect(second.data.map((team) => team.slug)).toEqual(["backend"]); await expect( @@ -186,15 +210,15 @@ describe("createSentrySDK() without persist", () => { }); test("env replaces process.env", async () => { - const saved = process.env.SENTRY_HOST; - process.env.SENTRY_HOST = "https://ignored.example.com"; + const saved = process.env["SENTRY_HOST"]; + process.env["SENTRY_HOST"] = "https://ignored.example.com"; try { await sdk().project.view({ orgProject: "acme/frontend" }); } finally { if (saved === undefined) { - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_HOST"]; } else { - process.env.SENTRY_HOST = saved; + process.env["SENTRY_HOST"] = saved; } } diff --git a/packages/cli/test/lib/sea-assets.test.ts b/packages/cli/test/lib/sea-assets.test.ts index 4e80831246..9228a6ec57 100644 --- a/packages/cli/test/lib/sea-assets.test.ts +++ b/packages/cli/test/lib/sea-assets.test.ts @@ -1,16 +1,13 @@ import { describe, expect, test, vi } from "vitest"; const seaModule = vi.hoisted(() => ({ - load: () => { + load: (_id: string): unknown => { throw new Error("node:sea unavailable"); }, })); vi.mock("node:module", () => ({ - createRequire: - () => - (...args: unknown[]) => - seaModule.load(...args), + createRequire: () => (id: string) => seaModule.load(id), })); const { getSeaRawAsset } = await import("../../src/lib/sea-assets.js"); diff --git a/packages/cli/test/lib/search-query.warn.test.ts b/packages/cli/test/lib/search-query.warn.test.ts index 7abb4089fc..d4936c34b5 100644 --- a/packages/cli/test/lib/search-query.warn.test.ts +++ b/packages/cli/test/lib/search-query.warn.test.ts @@ -6,6 +6,7 @@ */ import { beforeEach, describe, expect, test, vi } from "vitest"; +import { at } from "../helpers.js"; const { fakeLog } = vi.hoisted(() => { const log = { @@ -43,7 +44,7 @@ describe("sanitizeQuery: rewrite warnings", () => { ); const warns = runningQueries(); expect(warns).toHaveLength(1); - expect(warns[0].split("\n")).toEqual([ + expect(at(warns, 0).split("\n")).toEqual([ "`project` is the slug; numeric ids use project_id. Rewrote numeric project: filters. Rewrote OR using in-list syntax: key:[val1,val2].", 'Running query: "project_id:[123,456]"', ]); @@ -56,7 +57,7 @@ describe("sanitizeQuery: rewrite warnings", () => { ); const warns = runningQueries(); expect(warns).toHaveLength(1); - expect(warns[0].split("\n")).toEqual([ + expect(at(warns, 0).split("\n")).toEqual([ "`project` is the slug; numeric ids use project_id. Rewrote numeric project: filters. Sentry search implicitly ANDs terms — removed explicit AND operator.", 'Running query: "project_id:123 is:unresolved"', ]); @@ -68,7 +69,7 @@ describe("sanitizeQuery: rewrite warnings", () => { ); const warns = runningQueries(); expect(warns).toHaveLength(1); - expect(warns[0].split("\n")).toEqual([ + expect(at(warns, 0).split("\n")).toEqual([ "Rewrote OR using in-list syntax: key:[val1,val2].", 'Running query: "level:[error,warning]"', ]); @@ -93,7 +94,7 @@ describe("sanitizeQuery: rewrite warnings", () => { ); const warns = runningQueries(); expect(warns).toHaveLength(1); - expect(warns[0].split("\n")).toEqual([ + expect(at(warns, 0).split("\n")).toEqual([ "`project` is the slug; numeric ids use project_id. Rewrote numeric project: filters.", 'Running query: "project_id:123 ((( broken"', ]); diff --git a/packages/cli/test/lib/security/auto-login-host-guard.test.ts b/packages/cli/test/lib/security/auto-login-host-guard.test.ts index 401468e697..81df5e64fc 100644 --- a/packages/cli/test/lib/security/auto-login-host-guard.test.ts +++ b/packages/cli/test/lib/security/auto-login-host-guard.test.ts @@ -50,12 +50,12 @@ describe("auto-login host guard", () => { }); test("reads SENTRY_HOST", () => { - process.env.SENTRY_HOST = "https://sentry.example.com"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; expect(resolveEffectiveLoginHost()).toBe("https://sentry.example.com"); }); test("reads SENTRY_URL when SENTRY_HOST is absent", () => { - process.env.SENTRY_URL = "https://sentry.example.com/"; + process.env["SENTRY_URL"] = "https://sentry.example.com/"; expect(resolveEffectiveLoginHost()).toBe("https://sentry.example.com"); }); }); diff --git a/packages/cli/test/lib/security/custom-headers-leak.test.ts b/packages/cli/test/lib/security/custom-headers-leak.test.ts index 885e038cf4..888dd03151 100644 --- a/packages/cli/test/lib/security/custom-headers-leak.test.ts +++ b/packages/cli/test/lib/security/custom-headers-leak.test.ts @@ -47,8 +47,10 @@ describe("CVE: custom-headers leak (share URL + auth-login bypass)", () => { test("getSharedIssue with attacker baseUrl does not leak custom headers (direct-call regression)", async () => { // Simulates someone bypassing applySentryUrlContext and calling // getSharedIssue directly with an attacker-controlled baseUrl. - process.env.SENTRY_CUSTOM_HEADERS = "X-IAP-Token: secret"; - process.env.SENTRY_HOST = "https://sentry.acme.com"; + // Simulates someone bypassing applySentryUrlContext and calling + // getSharedIssue directly with an attacker-controlled baseUrl. + process.env["SENTRY_CUSTOM_HEADERS"] = "X-IAP-Token: secret"; + process.env["SENTRY_HOST"] = "https://sentry.acme.com"; captureEnvTokenHost(); // Intercept fetch to capture outbound headers @@ -80,9 +82,9 @@ describe("CVE: custom-headers leak (share URL + auth-login bypass)", () => { // User runs `sentry auth login --url https://sentry.acme.com` before // having any token. The device-code request MUST carry the IAP // token or the IAP proxy will block it. - delete process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_TOKEN; - process.env.SENTRY_CUSTOM_HEADERS = "X-IAP-Token: legit"; + delete process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_TOKEN"]; + process.env["SENTRY_CUSTOM_HEADERS"] = "X-IAP-Token: legit"; // `applyLoginUrl` (from login command) registers the trust anchor const { applyLoginUrl } = @@ -106,10 +108,10 @@ describe("CVE: custom-headers leak (share URL + auth-login bypass)", () => { // does NOT call registerLoginTrustAnchor. So no-token // applyCustomHeaders must still fail closed even though SENTRY_URL // is set. - delete process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_TOKEN; - process.env.SENTRY_CUSTOM_HEADERS = "X-IAP-Token: secret"; - process.env.SENTRY_URL = "https://evil.com"; // simulating rc shim write + delete process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_TOKEN"]; + process.env["SENTRY_CUSTOM_HEADERS"] = "X-IAP-Token: secret"; + process.env["SENTRY_URL"] = "https://evil.com"; // simulating rc shim write // Intentionally NOT calling applyLoginUrl — attacker flow doesn't const { resetLoginTrustAnchorForTesting } = diff --git a/packages/cli/test/lib/security/fetch-layer-guard.test.ts b/packages/cli/test/lib/security/fetch-layer-guard.test.ts index 330d2cc23b..2e96593955 100644 --- a/packages/cli/test/lib/security/fetch-layer-guard.test.ts +++ b/packages/cli/test/lib/security/fetch-layer-guard.test.ts @@ -43,8 +43,12 @@ describe("CVE defense-in-depth: fetch layer refuses mismatched hosts", () => { // Even if something bypasses applySentryUrlContext and arrives at // applyCustomHeaders with a mismatched URL, the header attach must // refuse. - process.env.SENTRY_CUSTOM_HEADERS = "X-IAP-Token: sensitive-iap-value"; - process.env.SENTRY_HOST = "https://sentry.example.com"; + // Reproduce the share-URL attack directly at the header layer. + // Even if something bypasses applySentryUrlContext and arrives at + // applyCustomHeaders with a mismatched URL, the header attach must + // refuse. + process.env["SENTRY_CUSTOM_HEADERS"] = "X-IAP-Token: sensitive-iap-value"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; const headers = new Headers(); applyCustomHeaders( @@ -58,8 +62,8 @@ describe("CVE defense-in-depth: fetch layer refuses mismatched hosts", () => { }); test("applyCustomHeaders: IAP token attaches to trusted URL", () => { - process.env.SENTRY_CUSTOM_HEADERS = "X-IAP-Token: sensitive-iap-value"; - process.env.SENTRY_HOST = "https://sentry.example.com"; + process.env["SENTRY_CUSTOM_HEADERS"] = "X-IAP-Token: sensitive-iap-value"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; const headers = new Headers(); applyCustomHeaders( @@ -76,8 +80,13 @@ describe("CVE defense-in-depth: fetch layer refuses mismatched hosts", () => { // SENTRY_CUSTOM_HEADERS is an IAP/proxy feature that only applies to // self-hosted instances (getCustomHeaders short-circuits on SaaS), // so we set SENTRY_HOST to enable it for this test. - process.env.SENTRY_CUSTOM_HEADERS = "X-Custom: value"; - process.env.SENTRY_HOST = "https://sentry.acme.com"; + // Critical: sentry.io.evil.com is NOT a sentry.io subdomain, so even + // a SaaS-scoped token shouldn't grant trust to it. + // SENTRY_CUSTOM_HEADERS is an IAP/proxy feature that only applies to + // self-hosted instances (getCustomHeaders short-circuits on SaaS), + // so we set SENTRY_HOST to enable it for this test. + process.env["SENTRY_CUSTOM_HEADERS"] = "X-Custom: value"; + process.env["SENTRY_HOST"] = "https://sentry.acme.com"; const headers = new Headers(); applyCustomHeaders(headers, "https://sentry.acme.com.evil.com/api/0/"); @@ -89,8 +98,11 @@ describe("CVE defense-in-depth: fetch layer refuses mismatched hosts", () => { // Token scoped to sentry.acme.com must not authorize sub.sentry.acme.com // when it's actually an attacker-controlled subdomain takeover. // (Non-SaaS trust class requires EXACT origin match.) - process.env.SENTRY_CUSTOM_HEADERS = "X-IAP-Token: secret"; - process.env.SENTRY_HOST = "https://sentry.acme.com"; + // Token scoped to sentry.acme.com must not authorize sub.sentry.acme.com + // when it's actually an attacker-controlled subdomain takeover. + // (Non-SaaS trust class requires EXACT origin match.) + process.env["SENTRY_CUSTOM_HEADERS"] = "X-IAP-Token: secret"; + process.env["SENTRY_HOST"] = "https://sentry.acme.com"; const headers = new Headers(); applyCustomHeaders(headers, "https://attacker.sentry.acme.com/api/0/"); diff --git a/packages/cli/test/lib/security/login-token-rc-poison.test.ts b/packages/cli/test/lib/security/login-token-rc-poison.test.ts index 96d43e00b9..568de31b6a 100644 --- a/packages/cli/test/lib/security/login-token-rc-poison.test.ts +++ b/packages/cli/test/lib/security/login-token-rc-poison.test.ts @@ -115,7 +115,7 @@ describe("CVE: auth login --token with rc-poisoned env.SENTRY_URL", () => { // captures SaaS default), then rc shim writes env.SENTRY_URL to the // attacker's host. captureEnvTokenHost(); // captures SaaS default (no env set) - process.env.SENTRY_URL = "https://evil.com"; // simulate rc shim write + process.env["SENTRY_URL"] = "https://evil.com"; // simulate rc shim write const func = (await loginCommand.loader()) as unknown as LoginFunc; const context = createContext(); @@ -146,7 +146,7 @@ describe("CVE: auth login --token with rc-poisoned env.SENTRY_URL", () => { // attacker URL in the first place — much stronger than relying on // them to spot the malicious URL in terminal output. captureEnvTokenHost(); - process.env.SENTRY_URL = "https://evil.com"; + process.env["SENTRY_URL"] = "https://evil.com"; const func = (await loginCommand.loader()) as unknown as LoginFunc; const context = createContext(); @@ -163,7 +163,7 @@ describe("CVE: auth login --token with rc-poisoned env.SENTRY_URL", () => { // The explicit --url path is the documented way to acknowledge a // new host. rc-sourced env.SENTRY_URL is overwritten by applyLoginUrl. captureEnvTokenHost(); - process.env.SENTRY_URL = "https://evil.com"; // poisoned by rc + process.env["SENTRY_URL"] = "https://evil.com"; // poisoned by rc const func = (await loginCommand.loader()) as unknown as LoginFunc; const context = createContext(); @@ -195,7 +195,11 @@ describe("CVE: auth login --token with rc-poisoned env.SENTRY_URL", () => { // requires --url to confirm the host. This simplifies the trust model // (only --url registers a trust anchor) and avoids the boot-snapshot // comparison complexity. Self-hosted users add --url on first login. - process.env.SENTRY_HOST = "https://sentry.acme.com"; + // Even when SENTRY_HOST is legitimately shell-exported, --token login + // requires --url to confirm the host. This simplifies the trust model + // (only --url registers a trust anchor) and avoids the boot-snapshot + // comparison complexity. Self-hosted users add --url on first login. + process.env["SENTRY_HOST"] = "https://sentry.acme.com"; captureEnvTokenHost(); const func = (await loginCommand.loader()) as unknown as LoginFunc; @@ -224,7 +228,7 @@ describe("CVE: auth login --token with rc-poisoned env.SENTRY_URL", () => { await import("../../../src/lib/token-host.js"); registerLoginTrustAnchor("https://sentry.hosta.com"); - process.env.SENTRY_URL = "https://evil.com"; + process.env["SENTRY_URL"] = "https://evil.com"; const func = (await loginCommand.loader()) as unknown as LoginFunc; const context = createContext(); diff --git a/packages/cli/test/lib/security/refresh-token-poison.test.ts b/packages/cli/test/lib/security/refresh-token-poison.test.ts index 0c62fe1c0c..a204c65049 100644 --- a/packages/cli/test/lib/security/refresh-token-poison.test.ts +++ b/packages/cli/test/lib/security/refresh-token-poison.test.ts @@ -29,7 +29,9 @@ describe("CVE defense-in-depth: refresh token", () => { beforeEach(() => { // A client ID is required for refreshAccessToken to proceed past the // config check. We want it to reach (and fail at) the host assertion. - process.env.SENTRY_CLIENT_ID = "test-client-id"; + // A client ID is required for refreshAccessToken to proceed past the + // config check. We want it to reach (and fail at) the host assertion. + process.env["SENTRY_CLIENT_ID"] = "test-client-id"; resetEnvTokenHostForTesting(); // Intercept fetch to detect any outbound request attempt. fetchCalls = []; @@ -56,7 +58,10 @@ describe("CVE defense-in-depth: refresh token", () => { // Step 2: simulate the bypass — something writes env.SENTRY_URL AFTER // the snapshot. This is the attack shape: env got poisoned by a // code path that skipped the URL-arg / rc-shim guards. - process.env.SENTRY_URL = "https://evil.com"; + // Step 2: simulate the bypass — something writes env.SENTRY_URL AFTER + // the snapshot. This is the attack shape: env got poisoned by a + // code path that skipped the URL-arg / rc-shim guards. + process.env["SENTRY_URL"] = "https://evil.com"; await expect( refreshAccessToken("fake-refresh-token", { credentialHost }), @@ -68,11 +73,13 @@ describe("CVE defense-in-depth: refresh token", () => { test("refreshAccessToken proceeds when URL matches token scope", async () => { // Pin env-token to the self-hosted instance BEFORE the url is used. - process.env.SENTRY_HOST = "https://sentry.example.com"; + // Pin env-token to the self-hosted instance BEFORE the url is used. + process.env["SENTRY_HOST"] = "https://sentry.example.com"; resetEnvTokenHostForTesting(); captureEnvTokenHost(); // Also set SENTRY_URL so getSentryUrl() returns the same host - process.env.SENTRY_URL = "https://sentry.example.com"; + // Also set SENTRY_URL so getSentryUrl() returns the same host + process.env["SENTRY_URL"] = "https://sentry.example.com"; // Should NOT throw at the host-assertion; the actual fetch will fail // with the mock "test: unexpected fetch" error, which is fine — the @@ -98,8 +105,8 @@ describe("CVE defense-in-depth: refresh token", () => { ])( "%s refresh failure names the credential host", async (_, failure, prefix) => { - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; const credentialHost = "https://sentry.example.com:8443"; globalThis.fetch = async (input: RequestInfo | URL) => { fetchCalls.push(extractFetchUrl(input)); diff --git a/packages/cli/test/lib/security/sentryclirc-url-poison.test.ts b/packages/cli/test/lib/security/sentryclirc-url-poison.test.ts index fce0b44446..51067f80a3 100644 --- a/packages/cli/test/lib/security/sentryclirc-url-poison.test.ts +++ b/packages/cli/test/lib/security/sentryclirc-url-poison.test.ts @@ -50,7 +50,7 @@ describe("CVE: .sentryclirc URL credential exfiltration", () => { testDir = await createTestConfigDir("sentryclirc-cve-", { isolateProjectRoot: true, }); - process.env.SENTRY_CONFIG_DIR = testDir; + process.env["SENTRY_CONFIG_DIR"] = testDir; resetEnvTokenHostForTesting(); }); @@ -73,8 +73,8 @@ describe("CVE: .sentryclirc URL credential exfiltration", () => { // Attack setup: user has SENTRY_AUTH_TOKEN (scoped to SaaS by default // because no SENTRY_HOST is set). Attacker repo ships .sentryclirc // pointing at evil.com. - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; // SENTRY_AUTH_TOKEN is already set by test/preload.ts // Capture env-token host BEFORE the shim mutates env (mirrors boot // ordering in lib/project-context.ts::preloadProjectContext). @@ -83,7 +83,7 @@ describe("CVE: .sentryclirc URL credential exfiltration", () => { // Shim applies the URL unconditionally — the trust check is deferred. await applySentryCliRcEnvShim(testDir); - expect(process.env.SENTRY_URL).toBe("https://evil.com"); + expect(process.env["SENTRY_URL"]).toBe("https://evil.com"); // Critical: assertRcUrlTrusted must throw, blocking any credentialed // request via buildCommand's wrapper. @@ -96,8 +96,8 @@ describe("CVE: .sentryclirc URL credential exfiltration", () => { // The plan explicitly rejects 'global rc is trusted' because CI runners // can write ~/.sentryclirc. Writing to the config dir (treated as // global) must NOT be a trust-establishment pathway. - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; captureEnvTokenHost(); // Write the rc in the config dir (SENTRY_CONFIG_DIR is set above). // That's treated as a "global" path by the shim's scope tagging. @@ -110,12 +110,12 @@ describe("CVE: .sentryclirc URL credential exfiltration", () => { }); test("SaaS URL in .sentryclirc proceeds (no credential leak possible to SaaS)", async () => { - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; writeRc(testDir, "[defaults]\nurl = https://sentry.io\n"); await applySentryCliRcEnvShim(testDir); - expect(process.env.SENTRY_URL).toBe("https://sentry.io"); + expect(process.env["SENTRY_URL"]).toBe("https://sentry.io"); }); test("matching self-hosted URL proceeds when env-token is scoped to that host", async () => { @@ -124,30 +124,37 @@ describe("CVE: .sentryclirc URL credential exfiltration", () => { // env gets cleared (simulating e.g. a test isolation or a shell that // only exported SENTRY_HOST for a particular subcommand). The rc file // then proposes the same host the token was scoped to — match. - process.env.SENTRY_HOST = "https://sentry.example.com"; + // Simulate boot ordering: user sets SENTRY_HOST via env (shell export), + // captureEnvTokenHost() pins the token's scope to that host, THEN the + // env gets cleared (simulating e.g. a test isolation or a shell that + // only exported SENTRY_HOST for a particular subcommand). The rc file + // then proposes the same host the token was scoped to — match. + process.env["SENTRY_HOST"] = "https://sentry.example.com"; resetEnvTokenHostForTesting(); captureEnvTokenHost(); // pin to sentry.example.com // Now simulate the shim running when both env vars are unset so the // shim's "only write if both unset" guard admits the rc-sourced URL. - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; writeRc(testDir, "[defaults]\nurl = https://sentry.example.com\n"); await applySentryCliRcEnvShim(testDir); - expect(process.env.SENTRY_URL).toBe("https://sentry.example.com"); + expect(process.env["SENTRY_URL"]).toBe("https://sentry.example.com"); }); test("existing SENTRY_HOST is never overridden by rc (shim has its own guard)", async () => { // Pre-existing SENTRY_HOST from user env — rc must not override it // regardless of what the rc says. - process.env.SENTRY_HOST = "https://sentry.example.com"; + // Pre-existing SENTRY_HOST from user env — rc must not override it + // regardless of what the rc says. + process.env["SENTRY_HOST"] = "https://sentry.example.com"; resetEnvTokenHostForTesting(); writeRc(testDir, "[defaults]\nurl = https://evil.com\n"); // Shim's own "only write if both unset" guard kicks in first → silent no-op await applySentryCliRcEnvShim(testDir); - expect(process.env.SENTRY_HOST).toBe("https://sentry.example.com"); - expect(process.env.SENTRY_URL).toBeUndefined(); + expect(process.env["SENTRY_HOST"]).toBe("https://sentry.example.com"); + expect(process.env["SENTRY_URL"]).toBeUndefined(); }); test("shim applies rc URL unconditionally; assertRcUrlTrusted is the gate", async () => { @@ -155,13 +162,13 @@ describe("CVE: .sentryclirc URL credential exfiltration", () => { // check is deferred to assertRcUrlTrusted, which buildCommand calls // after Stricli identifies the command. Commands that opt out // (auth login/logout via skipRcUrlCheck: true) never call it. - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; writeRc(testDir, "[defaults]\nurl = https://sentry.example.com\n"); await applySentryCliRcEnvShim(testDir); // URL applied to env (no trust check at this stage). - expect(process.env.SENTRY_URL).toBe("https://sentry.example.com"); + expect(process.env["SENTRY_URL"]).toBe("https://sentry.example.com"); // The trust check is the deferred gate — would throw for non-matching // hosts. Already covered by the other tests in this file. diff --git a/packages/cli/test/lib/security/sntrys-claim-mismatch.test.ts b/packages/cli/test/lib/security/sntrys-claim-mismatch.test.ts index f6d2a097f4..6013788af9 100644 --- a/packages/cli/test/lib/security/sntrys-claim-mismatch.test.ts +++ b/packages/cli/test/lib/security/sntrys-claim-mismatch.test.ts @@ -68,12 +68,14 @@ describe("CVE defense-in-depth: sntrys_ claim vs request mismatch", () => { test("token whose claim says A is refused when env routing says B", async () => { // Token issued by sentry.firsthost.com (claim). // Env says SENTRY_HOST = sentry.secondhost.com (user's shell — trusted). - process.env.SENTRY_AUTH_TOKEN = mintSntrysToken({ + // Token issued by sentry.firsthost.com (claim). + // Env says SENTRY_HOST = sentry.secondhost.com (user's shell — trusted). + process.env["SENTRY_AUTH_TOKEN"] = mintSntrysToken({ iat: 1_700_000_000, url: "https://sentry.firsthost.com", org: "x", }); - process.env.SENTRY_HOST = "https://sentry.secondhost.com"; + process.env["SENTRY_HOST"] = "https://sentry.secondhost.com"; const { captureEnvTokenHost } = await import("../../../src/lib/env-token-host.js"); captureEnvTokenHost(); @@ -95,12 +97,12 @@ describe("CVE defense-in-depth: sntrys_ claim vs request mismatch", () => { }); test("token whose claim matches the request proceeds normally", async () => { - process.env.SENTRY_AUTH_TOKEN = mintSntrysToken({ + process.env["SENTRY_AUTH_TOKEN"] = mintSntrysToken({ iat: 1_700_000_000, url: "https://sentry.acme.com", org: "x", }); - process.env.SENTRY_HOST = "https://sentry.acme.com"; + process.env["SENTRY_HOST"] = "https://sentry.acme.com"; const { captureEnvTokenHost } = await import("../../../src/lib/env-token-host.js"); captureEnvTokenHost(); @@ -123,12 +125,18 @@ describe("CVE defense-in-depth: sntrys_ claim vs request mismatch", () => { // but fan-out goes to regional silos discovered via // `/users/me/regions/`. The fix uses `isHostTrustedForClaim` which // also consults the region-URL extension. - process.env.SENTRY_AUTH_TOKEN = mintSntrysToken({ + // Regression: previously the claim check used raw `isHostTrusted`, + // which only honors exact-origin + SaaS equivalence. For self-hosted + // multi-region setups, the claim's url points at the control silo + // but fan-out goes to regional silos discovered via + // `/users/me/regions/`. The fix uses `isHostTrustedForClaim` which + // also consults the region-URL extension. + process.env["SENTRY_AUTH_TOKEN"] = mintSntrysToken({ iat: 1_700_000_000, url: "https://sentry.acme.com", org: "x", }); - process.env.SENTRY_HOST = "https://sentry.acme.com"; + process.env["SENTRY_HOST"] = "https://sentry.acme.com"; const { captureEnvTokenHost } = await import("../../../src/lib/env-token-host.js"); captureEnvTokenHost(); @@ -156,8 +164,10 @@ describe("CVE defense-in-depth: sntrys_ claim vs request mismatch", () => { test("opaque (non-sntrys_) tokens are not affected by claim check", async () => { // A `sntryu_` user-auth token has no claim — the claim check is a // no-op. The existing host-scoping check is the only enforcement. - process.env.SENTRY_AUTH_TOKEN = "sntryu_opaqueusertoken1234567890abcdef"; - process.env.SENTRY_HOST = "https://sentry.acme.com"; + // A `sntryu_` user-auth token has no claim — the claim check is a + // no-op. The existing host-scoping check is the only enforcement. + process.env["SENTRY_AUTH_TOKEN"] = "sntryu_opaqueusertoken1234567890abcdef"; + process.env["SENTRY_HOST"] = "https://sentry.acme.com"; const { captureEnvTokenHost } = await import("../../../src/lib/env-token-host.js"); captureEnvTokenHost(); @@ -187,7 +197,12 @@ describe("UX path: env-token-host falls back to sntrys_ claim url", () => { // would default to SaaS and every command would trip the host // guard. With the claim fallback, the snapshot picks up the // self-hosted url from the token itself. - process.env.SENTRY_AUTH_TOKEN = mintSntrysToken({ + // User pasted a sntrys_ token from their self-hosted UI but didn't + // also export SENTRY_HOST. Without the claim fallback, the snapshot + // would default to SaaS and every command would trip the host + // guard. With the claim fallback, the snapshot picks up the + // self-hosted url from the token itself. + process.env["SENTRY_AUTH_TOKEN"] = mintSntrysToken({ iat: 1_700_000_000, url: "https://sentry.selfhosted.example.com", org: "x", @@ -206,12 +221,16 @@ describe("UX path: env-token-host falls back to sntrys_ claim url", () => { // SENTRY_HOST is set (legitimately or via CI env injection), the // snapshot uses the claim — it's the only value the token's // issuing server can vouch for. - process.env.SENTRY_AUTH_TOKEN = mintSntrysToken({ + // The claim is authoritative for sntrys_ tokens. Even when + // SENTRY_HOST is set (legitimately or via CI env injection), the + // snapshot uses the claim — it's the only value the token's + // issuing server can vouch for. + process.env["SENTRY_AUTH_TOKEN"] = mintSntrysToken({ iat: 1_700_000_000, url: "https://sentry.firsthost.com", org: "x", }); - process.env.SENTRY_HOST = "https://sentry.secondhost.com"; + process.env["SENTRY_HOST"] = "https://sentry.secondhost.com"; const { captureEnvTokenHost, getEnvTokenHost } = await import("../../../src/lib/env-token-host.js"); @@ -221,7 +240,7 @@ describe("UX path: env-token-host falls back to sntrys_ claim url", () => { }); test("non-sntrys_ token + no SENTRY_HOST → snapshot falls back to SaaS default", async () => { - process.env.SENTRY_AUTH_TOKEN = "sntryu_opaque-user-token"; + process.env["SENTRY_AUTH_TOKEN"] = "sntryu_opaque-user-token"; // No SENTRY_HOST. const { captureEnvTokenHost, getEnvTokenHost } = @@ -238,7 +257,13 @@ describe("UX path: env-token-host falls back to sntrys_ claim url", () => { // - For a forged token (user pasted attacker's token), the user // has already authorized the attacker server — out of threat // model. - process.env.SENTRY_AUTH_TOKEN = mintSntrysToken({ + // Documents the trust contract: the snapshot picks up whatever the + // claim says, even if forged. This is acceptable because: + // - For a legitimate token, the url is authoritative. + // - For a forged token (user pasted attacker's token), the user + // has already authorized the attacker server — out of threat + // model. + process.env["SENTRY_AUTH_TOKEN"] = mintSntrysToken({ iat: 1_700_000_000, url: "https://evil.com", org: "victim", diff --git a/packages/cli/test/lib/security/url-arg-poison.test.ts b/packages/cli/test/lib/security/url-arg-poison.test.ts index 47e83e2f0a..cf62be261d 100644 --- a/packages/cli/test/lib/security/url-arg-poison.test.ts +++ b/packages/cli/test/lib/security/url-arg-poison.test.ts @@ -19,7 +19,8 @@ import { import { parseOrgProjectArg } from "../../../src/lib/arg-parsing.js"; import { parseIssueArg } from "../../../src/lib/issue-arguments.js"; import { resetEnvTokenHostForTesting } from "../../../src/lib/env-token-host.js"; -import { useEnvSandbox } from "../../helpers.js"; +import { useEnvSandbox, loadCommand } from "../../helpers.js"; +import type { Writer } from "../../../src/types/index.js"; const ENV_KEYS = ["SENTRY_HOST", "SENTRY_URL"] as const; @@ -36,8 +37,8 @@ describe("CVE: URL argument credential exfiltration", () => { ).toThrow(/does not match|sentry auth login --url/); // Env untouched — no routing poison. - expect(process.env.SENTRY_HOST).toBeUndefined(); - expect(process.env.SENTRY_URL).toBeUndefined(); + expect(process.env["SENTRY_HOST"]).toBeUndefined(); + expect(process.env["SENTRY_URL"]).toBeUndefined(); }); test("parseOrgProjectArg with attacker URL throws before env is poisoned", () => { @@ -47,8 +48,8 @@ describe("CVE: URL argument credential exfiltration", () => { ), ).toThrow(/does not match|sentry auth login --url/); - expect(process.env.SENTRY_HOST).toBeUndefined(); - expect(process.env.SENTRY_URL).toBeUndefined(); + expect(process.env["SENTRY_HOST"]).toBeUndefined(); + expect(process.env["SENTRY_URL"]).toBeUndefined(); }); test("event view with attacker URL throws before env is poisoned", async () => { @@ -56,20 +57,20 @@ describe("CVE: URL argument credential exfiltration", () => { "https://evil.com/organizations/acme/issues/999/events/deadbeef/"; // Parsing only returns the server, for the command to check and apply expect(parseEventViewInput([url]).baseUrl).toBe("https://evil.com"); - expect(process.env.SENTRY_URL).toBeUndefined(); + expect(process.env["SENTRY_URL"]).toBeUndefined(); - const func = await viewCommand.loader(); + const func = await loadCommand(viewCommand); const context = { - stdout: { write: vi.fn(() => true) }, - stderr: { write: vi.fn(() => true) }, + stdout: { write: vi.fn(() => true) }, + stderr: { write: vi.fn(() => true) }, cwd: "/tmp", }; await expect( func.call(context as never, { json: true, web: false, spans: 0 }, url), ).rejects.toThrow(/does not match|sentry auth login --url/); - expect(process.env.SENTRY_HOST).toBeUndefined(); - expect(process.env.SENTRY_URL).toBeUndefined(); + expect(process.env["SENTRY_HOST"]).toBeUndefined(); + expect(process.env["SENTRY_URL"]).toBeUndefined(); }); test("share URL from attacker host throws (CVE #3: custom-headers leak)", () => { @@ -81,29 +82,32 @@ describe("CVE: URL argument credential exfiltration", () => { ), ).toThrow(/does not match|sentry auth login --url/); - expect(process.env.SENTRY_HOST).toBeUndefined(); - expect(process.env.SENTRY_URL).toBeUndefined(); + expect(process.env["SENTRY_HOST"]).toBeUndefined(); + expect(process.env["SENTRY_URL"]).toBeUndefined(); }); test("SaaS URL arg proceeds even when SENTRY_HOST is currently set to self-hosted", () => { // SaaS URLs always proceed — they're part of the SaaS trust class // when the active token is SaaS-scoped, and they clear env to route // correctly. - process.env.SENTRY_HOST = "https://old-self-hosted.example.com"; - process.env.SENTRY_URL = "https://old-self-hosted.example.com"; + // SaaS URLs always proceed — they're part of the SaaS trust class + // when the active token is SaaS-scoped, and they clear env to route + // correctly. + process.env["SENTRY_HOST"] = "https://old-self-hosted.example.com"; + process.env["SENTRY_URL"] = "https://old-self-hosted.example.com"; parseIssueArg("https://sentry.io/organizations/acme/issues/1234/"); // env cleared so default SaaS routing takes over - expect(process.env.SENTRY_HOST).toBeUndefined(); - expect(process.env.SENTRY_URL).toBeUndefined(); + expect(process.env["SENTRY_HOST"]).toBeUndefined(); + expect(process.env["SENTRY_URL"]).toBeUndefined(); }); test("matching self-hosted URL arg is honored when token scoped to that host", () => { - process.env.SENTRY_HOST = "https://sentry.example.com"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; resetEnvTokenHostForTesting(); parseOrgProjectArg( "https://sentry.example.com/organizations/acme/issues/1/", ); - expect(process.env.SENTRY_HOST).toBe("https://sentry.example.com"); - expect(process.env.SENTRY_URL).toBe("https://sentry.example.com"); + expect(process.env["SENTRY_HOST"]).toBe("https://sentry.example.com"); + expect(process.env["SENTRY_URL"]).toBe("https://sentry.example.com"); }); }); diff --git a/packages/cli/test/lib/seer-trial.test.ts b/packages/cli/test/lib/seer-trial.test.ts index d95f7a6720..a2848fc6eb 100644 --- a/packages/cli/test/lib/seer-trial.test.ts +++ b/packages/cli/test/lib/seer-trial.test.ts @@ -5,7 +5,15 @@ * isTrialEligible tests can simulate an interactive terminal. */ -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; vi.mock("../../src/lib/prompt.js", () => ({ prompt: vi.fn() })); vi.mock("node:tty", async (importOriginal) => ({ @@ -83,10 +91,12 @@ describe("isTrialEligible", () => { }); describe("promptAndStartTrial", () => { - let getProductTrialsSpy: ReturnType; - let startProductTrialSpy: ReturnType; + let getProductTrialsSpy: MockInstance<(typeof apiClient)["getProductTrials"]>; + let startProductTrialSpy: MockInstance< + (typeof apiClient)["startProductTrial"] + >; let promptSpy: ReturnType; - let loggerWithTagSpy: ReturnType; + let loggerWithTagSpy: MockInstance<(typeof loggerModule.logger)["withTag"]>; let logDebugCalls: string[]; let logInfoCalls: string[]; let logWarnCalls: string[]; diff --git a/packages/cli/test/lib/sentry-client.auth.test.ts b/packages/cli/test/lib/sentry-client.auth.test.ts index cee9a601f1..41d0540a0f 100644 --- a/packages/cli/test/lib/sentry-client.auth.test.ts +++ b/packages/cli/test/lib/sentry-client.auth.test.ts @@ -282,8 +282,8 @@ describe("authenticated fetch bearer validation", () => { ); test("rejects forced malformed env credentials instead of using stored OAuth", async () => { - process.env.SENTRY_AUTH_TOKEN = MALFORMED_TOKEN; - process.env.SENTRY_FORCE_ENV_TOKEN = "1"; + process.env["SENTRY_AUTH_TOKEN"] = MALFORMED_TOKEN; + process.env["SENTRY_FORCE_ENV_TOKEN"] = "1"; setAuthToken("stored-token"); await expect(request()).rejects.toMatchObject({ reason: "invalid", @@ -324,7 +324,7 @@ describe("authenticated fetch bearer validation", () => { " \nrefreshed-token\r\t", "\x1f\nrefreshed-token\r\x7f", ])("retries with a normalized valid refreshed bearer %#", async (token) => { - process.env.SENTRY_CLIENT_ID = "synthetic-client-id"; + process.env["SENTRY_CLIENT_ID"] = "synthetic-client-id"; setAuthToken("stored-token", 3600, "synthetic-refresh-token"); globalThis.fetch = mockResponses((url, authorization) => { if (url.endsWith("/oauth/token/")) { @@ -357,7 +357,7 @@ describe("authenticated fetch bearer validation", () => { ])( "rejects malformed refreshed credentials without retrying the request %#", async (token) => { - process.env.SENTRY_CLIENT_ID = "synthetic-client-id"; + process.env["SENTRY_CLIENT_ID"] = "synthetic-client-id"; setAuthToken("stored-token", 3600, "synthetic-refresh-token"); globalThis.fetch = mockResponses((url) => { if (url.endsWith("/oauth/token/")) { @@ -398,7 +398,7 @@ describe("authenticated fetch bearer validation", () => { test.each(["none", ...ENV_TOKEN_KEYS])( "normalizes a proactive refresh with malformed env source %s", async (source) => { - process.env.SENTRY_CLIENT_ID = "synthetic-client-id"; + process.env["SENTRY_CLIENT_ID"] = "synthetic-client-id"; if (source !== "none") { process.env[source] = MALFORMED_TOKEN; } @@ -427,7 +427,7 @@ describe("authenticated fetch bearer validation", () => { ); test("rejects malformed proactive refresh before storing or using the token", async () => { - process.env.SENTRY_CLIENT_ID = "synthetic-client-id"; + process.env["SENTRY_CLIENT_ID"] = "synthetic-client-id"; setAuthToken("expired-token", -1, "synthetic-refresh-token"); globalThis.fetch = mockResponses(() => Response.json({ diff --git a/packages/cli/test/lib/sentry-client.base-url.test.ts b/packages/cli/test/lib/sentry-client.base-url.test.ts index ef61ab6c93..5f64b97be7 100644 --- a/packages/cli/test/lib/sentry-client.base-url.test.ts +++ b/packages/cli/test/lib/sentry-client.base-url.test.ts @@ -36,14 +36,14 @@ describe("API base URL for org-auth credentials", () => { }); test("uses the active org-auth claim host when no URL is configured", () => { - process.env.SENTRY_AUTH_TOKEN = orgAuthToken; + process.env["SENTRY_AUTH_TOKEN"] = orgAuthToken; expect(getApiBaseUrl()).toBe(claimHost); expect(getControlSiloUrl()).toBe(claimHost); }); test("discovers the org region through the claim host", async () => { - process.env.SENTRY_AUTH_TOKEN = orgAuthToken; + process.env["SENTRY_AUTH_TOKEN"] = orgAuthToken; const originalFetch = globalThis.fetch; const requests: Request[] = []; globalThis.fetch = mockFetch(async (input, init) => { @@ -77,18 +77,18 @@ describe("API base URL for org-auth credentials", () => { }); test("prefers an explicit URL to the claim host", () => { - process.env.SENTRY_AUTH_TOKEN = orgAuthToken; - process.env.SENTRY_URL = "https://configured.example.com"; + process.env["SENTRY_AUTH_TOKEN"] = orgAuthToken; + process.env["SENTRY_URL"] = "https://configured.example.com"; expect(getApiBaseUrl()).toBe("https://configured.example.com"); expect(getControlSiloUrl()).toBe("https://configured.example.com"); - process.env.SENTRY_HOST = "https://host.example.com"; + process.env["SENTRY_HOST"] = "https://host.example.com"; expect(getApiBaseUrl()).toBe("https://host.example.com"); }); test("uses the stored login host when an inactive env token has a claim", () => { - process.env.SENTRY_AUTH_TOKEN = orgAuthToken; + process.env["SENTRY_AUTH_TOKEN"] = orgAuthToken; setAuthToken("stored-token", undefined, undefined, { host: "https://stored.example.com", }); @@ -96,12 +96,12 @@ describe("API base URL for org-auth credentials", () => { expect(getApiBaseUrl()).toBe("https://stored.example.com"); expect(getControlSiloUrl()).toBe("https://stored.example.com"); - process.env.SENTRY_FORCE_ENV_TOKEN = "1"; + process.env["SENTRY_FORCE_ENV_TOKEN"] = "1"; expect(getApiBaseUrl()).toBe(claimHost); }); test("does not migrate a legacy stored login to an inactive token's claim", () => { - process.env.SENTRY_AUTH_TOKEN = orgAuthToken; + process.env["SENTRY_AUTH_TOKEN"] = orgAuthToken; const db = getDatabase(); db.query( "INSERT INTO accounts (account_id, token, refresh_token, host, is_active, updated_at) VALUES ('legacy', 'stored-token', 'refresh-token', NULL, 1, ?)", @@ -118,7 +118,7 @@ describe("API base URL for org-auth credentials", () => { }); test("rejects an invalid active org-auth URL claim instead of sending it to SaaS", () => { - process.env.SENTRY_AUTH_TOKEN = mintSntrysToken({ + process.env["SENTRY_AUTH_TOKEN"] = mintSntrysToken({ iat: 1, url: "ftp://invalid.example.com", }); @@ -128,7 +128,7 @@ describe("API base URL for org-auth credentials", () => { }); test("does not validate an inactive environment claim during stored login migration", () => { - process.env.SENTRY_AUTH_TOKEN = mintSntrysToken({ + process.env["SENTRY_AUTH_TOKEN"] = mintSntrysToken({ iat: 1, url: "ftp://invalid.example.com", }); @@ -150,7 +150,7 @@ describe("API base URL for org-auth credentials", () => { test("keeps SaaS as the fallback without an active custom host", () => { expect(getApiBaseUrl()).toBe(DEFAULT_SENTRY_URL); - process.env.SENTRY_AUTH_TOKEN = "non-org-token"; + process.env["SENTRY_AUTH_TOKEN"] = "non-org-token"; expect(getApiBaseUrl()).toBe(DEFAULT_SENTRY_URL); expect(getControlSiloUrl()).toBe(DEFAULT_SENTRY_URL); }); diff --git a/packages/cli/test/lib/sentry-client.response-body.test.ts b/packages/cli/test/lib/sentry-client.response-body.test.ts index 33eb3a71ba..1c79609e14 100644 --- a/packages/cli/test/lib/sentry-client.response-body.test.ts +++ b/packages/cli/test/lib/sentry-client.response-body.test.ts @@ -360,12 +360,11 @@ describe("SDK response body recovery", () => { }); const operation = listOrganizations({ ...getSdkClientConfig(REGION_URL), - responseValidator: - failureKind === "validation" - ? () => { - throw validationError; - } - : undefined, + ...(failureKind === "validation" && { + responseValidator: () => { + throw validationError; + }, + }), }); if (failureKind === "validation") { @@ -412,7 +411,7 @@ describe("SDK streaming compatibility", () => { controller.enqueue(bytes); }, }), - { headers: contentType ? { "Content-Type": contentType } : undefined }, + contentType ? { headers: { "Content-Type": contentType } } : {}, ); let calls = 0; globalThis.fetch = mockFetch(async () => { diff --git a/packages/cli/test/lib/sentry-client.test.ts b/packages/cli/test/lib/sentry-client.test.ts index 57fe994383..d078dd3261 100644 --- a/packages/cli/test/lib/sentry-client.test.ts +++ b/packages/cli/test/lib/sentry-client.test.ts @@ -18,6 +18,7 @@ import { getSdkConfig, resetAuthenticatedFetch, } from "../../src/lib/sentry-client.js"; +import type { Http1Dispatcher } from "../../src/lib/http1-dispatcher.js"; import { initSentry } from "../../src/lib/telemetry.js"; import { mockFetch, useEnvSandbox, useTestConfigDir } from "../helpers.js"; @@ -52,7 +53,7 @@ function jsonResponse( init: { status?: number; headers?: Record } = {}, ): Response { return new Response(JSON.stringify(body), { - status: init.status, + ...(init.status !== undefined && { status: init.status }), headers: { "Content-Type": "application/json", ...init.headers }, }); } @@ -351,7 +352,9 @@ describe("non-idempotent requests", () => { test("replays a POST Request body after a 401 token refresh", async () => { // The server rejected the request before processing it, so the refresh // retry applies to every method. - process.env.SENTRY_CLIENT_ID = "test-client-id"; + // The server rejected the request before processing it, so the refresh + // retry applies to every method. + process.env["SENTRY_CLIENT_ID"] = "test-client-id"; setAuthToken("initial-token", 3600, "test-refresh-token"); const seen: { auth: string | null; body: string }[] = []; globalThis.fetch = mockFetch(async (input, init) => { @@ -699,7 +702,7 @@ describe("fetchWithTimeout internal timeout classification", () => { describe("dispatcher option", () => { test("passes the dispatcher to every fetch", async () => { - const dispatcher = {} as NonNullable; + const dispatcher = {} as Http1Dispatcher; const seen: unknown[] = []; globalThis.fetch = mockFetch(async (_input, init) => { seen.push((init as { dispatcher?: unknown } | undefined)?.dispatcher); @@ -772,9 +775,10 @@ describe("API request tracing", () => { init?.headers ?? (input instanceof Request ? input.headers : undefined), ); const span = getActiveSpan(); - activeSpanOp = span + const op = span ? spanToJSON(span).attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP] : undefined; + activeSpanOp = typeof op === "string" ? op : undefined; return jsonResponse({ ok: true }); }); await startSpan({ name: "host", op: "test" }, () => diff --git a/packages/cli/test/lib/sentry-url-parser.test.ts b/packages/cli/test/lib/sentry-url-parser.test.ts index c57e08e675..af2e5a7d5e 100644 --- a/packages/cli/test/lib/sentry-url-parser.test.ts +++ b/packages/cli/test/lib/sentry-url-parser.test.ts @@ -654,10 +654,10 @@ describe("applySentryUrlContext", () => { let originalSentryHost: string | undefined; beforeEach(async () => { - originalSentryUrl = process.env.SENTRY_URL; - originalSentryHost = process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; - delete process.env.SENTRY_HOST; + originalSentryUrl = process.env["SENTRY_URL"]; + originalSentryHost = process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; + delete process.env["SENTRY_HOST"]; // Reset env-token-host capture so each test can re-pin based on the // SENTRY_HOST they set (or leave unset → SaaS default). const { resetEnvTokenHostForTesting } = @@ -667,14 +667,14 @@ describe("applySentryUrlContext", () => { afterEach(async () => { if (originalSentryUrl !== undefined) { - process.env.SENTRY_URL = originalSentryUrl; + process.env["SENTRY_URL"] = originalSentryUrl; } else { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; } if (originalSentryHost !== undefined) { - process.env.SENTRY_HOST = originalSentryHost; + process.env["SENTRY_HOST"] = originalSentryHost; } else { - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_HOST"]; } const { resetEnvTokenHostForTesting } = await import("../../src/lib/env-token-host.js"); @@ -684,10 +684,12 @@ describe("applySentryUrlContext", () => { test("writes env when non-SaaS URL matches token-scoped host", () => { // Pin env-token to the self-hosted instance via SENTRY_HOST before // calling captureEnvTokenHost() (implicit on first getEnvTokenHost call). - process.env.SENTRY_HOST = "https://sentry.example.com"; + // Pin env-token to the self-hosted instance via SENTRY_HOST before + // calling captureEnvTokenHost() (implicit on first getEnvTokenHost call). + process.env["SENTRY_HOST"] = "https://sentry.example.com"; applySentryUrlContext("https://sentry.example.com"); - expect(process.env.SENTRY_HOST).toBe("https://sentry.example.com"); - expect(process.env.SENTRY_URL).toBe("https://sentry.example.com"); + expect(process.env["SENTRY_HOST"]).toBe("https://sentry.example.com"); + expect(process.env["SENTRY_URL"]).toBe("https://sentry.example.com"); }); test("throws CliError for non-SaaS URL that does not match token host", () => { @@ -696,56 +698,61 @@ describe("applySentryUrlContext", () => { expect(() => applySentryUrlContext("https://sentry.example.com")).toThrow( /does not match|sentry auth login --url/, ); - expect(process.env.SENTRY_HOST).toBeUndefined(); - expect(process.env.SENTRY_URL).toBeUndefined(); + expect(process.env["SENTRY_HOST"]).toBeUndefined(); + expect(process.env["SENTRY_URL"]).toBeUndefined(); }); test("does not set SENTRY_HOST or SENTRY_URL for SaaS (sentry.io)", () => { applySentryUrlContext("https://sentry.io"); - expect(process.env.SENTRY_HOST).toBeUndefined(); - expect(process.env.SENTRY_URL).toBeUndefined(); + expect(process.env["SENTRY_HOST"]).toBeUndefined(); + expect(process.env["SENTRY_URL"]).toBeUndefined(); }); test("does not set SENTRY_HOST or SENTRY_URL for SaaS subdomain (us.sentry.io)", () => { applySentryUrlContext("https://us.sentry.io"); - expect(process.env.SENTRY_HOST).toBeUndefined(); - expect(process.env.SENTRY_URL).toBeUndefined(); + expect(process.env["SENTRY_HOST"]).toBeUndefined(); + expect(process.env["SENTRY_URL"]).toBeUndefined(); }); test("throws on mismatch even when SENTRY_HOST is pre-set to a different host", () => { // Token scoped to existing.example.com; URL-arg points at sentry.other.com. // Primary guard refuses to re-scope by writing the new host — only // `sentry auth login --url` may change scope. - process.env.SENTRY_HOST = "https://existing.example.com"; - process.env.SENTRY_URL = "https://existing.example.com"; + // Token scoped to existing.example.com; URL-arg points at sentry.other.com. + // Primary guard refuses to re-scope by writing the new host — only + // `sentry auth login --url` may change scope. + process.env["SENTRY_HOST"] = "https://existing.example.com"; + process.env["SENTRY_URL"] = "https://existing.example.com"; expect(() => applySentryUrlContext("https://sentry.other.com")).toThrow( /does not match|sentry auth login --url/, ); // Existing env left intact — throw happens before any write. - expect(process.env.SENTRY_HOST).toBe("https://existing.example.com"); - expect(process.env.SENTRY_URL).toBe("https://existing.example.com"); + expect(process.env["SENTRY_HOST"]).toBe("https://existing.example.com"); + expect(process.env["SENTRY_URL"]).toBe("https://existing.example.com"); }); test("writes env for self-hosted URL with port when it matches token host", () => { - process.env.SENTRY_HOST = "https://sentry.acme.internal:9000"; + process.env["SENTRY_HOST"] = "https://sentry.acme.internal:9000"; applySentryUrlContext("https://sentry.acme.internal:9000"); - expect(process.env.SENTRY_HOST).toBe("https://sentry.acme.internal:9000"); - expect(process.env.SENTRY_URL).toBe("https://sentry.acme.internal:9000"); + expect(process.env["SENTRY_HOST"]).toBe( + "https://sentry.acme.internal:9000", + ); + expect(process.env["SENTRY_URL"]).toBe("https://sentry.acme.internal:9000"); }); test("clears both env vars when SaaS URL is detected", () => { - process.env.SENTRY_HOST = "https://sentry.example.com"; - process.env.SENTRY_URL = "https://sentry.example.com"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; + process.env["SENTRY_URL"] = "https://sentry.example.com"; applySentryUrlContext("https://sentry.io"); - expect(process.env.SENTRY_HOST).toBeUndefined(); - expect(process.env.SENTRY_URL).toBeUndefined(); + expect(process.env["SENTRY_HOST"]).toBeUndefined(); + expect(process.env["SENTRY_URL"]).toBeUndefined(); }); test("clears both env vars when SaaS subdomain is detected", () => { - process.env.SENTRY_HOST = "https://sentry.example.com"; - process.env.SENTRY_URL = "https://sentry.example.com"; + process.env["SENTRY_HOST"] = "https://sentry.example.com"; + process.env["SENTRY_URL"] = "https://sentry.example.com"; applySentryUrlContext("https://us.sentry.io"); - expect(process.env.SENTRY_HOST).toBeUndefined(); - expect(process.env.SENTRY_URL).toBeUndefined(); + expect(process.env["SENTRY_HOST"]).toBeUndefined(); + expect(process.env["SENTRY_URL"]).toBeUndefined(); }); }); diff --git a/packages/cli/test/lib/sentry-urls.credential.test.ts b/packages/cli/test/lib/sentry-urls.credential.test.ts index 9bef0e60f9..38e9d87bed 100644 --- a/packages/cli/test/lib/sentry-urls.credential.test.ts +++ b/packages/cli/test/lib/sentry-urls.credential.test.ts @@ -28,7 +28,7 @@ describe("web URLs for active credential hosts", () => { }); test("uses a self-hosted token claim for web links and URL shape", () => { - process.env.SENTRY_AUTH_TOKEN = mintSntrysToken({ + process.env["SENTRY_AUTH_TOKEN"] = mintSntrysToken({ iat: 1, url: "https://sentry.example.com", }); @@ -43,7 +43,7 @@ describe("web URLs for active credential hosts", () => { }); test("stored OAuth host wins over an inactive environment token", () => { - process.env.SENTRY_AUTH_TOKEN = mintSntrysToken({ + process.env["SENTRY_AUTH_TOKEN"] = mintSntrysToken({ iat: 1, url: "https://inactive.example.com", }); @@ -54,8 +54,8 @@ describe("web URLs for active credential hosts", () => { }); test("explicit URLs still take priority for web links", () => { - process.env.SENTRY_URL = "https://configured.example.com/sentry"; - process.env.SENTRY_AUTH_TOKEN = mintSntrysToken({ + process.env["SENTRY_URL"] = "https://configured.example.com/sentry"; + process.env["SENTRY_AUTH_TOKEN"] = mintSntrysToken({ iat: 1, url: "https://token.example.com", }); diff --git a/packages/cli/test/lib/sentry-urls.property.test.ts b/packages/cli/test/lib/sentry-urls.property.test.ts index 32408e6dc0..22027bdf10 100644 --- a/packages/cli/test/lib/sentry-urls.property.test.ts +++ b/packages/cli/test/lib/sentry-urls.property.test.ts @@ -37,23 +37,23 @@ let originalSentryUrl: string | undefined; let originalSentryHost: string | undefined; beforeEach(() => { - originalSentryUrl = process.env.SENTRY_URL; - originalSentryHost = process.env.SENTRY_HOST; + originalSentryUrl = process.env["SENTRY_URL"]; + originalSentryHost = process.env["SENTRY_HOST"]; // Clear SENTRY_HOST/SENTRY_URL for consistent base URL in tests - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; }); afterEach(() => { if (originalSentryUrl !== undefined) { - process.env.SENTRY_URL = originalSentryUrl; + process.env["SENTRY_URL"] = originalSentryUrl; } else { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; } if (originalSentryHost !== undefined) { - process.env.SENTRY_HOST = originalSentryHost; + process.env["SENTRY_HOST"] = originalSentryHost; } else { - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_HOST"]; } }); @@ -566,14 +566,14 @@ describe("buildDashboardUrl properties", () => { describe("SENTRY_HOST precedence", () => { test("SENTRY_HOST takes precedence over SENTRY_URL for URL builders", () => { - process.env.SENTRY_HOST = "https://host.company.com"; - process.env.SENTRY_URL = "https://url.company.com"; + process.env["SENTRY_HOST"] = "https://host.company.com"; + process.env["SENTRY_URL"] = "https://url.company.com"; expect(buildOrgUrl("my-org")).toContain("host.company.com"); expect(buildOrgUrl("my-org")).not.toContain("url.company.com"); }); test("SENTRY_HOST alone configures self-hosted URL builders", () => { - process.env.SENTRY_HOST = "https://sentry.company.com"; + process.env["SENTRY_HOST"] = "https://sentry.company.com"; expect(getOrgBaseUrl("my-org")).toBe("https://sentry.company.com"); expect(buildOrgUrl("my-org")).toBe( "https://sentry.company.com/organizations/my-org/", @@ -585,7 +585,7 @@ describe("self-hosted URLs", () => { const SELF_HOSTED_URL = "https://sentry.company.com"; beforeEach(() => { - process.env.SENTRY_URL = SELF_HOSTED_URL; + process.env["SENTRY_URL"] = SELF_HOSTED_URL; }); test("getOrgBaseUrl returns base URL without subdomain", () => { diff --git a/packages/cli/test/lib/sentryclirc.property.test.ts b/packages/cli/test/lib/sentryclirc.property.test.ts index e59584c40e..64058250fa 100644 --- a/packages/cli/test/lib/sentryclirc.property.test.ts +++ b/packages/cli/test/lib/sentryclirc.property.test.ts @@ -29,17 +29,17 @@ let savedConfigDir: string | undefined; beforeEach(async () => { clearSentryCliRcCache(); - savedConfigDir = process.env.SENTRY_CONFIG_DIR; + savedConfigDir = process.env["SENTRY_CONFIG_DIR"]; testDir = await createTestConfigDir("sentryclirc-prop-", { isolateProjectRoot: true, }); - process.env.SENTRY_CONFIG_DIR = testDir; + process.env["SENTRY_CONFIG_DIR"] = testDir; }); afterEach(async () => { clearSentryCliRcCache(); if (savedConfigDir !== undefined) { - process.env.SENTRY_CONFIG_DIR = savedConfigDir; + process.env["SENTRY_CONFIG_DIR"] = savedConfigDir; } await cleanupTestDir(testDir); }); diff --git a/packages/cli/test/lib/sentryclirc.test.ts b/packages/cli/test/lib/sentryclirc.test.ts index 99a72c2298..06a52cb838 100644 --- a/packages/cli/test/lib/sentryclirc.test.ts +++ b/packages/cli/test/lib/sentryclirc.test.ts @@ -44,7 +44,8 @@ beforeEach(async () => { isolateProjectRoot: true, }); // Point config dir at the test dir so getConfigDir() returns a predictable path - process.env.SENTRY_CONFIG_DIR = testDir; + // Point config dir at the test dir so getConfigDir() returns a predictable path + process.env["SENTRY_CONFIG_DIR"] = testDir; resetEnvTokenHostForTesting(); }); @@ -245,8 +246,8 @@ token = sntrys_test describe("applySentryCliRcEnvShim", () => { test("sets SENTRY_AUTH_TOKEN when not already set", async () => { - delete process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_TOKEN; + delete process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_TOKEN"]; writeRcFile(testDir, "[auth]\ntoken = rc-token\n"); await applySentryCliRcEnvShim(testDir); @@ -254,8 +255,8 @@ describe("applySentryCliRcEnvShim", () => { }); test("records the rc file as the injected token source", async () => { - delete process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_TOKEN; + delete process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_TOKEN"]; writeRcFile(testDir, "[auth]\ntoken = rc-token\n"); await applySentryCliRcEnvShim(testDir); @@ -263,7 +264,7 @@ describe("applySentryCliRcEnvShim", () => { }); test("does not record an injected source when a real env token is set", async () => { - process.env.SENTRY_AUTH_TOKEN = "existing-token"; + process.env["SENTRY_AUTH_TOKEN"] = "existing-token"; writeRcFile(testDir, "[auth]\ntoken = rc-token\n"); await applySentryCliRcEnvShim(testDir); @@ -271,7 +272,7 @@ describe("applySentryCliRcEnvShim", () => { }); test("does not override existing SENTRY_AUTH_TOKEN", async () => { - process.env.SENTRY_AUTH_TOKEN = "existing-token"; + process.env["SENTRY_AUTH_TOKEN"] = "existing-token"; writeRcFile(testDir, "[auth]\ntoken = rc-token\n"); await applySentryCliRcEnvShim(testDir); @@ -279,7 +280,7 @@ describe("applySentryCliRcEnvShim", () => { }); test("does not override non-empty whitespace SENTRY_AUTH_TOKEN", async () => { - process.env.SENTRY_AUTH_TOKEN = " real-token "; + process.env["SENTRY_AUTH_TOKEN"] = " real-token "; writeRcFile(testDir, "[auth]\ntoken = rc-token\n"); await applySentryCliRcEnvShim(testDir); @@ -287,7 +288,7 @@ describe("applySentryCliRcEnvShim", () => { }); test("overrides empty/whitespace-only SENTRY_AUTH_TOKEN", async () => { - process.env.SENTRY_AUTH_TOKEN = " "; + process.env["SENTRY_AUTH_TOKEN"] = " "; writeRcFile(testDir, "[auth]\ntoken = rc-token\n"); await applySentryCliRcEnvShim(testDir); @@ -295,8 +296,8 @@ describe("applySentryCliRcEnvShim", () => { }); test("does not override existing SENTRY_TOKEN (fallback env var)", async () => { - delete process.env.SENTRY_AUTH_TOKEN; - process.env.SENTRY_TOKEN = "env-fallback-token"; + delete process.env["SENTRY_AUTH_TOKEN"]; + process.env["SENTRY_TOKEN"] = "env-fallback-token"; writeRcFile(testDir, "[auth]\ntoken = rc-token\n"); await applySentryCliRcEnvShim(testDir); @@ -306,8 +307,8 @@ describe("applySentryCliRcEnvShim", () => { }); test("sets SENTRY_URL for SaaS rc url (no credential risk, no scoping check)", async () => { - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; writeRcFile(testDir, "[defaults]\nurl = https://sentry.io\n"); await applySentryCliRcEnvShim(testDir); @@ -319,8 +320,8 @@ describe("applySentryCliRcEnvShim", () => { // `new URL(...)` deep in the SaaS check. The shim now normalizes // the rc url through `normalizeUrl` first so bare hostnames are // accepted as the equivalent `https://sentry.io`. - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; writeRcFile(testDir, "[defaults]\nurl = sentry.io\n"); await applySentryCliRcEnvShim(testDir); @@ -334,8 +335,8 @@ describe("applySentryCliRcEnvShim", () => { // token to an attacker host. The shim itself applies the URL // unconditionally; the trust check lives in assertRcUrlTrusted, called // by buildCommand's wrapper. - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; // Capture env-token host BEFORE shim mutates env (mirrors boot order). captureEnvTokenHost(); writeRcFile(testDir, "[defaults]\nurl = https://evil.example.com\n"); @@ -349,8 +350,8 @@ describe("applySentryCliRcEnvShim", () => { }); test("does not set SENTRY_URL when SENTRY_HOST is set", async () => { - process.env.SENTRY_HOST = "sentry.other.com"; - delete process.env.SENTRY_URL; + process.env["SENTRY_HOST"] = "sentry.other.com"; + delete process.env["SENTRY_URL"]; writeRcFile(testDir, "[defaults]\nurl = https://sentry.example.com\n"); await applySentryCliRcEnvShim(testDir); @@ -358,8 +359,8 @@ describe("applySentryCliRcEnvShim", () => { }); test("does not set SENTRY_URL when SENTRY_URL is already set", async () => { - delete process.env.SENTRY_HOST; - process.env.SENTRY_URL = "https://existing.sentry.io"; + delete process.env["SENTRY_HOST"]; + process.env["SENTRY_URL"] = "https://existing.sentry.io"; writeRcFile(testDir, "[defaults]\nurl = https://sentry.example.com\n"); await applySentryCliRcEnvShim(testDir); @@ -367,9 +368,9 @@ describe("applySentryCliRcEnvShim", () => { }); test("does nothing when no .sentryclirc exists", async () => { - delete process.env.SENTRY_AUTH_TOKEN; - delete process.env.SENTRY_HOST; - delete process.env.SENTRY_URL; + delete process.env["SENTRY_AUTH_TOKEN"]; + delete process.env["SENTRY_HOST"]; + delete process.env["SENTRY_URL"]; await applySentryCliRcEnvShim(testDir); expect(readEnv("SENTRY_AUTH_TOKEN")).toBeUndefined(); diff --git a/packages/cli/test/lib/sixel-image.test.ts b/packages/cli/test/lib/sixel-image.test.ts index e107f769a8..54241ded9a 100644 --- a/packages/cli/test/lib/sixel-image.test.ts +++ b/packages/cli/test/lib/sixel-image.test.ts @@ -20,6 +20,7 @@ import { imageBytesToSixel, readImageDimensions, } from "../../src/lib/sixel-image.js"; +import { at } from "../helpers.js"; const ESC = "\x1b"; @@ -218,7 +219,7 @@ describe("buildPalette", () => { const width = 30; const data = new Uint8Array(width * 4); for (let x = 0; x < width; x++) { - const [r, g, b] = colors[x % colors.length]; + const [r, g, b] = at(colors, x % colors.length); data.set([r, g, b, 255], x * 4); } expect(buildPalette({ width, height: 1, data }, 16)).toEqual(colors); diff --git a/packages/cli/test/lib/sixel.test.ts b/packages/cli/test/lib/sixel.test.ts index ce1b0ec842..17c02d8cb3 100644 --- a/packages/cli/test/lib/sixel.test.ts +++ b/packages/cli/test/lib/sixel.test.ts @@ -194,23 +194,23 @@ describe("graphicsBanner", () => { const saved = { stdout: process.stdout.isTTY, stdin: process.stdin.isTTY, - noSixel: process.env.SENTRY_NO_SIXEL, + noSixel: process.env["SENTRY_NO_SIXEL"], }; try { // TTY on both ends, but SENTRY_NO_SIXEL forces opt-out: the emit-path // guard must return undefined without emitting (and without probing). process.stdout.isTTY = true; process.stdin.isTTY = true; - process.env.SENTRY_NO_SIXEL = "1"; + process.env["SENTRY_NO_SIXEL"] = "1"; __resetSixelCache(); expect(graphicsBanner(200)).toBeUndefined(); } finally { process.stdout.isTTY = saved.stdout; process.stdin.isTTY = saved.stdin; if (saved.noSixel === undefined) { - delete process.env.SENTRY_NO_SIXEL; + delete process.env["SENTRY_NO_SIXEL"]; } else { - process.env.SENTRY_NO_SIXEL = saved.noSixel; + process.env["SENTRY_NO_SIXEL"] = saved.noSixel; } __resetSixelCache(); } @@ -370,12 +370,12 @@ describe("optedOut", () => { const saved = { stdout: process.stdout.isTTY, stdin: process.stdin.isTTY, - TERM: process.env.TERM, - SENTRY_NO_SIXEL: process.env.SENTRY_NO_SIXEL, - SENTRY_NO_GRAPHICS: process.env.SENTRY_NO_GRAPHICS, - NO_COLOR: process.env.NO_COLOR, - SENTRY_PLAIN_OUTPUT: process.env.SENTRY_PLAIN_OUTPUT, - FORCE_COLOR: process.env.FORCE_COLOR, + TERM: process.env["TERM"], + SENTRY_NO_SIXEL: process.env["SENTRY_NO_SIXEL"], + SENTRY_NO_GRAPHICS: process.env["SENTRY_NO_GRAPHICS"], + NO_COLOR: process.env["NO_COLOR"], + SENTRY_PLAIN_OUTPUT: process.env["SENTRY_PLAIN_OUTPUT"], + FORCE_COLOR: process.env["FORCE_COLOR"], }; const setEnv = (key: string, value: string | undefined): void => { diff --git a/packages/cli/test/lib/telemetry-ci.test.ts b/packages/cli/test/lib/telemetry-ci.test.ts index 362bf272e1..182f0e2ead 100644 --- a/packages/cli/test/lib/telemetry-ci.test.ts +++ b/packages/cli/test/lib/telemetry-ci.test.ts @@ -1,12 +1,13 @@ /** Verify CI and agent attribution on outgoing command telemetry. */ -import type { Transport } from "@sentry/core"; +import type { EnvelopeItem, Transport } from "@sentry/core"; import { captureMessage, startSpan, withIsolationScope } from "@sentry/node"; import { afterEach, describe, expect, test, vi } from "vitest"; import { withEnv } from "../../src/lib/env.js"; // oxlint-disable-next-line sentry-cli/no-namespace-import -- intercept the outbound transport factory import * as transportModule from "../../src/lib/telemetry/zstd-transport.js"; import { initSentry } from "../../src/lib/telemetry.js"; +import { must } from "../helpers.js"; let client: ReturnType; @@ -46,7 +47,9 @@ describe("CI telemetry", () => { }), ); - const items = send.mock.calls.flatMap(([envelope]) => envelope[1]); + const items = send.mock.calls.flatMap( + ([envelope]): EnvelopeItem[] => must(envelope)[1], + ); for (const type of ["event", "transaction"]) { const event = items.find(([header]) => header.type === type)?.[1]; expect(event).toMatchObject({ diff --git a/packages/cli/test/lib/telemetry-credentials.test.ts b/packages/cli/test/lib/telemetry-credentials.test.ts index d250754824..c7259a03bc 100644 --- a/packages/cli/test/lib/telemetry-credentials.test.ts +++ b/packages/cli/test/lib/telemetry-credentials.test.ts @@ -1,6 +1,6 @@ import { _INTERNAL_flushLogsBuffer, - type Envelope, + type EventEnvelope, type ErrorEvent, type Transport, } from "@sentry/core"; @@ -40,7 +40,7 @@ function captureTelemetry() { // Enable capture only after every delivery route is intercepted. client.getOptions().enabled = true; // Library mode drops logs; lift that so log scrubbing is exercised too. - client.getOptions().beforeSendLog = undefined; + delete client.getOptions().beforeSendLog; client.init(); function serializedEnvelope(type: string): string { const envelope = send.mock.calls.find(([entry]) => @@ -101,7 +101,7 @@ describe("telemetry credential boundaries", () => { expect(serialized).not.toContain("SYNTHETIC"); expect(serialized).toContain("[REDACTED]"); expect(serialized).toContain('"status":500'); - expect(event.contexts?.cli_error?.detail).toBe(headerError); + expect(event.contexts?.["cli_error"]?.["detail"]).toBe(headerError); }); test("scrubs exception causes in the outgoing Sentry envelope", async () => { @@ -185,6 +185,7 @@ describe("telemetry credential boundaries", () => { const resetUrl = "http://127.0.0.1:8969/_local/v1/sessions/sdk/ui/reset?cap=LOCAL_READ_SECRET"; const event: ErrorEvent = { + type: undefined, message: `Rejected POST ${ingestUrl}`, request: { url: ingestUrl }, breadcrumbs: [{ type: "http", data: { url: streamUrl } }], @@ -205,7 +206,7 @@ describe("telemetry credential boundaries", () => { expect(serialized).toContain("/_local/v1/sessions/sdk/"); } expect(event.request?.url).toBe(ingestUrl); - expect(event.extra?.resetUrl).toBe(resetUrl); + expect(event.extra?.["resetUrl"]).toBe(resetUrl); }); test("redacts before deriving a grouping key from the first line", () => { @@ -218,8 +219,8 @@ describe("telemetry credential boundaries", () => { const data: { token: string; circular?: unknown } = { token }; data.circular = data; const bytes = new Uint8Array([1, 2, 3]); - const envelope: Envelope = [ - {}, + const envelope: EventEnvelope = [ + { event_id: "0".repeat(32), sent_at: new Date(0).toISOString() }, [ [{ type: "event" }, { extra: data }], [ diff --git a/packages/cli/test/lib/telemetry-session.test.ts b/packages/cli/test/lib/telemetry-session.test.ts index f143492522..cad81d7c2f 100644 --- a/packages/cli/test/lib/telemetry-session.test.ts +++ b/packages/cli/test/lib/telemetry-session.test.ts @@ -13,7 +13,14 @@ // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn mocking import * as Sentry from "@sentry/node"; -import { afterEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + describe, + expect, + test, + vi, + type MockInstance, +} from "vitest"; import { createBeforeExitHandler, markSessionCrashed, @@ -138,8 +145,12 @@ describe("createBeforeExitHandler", () => { }); describe("markSessionCrashed", () => { - let getCurrentScopeSpy: ReturnType; - let getIsolationScopeSpy: ReturnType; + let getCurrentScopeSpy: + | MockInstance<(typeof Sentry)["getCurrentScope"]> + | undefined; + let getIsolationScopeSpy: + | MockInstance<(typeof Sentry)["getIsolationScope"]> + | undefined; afterEach(() => { getCurrentScopeSpy?.mockRestore(); diff --git a/packages/cli/test/lib/telemetry.test.ts b/packages/cli/test/lib/telemetry.test.ts index f3ea2f705c..4f7bf4d088 100644 --- a/packages/cli/test/lib/telemetry.test.ts +++ b/packages/cli/test/lib/telemetry.test.ts @@ -15,6 +15,7 @@ import { expect, test, vi, + type MockInstance, } from "vitest"; import { formatAuthHeader } from "../../src/lib/auth-header.js"; import { Database } from "../../src/lib/db/sqlite.js"; @@ -560,9 +561,10 @@ describe("isEpipeError", () => { }); test("detects EPIPE in node_system_error context", () => { - const event = { + const event: Sentry.ErrorEvent = { + type: undefined, contexts: { node_system_error: { code: "EPIPE" } }, - } as Sentry.ErrorEvent; + }; expect(isEpipeError(event)).toBe(true); }); @@ -596,9 +598,10 @@ describe("isEbadfError", () => { }); test("detects EBADF in node_system_error context", () => { - const event = { + const event: Sentry.ErrorEvent = { + type: undefined, contexts: { node_system_error: { code: "EBADF" } }, - } as Sentry.ErrorEvent; + }; expect(isEbadfError(event)).toBe(true); }); @@ -691,7 +694,7 @@ describe("setOrgProjectContext", () => { }); describe("setFlagContext", () => { - let setTagSpy: ReturnType; + let setTagSpy: MockInstance<(typeof Sentry)["setTag"]>; beforeEach(() => { setTagSpy = vi.spyOn(Sentry, "setTag"); @@ -821,7 +824,7 @@ describe("setFlagContext", () => { }); describe("setArgsContext", () => { - let setContextSpy: ReturnType; + let setContextSpy: MockInstance<(typeof Sentry)["setContext"]>; beforeEach(() => { setContextSpy = vi.spyOn(Sentry, "setContext"); @@ -1100,7 +1103,7 @@ describe("createTracedDatabase", () => { // columnNames is bun:sqlite-specific; skip assertion on Node.js if ("columnNames" in stmt) { - expect(stmt.columnNames).toEqual(["id", "name"]); + expect(stmt["columnNames"]).toEqual(["id", "name"]); } expect(typeof stmt.toString).toBe("function"); @@ -1122,8 +1125,9 @@ describe("createTracedDatabase", () => { } // finalize() is bun:sqlite-specific; skip on Node.js - if (typeof stmt.finalize === "function") { - expect(() => stmt.finalize()).not.toThrow(); + const finalize = stmt["finalize"]; + if (typeof finalize === "function") { + expect(() => finalize.call(stmt)).not.toThrow(); } db.close(); diff --git a/packages/cli/test/lib/telemetry/offline-store.test.ts b/packages/cli/test/lib/telemetry/offline-store.test.ts index 04f9bc9f52..804fd43849 100644 --- a/packages/cli/test/lib/telemetry/offline-store.test.ts +++ b/packages/cli/test/lib/telemetry/offline-store.test.ts @@ -22,7 +22,7 @@ import { STORE_LIMITS, type StoreLimits, } from "../../../src/lib/telemetry/offline-store.js"; -import { useTestConfigDir } from "../../helpers.js"; +import { at, useTestConfigDir } from "../../helpers.js"; const DAY_MS = 24 * 60 * 60 * 1000; @@ -190,7 +190,7 @@ describe.each(["node", "wasm"] as const)( const { clock, store } = storeAt(); await store.push(transactionEnvelope("a")); clock.now += 3 * DAY_MS; - const [claimed] = store.claim(1); + const claimed = at(store.claim(1), 0); await store.push(claimed); clock.now += 2 * DAY_MS; diff --git a/packages/cli/test/lib/telemetry/offline-transport.e2e.test.ts b/packages/cli/test/lib/telemetry/offline-transport.e2e.test.ts index 1949c37e99..f0f261727f 100644 --- a/packages/cli/test/lib/telemetry/offline-transport.e2e.test.ts +++ b/packages/cli/test/lib/telemetry/offline-transport.e2e.test.ts @@ -13,7 +13,7 @@ import { afterEach, describe, expect, test } from "vitest"; import { getDatabase } from "../../../src/lib/db/index.js"; import { makeStoringTransport } from "../../../src/lib/telemetry/offline-transport.js"; import { makeCompressedTransport } from "../../../src/lib/telemetry/zstd-transport.js"; -import { useTestConfigDir } from "../../helpers.js"; +import { useTestConfigDir, at, must } from "../../helpers.js"; import { closeIngestServers, noop, @@ -52,7 +52,8 @@ function storedEventIds(): string[] { /** Event IDs in the bodies a mock ingest received (bodies are small, so uncompressed). */ function deliveredEventIds(captures: { body: Buffer }[]): string[] { return captures.map( - (capture) => JSON.parse(capture.body.toString().split("\n")[0]).event_id, + (capture) => + JSON.parse(at(capture.body.toString().split("\n"), 0)).event_id, ); } @@ -119,7 +120,7 @@ describe("makeStoringTransport (e2e)", () => { expect(deliveredEventIds(ingest.captures).sort()).toEqual(["a", "b"]); expect(storedEventIds()).toEqual([]); const header = JSON.parse( - ingest.captures[0]?.body.toString().split("\n")[0], + at(must(ingest.captures[0]?.body.toString().split("\n")), 0), ); expect(Date.parse(header.sent_at)).toBeGreaterThan(Date.now() - 60_000); }); diff --git a/packages/cli/test/lib/telemetry/zstd-transport.e2e.test.ts b/packages/cli/test/lib/telemetry/zstd-transport.e2e.test.ts index 9c0a4f4feb..17769c7d2d 100644 --- a/packages/cli/test/lib/telemetry/zstd-transport.e2e.test.ts +++ b/packages/cli/test/lib/telemetry/zstd-transport.e2e.test.ts @@ -23,6 +23,7 @@ import { startStalledIngest, startStalledProxy, } from "./ingest-servers.js"; +import { at } from "../../helpers.js"; describe("makeCompressedTransport (e2e)", () => { afterEach(closeIngestServers); @@ -53,7 +54,7 @@ describe("makeCompressedTransport (e2e)", () => { expect(captures).toHaveLength(1); expect(captures[0]?.headers["content-encoding"]).toBe("zstd"); - const decompressed = await promisify(zstdDecompress)(captures[0].body); + const decompressed = await promisify(zstdDecompress)(at(captures, 0).body); const text = Buffer.from( decompressed.buffer, decompressed.byteOffset, @@ -108,8 +109,8 @@ describe("makeCompressedTransport (e2e)", () => { test("aborts a request stalled behind a proxy", async () => { const proxy = await startStalledProxy(); - const savedProxy = process.env.http_proxy; - process.env.http_proxy = proxy.url; + const savedProxy = process.env["http_proxy"]; + process.env["http_proxy"] = proxy.url; try { const transport = makeCompressedTransport( { url: "http://127.0.0.1:9/api/0/envelope/", recordDroppedEvent: noop }, @@ -123,9 +124,9 @@ describe("makeCompressedTransport (e2e)", () => { await proxy.closed; } finally { if (savedProxy === undefined) { - delete process.env.http_proxy; + delete process.env["http_proxy"]; } else { - process.env.http_proxy = savedProxy; + process.env["http_proxy"] = savedProxy; } } }); diff --git a/packages/cli/test/lib/telemetry/zstd-transport.test.ts b/packages/cli/test/lib/telemetry/zstd-transport.test.ts index 15f83fe16b..a973b65070 100644 --- a/packages/cli/test/lib/telemetry/zstd-transport.test.ts +++ b/packages/cli/test/lib/telemetry/zstd-transport.test.ts @@ -16,6 +16,7 @@ import { EventEmitter } from "node:events"; import type { ClientRequest, IncomingHttpHeaders } from "node:http"; import { gunzipSync, zstdDecompressSync } from "node:zlib"; import { createEnvelope } from "@sentry/core"; +import type { NodeTransportOptions } from "../../../src/lib/telemetry/zstd-transport.js"; import { afterEach, beforeEach, describe, expect, test } from "vitest"; import { hasZstdSupport, @@ -26,6 +27,8 @@ import { shouldFallbackToDefault, } from "../../../src/lib/telemetry/zstd-transport.js"; +type HttpModule = NonNullable; + /** No-op for SDK callbacks that require a function but return nothing meaningful. */ function noop(): void { // intentionally empty @@ -49,31 +52,26 @@ type CapturedRequest = { * the shim and the capture buffer for test assertions. */ function buildMockHttpModule(response: MockResponseShape): { - httpModule: { - request: (opts: unknown, cb?: (res: unknown) => void) => ClientRequest; - }; + httpModule: HttpModule; captured: CapturedRequest; } { const captured: CapturedRequest = { chunks: [], options: {} }; - const httpModule = { - request: (opts: unknown, cb?: (res: unknown) => void) => { - captured.options = opts as Record; + const httpModule: HttpModule = { + request: (opts, cb) => { + captured.options = + typeof opts === "object" && !(opts instanceof URL) ? { ...opts } : {}; // The ClientRequest must behave as a Writable so that // `Readable.from(payload).pipe(req)` succeeds. We fake one from // an EventEmitter and expose `write`/`end` that push into the // captured buffer. - const req = new EventEmitter() as unknown as ClientRequest & { - write: (chunk: Buffer | string) => boolean; - end: (chunk?: Buffer | string) => void; - }; - req.write = (chunk: Buffer | string) => { + const write = (chunk: Buffer | string) => { captured.chunks.push( Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk), ); return true; }; - req.end = (chunk?: Buffer | string) => { + const end = (chunk?: Buffer | string) => { if (chunk !== undefined) { captured.chunks.push( Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk), @@ -97,7 +95,10 @@ function buildMockHttpModule(response: MockResponseShape): { }); }); }; - return req; + return Object.assign(new EventEmitter(), { + write, + end, + }) as unknown as ClientRequest; }, }; return { httpModule: httpModule, captured }; @@ -134,7 +135,7 @@ describe("makeCompressedTransport", () => { ]); await transport.send(envelope); - const headers = captured.options.headers as Record; + const headers = captured.options["headers"] as Record; expect(headers["content-encoding"]).toBe("zstd"); const wire = Buffer.concat(captured.chunks); @@ -167,7 +168,7 @@ describe("makeCompressedTransport", () => { ]); await transport.send(envelope); - const headers = captured.options.headers as Record; + const headers = captured.options["headers"] as Record; expect(headers["content-encoding"]).toBeUndefined(); // The wire body should be exactly the serialized envelope @@ -244,8 +245,8 @@ describe("makeCompressedTransport", () => { }); test("proxy configured: falls back to SDK's makeNodeTransport (no zstd applied)", async () => { - const savedProxy = process.env.https_proxy; - process.env.https_proxy = "http://proxy.internal:3128"; + const savedProxy = process.env["https_proxy"]; + process.env["https_proxy"] = "http://proxy.internal:3128"; try { // The SDK's makeNodeTransport also honors options.httpModule, so // we can route both paths through our mock and tell them apart by @@ -266,16 +267,16 @@ describe("makeCompressedTransport", () => { ]); await transport.send(envelope); - const headers = captured.options.headers as Record; + const headers = captured.options["headers"] as Record; expect(headers["content-encoding"]).toBeUndefined(); // And the wire body is the raw envelope (not zstd-compressed). const wire = Buffer.concat(captured.chunks); expect(wire.toString("utf-8")).toContain('"type":"event"'); } finally { if (savedProxy === undefined) { - delete process.env.https_proxy; + delete process.env["https_proxy"]; } else { - process.env.https_proxy = savedProxy; + process.env["https_proxy"] = savedProxy; } } }); @@ -287,15 +288,15 @@ describe("makeCompressedTransport", () => { // and records as network_error. const throwingMod = { request: (_opts: unknown, _cb?: unknown) => { - const req = new EventEmitter() as unknown as ClientRequest & { - write: (c: unknown) => boolean; - end: () => void; - }; - req.write = () => true; - req.end = () => { - process.nextTick(() => req.emit("error", new Error("ECONNREFUSED"))); - }; - return req; + const req: EventEmitter = Object.assign(new EventEmitter(), { + write: () => true, + end: () => { + process.nextTick(() => + req.emit("error", new Error("ECONNREFUSED")), + ); + }, + }); + return req as unknown as ClientRequest; }, }; const transport = makeCompressedTransport({ @@ -312,10 +313,10 @@ describe("makeCompressedTransport", () => { }); test("proxy configured + URL is no_proxy exempt: uses zstd transport", async () => { - const savedProxy = process.env.https_proxy; - const savedNoProxy = process.env.no_proxy; - process.env.https_proxy = "http://proxy.internal:3128"; - process.env.no_proxy = "example.com"; + const savedProxy = process.env["https_proxy"]; + const savedNoProxy = process.env["no_proxy"]; + process.env["https_proxy"] = "http://proxy.internal:3128"; + process.env["no_proxy"] = "example.com"; try { const { httpModule, captured } = buildMockHttpModule({ statusCode: 200, @@ -335,14 +336,14 @@ describe("makeCompressedTransport", () => { expect(captured.chunks.length).toBeGreaterThan(0); } finally { if (savedProxy === undefined) { - delete process.env.https_proxy; + delete process.env["https_proxy"]; } else { - process.env.https_proxy = savedProxy; + process.env["https_proxy"] = savedProxy; } if (savedNoProxy === undefined) { - delete process.env.no_proxy; + delete process.env["no_proxy"]; } else { - process.env.no_proxy = savedNoProxy; + process.env["no_proxy"] = savedNoProxy; } } }); @@ -430,22 +431,22 @@ describe("isNoProxyExempt", () => { let savedNoProxyUpper: string | undefined; beforeEach(() => { - savedNoProxy = process.env.no_proxy; - savedNoProxyUpper = process.env.NO_PROXY; - delete process.env.no_proxy; - delete process.env.NO_PROXY; + savedNoProxy = process.env["no_proxy"]; + savedNoProxyUpper = process.env["NO_PROXY"]; + delete process.env["no_proxy"]; + delete process.env["NO_PROXY"]; }); afterEach(() => { if (savedNoProxy === undefined) { - delete process.env.no_proxy; + delete process.env["no_proxy"]; } else { - process.env.no_proxy = savedNoProxy; + process.env["no_proxy"] = savedNoProxy; } if (savedNoProxyUpper === undefined) { - delete process.env.NO_PROXY; + delete process.env["NO_PROXY"]; } else { - process.env.NO_PROXY = savedNoProxyUpper; + process.env["NO_PROXY"] = savedNoProxyUpper; } }); @@ -454,23 +455,23 @@ describe("isNoProxyExempt", () => { }); test("suffix match in no_proxy → exempt", () => { - process.env.no_proxy = "example.com,internal.lan"; + process.env["no_proxy"] = "example.com,internal.lan"; expect(isNoProxyExempt(new URL("https://ingest.example.com/"))).toBe(true); }); test("no match → not exempt", () => { - process.env.no_proxy = "other.com"; + process.env["no_proxy"] = "other.com"; expect(isNoProxyExempt(new URL("https://ingest.example.com/"))).toBe(false); }); test("NO_PROXY (uppercase) also recognized", () => { - process.env.NO_PROXY = "example.com"; + process.env["NO_PROXY"] = "example.com"; expect(isNoProxyExempt(new URL("https://ingest.example.com/"))).toBe(true); }); test("lowercase takes precedence over uppercase", () => { - process.env.no_proxy = "other.com"; - process.env.NO_PROXY = "example.com"; + process.env["no_proxy"] = "other.com"; + process.env["NO_PROXY"] = "example.com"; // Lowercase wins → uppercase ignored → no match → not exempt expect(isNoProxyExempt(new URL("https://ingest.example.com/"))).toBe(false); }); @@ -478,12 +479,14 @@ describe("isNoProxyExempt", () => { test("trims whitespace around comma-separated entries", () => { // Common config style: `"a.com, b.com"` — both entries should match // even with the leading space after the comma. - process.env.no_proxy = "other.com, ingest.example.com"; + // Common config style: `"a.com, b.com"` — both entries should match + // even with the leading space after the comma. + process.env["no_proxy"] = "other.com, ingest.example.com"; expect(isNoProxyExempt(new URL("https://ingest.example.com/"))).toBe(true); }); test("ignores empty entries (trailing comma, double comma)", () => { - process.env.no_proxy = "other.com,, , example.com,"; + process.env["no_proxy"] = "other.com,, , example.com,"; expect(isNoProxyExempt(new URL("https://ingest.example.com/"))).toBe(true); // Empty entry must not match every host (would be true if `endsWith("")` // were ever evaluated). @@ -491,14 +494,14 @@ describe("isNoProxyExempt", () => { }); test("'*' wildcard exempts all hosts", () => { - process.env.no_proxy = "*"; + process.env["no_proxy"] = "*"; expect(isNoProxyExempt(new URL("https://ingest.example.com/"))).toBe(true); expect(isNoProxyExempt(new URL("https://anything.test/"))).toBe(true); expect(isNoProxyExempt(new URL("http://192.0.2.1:8080/"))).toBe(true); }); test("'*' wildcard alongside other entries still exempts everything", () => { - process.env.no_proxy = "specific.com, *, other.com"; + process.env["no_proxy"] = "specific.com, *, other.com"; expect(isNoProxyExempt(new URL("https://unrelated.test/"))).toBe(true); }); @@ -506,7 +509,10 @@ describe("isNoProxyExempt", () => { // The wildcard check requires `*` to be a standalone entry. // A bizarre value like `"*.example.com"` is treated as a literal // suffix: `endsWith("*.example.com")` is false for normal hosts. - process.env.no_proxy = "*.example.com"; + // The wildcard check requires `*` to be a standalone entry. + // A bizarre value like `"*.example.com"` is treated as a literal + // suffix: `endsWith("*.example.com")` is false for normal hosts. + process.env["no_proxy"] = "*.example.com"; expect(isNoProxyExempt(new URL("https://foo.example.com/"))).toBe(false); }); }); @@ -531,7 +537,12 @@ describe("shouldFallbackToDefault", () => { beforeEach(() => { for (const k of PROXY_VARS) { - saved[k] = process.env[k]; + const value = process.env[k]; + if (value === undefined) { + delete saved[k]; + } else { + saved[k] = value; + } delete process.env[k]; } }); @@ -565,36 +576,36 @@ describe("shouldFallbackToDefault", () => { }); test("lowercase https_proxy → fallback (HTTPS URL)", () => { - process.env.https_proxy = "http://proxy.internal:3128"; + process.env["https_proxy"] = "http://proxy.internal:3128"; expect(shouldFallbackToDefault(httpsUrl, opts)).toBe(true); }); test("uppercase HTTPS_PROXY → fallback (HTTPS URL)", () => { - process.env.HTTPS_PROXY = "http://proxy.internal:3128"; + process.env["HTTPS_PROXY"] = "http://proxy.internal:3128"; expect(shouldFallbackToDefault(httpsUrl, opts)).toBe(true); }); test("lowercase wins over uppercase when both are set", () => { - process.env.https_proxy = "http://winning.proxy:3128"; - process.env.HTTPS_PROXY = "http://losing.proxy:3128"; + process.env["https_proxy"] = "http://winning.proxy:3128"; + process.env["HTTPS_PROXY"] = "http://losing.proxy:3128"; // Both trigger fallback; this just asserts the lookup doesn't // crash on duplicate vars and that the function still returns true. expect(shouldFallbackToDefault(httpsUrl, opts)).toBe(true); }); test("HTTPS URL falls back to http_proxy when https_proxy is unset (matches SDK precedent)", () => { - process.env.http_proxy = "http://proxy.internal:3128"; + process.env["http_proxy"] = "http://proxy.internal:3128"; expect(shouldFallbackToDefault(httpsUrl, opts)).toBe(true); }); test("uppercase HTTP_PROXY → fallback (http URL)", () => { - process.env.HTTP_PROXY = "http://proxy.internal:3128"; + process.env["HTTP_PROXY"] = "http://proxy.internal:3128"; expect(shouldFallbackToDefault(httpUrl, opts)).toBe(true); }); test("uppercase NO_PROXY exemption keeps zstd path even with proxy set", () => { - process.env.HTTPS_PROXY = "http://proxy.internal:3128"; - process.env.NO_PROXY = "example.com"; + process.env["HTTPS_PROXY"] = "http://proxy.internal:3128"; + process.env["NO_PROXY"] = "example.com"; expect(shouldFallbackToDefault(httpsUrl, opts)).toBe(false); }); }); diff --git a/packages/cli/test/lib/time-range.property.test.ts b/packages/cli/test/lib/time-range.property.test.ts index 0beca3a12c..ea3984c897 100644 --- a/packages/cli/test/lib/time-range.property.test.ts +++ b/packages/cli/test/lib/time-range.property.test.ts @@ -21,6 +21,7 @@ import { timeRangeToSeconds, } from "../../src/lib/time-range.js"; import { DEFAULT_NUM_RUNS } from "../model-based/helpers.js"; +import { at } from "../helpers.js"; // --------------------------------------------------------------------------- // Arbitraries @@ -44,7 +45,7 @@ const sortedDatePairArb = array(isoDateArb, { minLength: 2, maxLength: 2 }).map( const sorted = [...dates].sort(); // Ensure they're different (no zero-length range issues) if (sorted[0] === sorted[1]) { - const d = new Date(sorted[1]); + const d = new Date(at(sorted, 1)); d.setDate(d.getDate() + 1); sorted[1] = d.toISOString().slice(0, 10); } diff --git a/packages/cli/test/lib/timezone.mocked.test.ts b/packages/cli/test/lib/timezone.mocked.test.ts index 8e6282a9db..2c7d6d26ca 100644 --- a/packages/cli/test/lib/timezone.mocked.test.ts +++ b/packages/cli/test/lib/timezone.mocked.test.ts @@ -167,7 +167,7 @@ describe("detectOsTimezone on Windows", () => { }); describe("initTimezone applies a detected IANA zone", () => { - const originalTz = process.env.TZ; + const originalTz = process.env["TZ"]; beforeEach(() => { setPlatform("linux"); @@ -175,14 +175,14 @@ describe("initTimezone applies a detected IANA zone", () => { afterEach(() => { if (originalTz === undefined) { - delete process.env.TZ; + delete process.env["TZ"]; } else { - process.env.TZ = originalTz; + process.env["TZ"] = originalTz; } }); test("sets TZ to the OS-detected zone when the runtime fell back to UTC", () => { - delete process.env.TZ; + delete process.env["TZ"]; // Runtime reports UTC ... vi.spyOn(Intl, "DateTimeFormat").mockReturnValue({ resolvedOptions: () => ({ timeZone: "UTC" }), @@ -193,22 +193,22 @@ describe("initTimezone applies a detected IANA zone", () => { mocks.etcTimezone = "America/Los_Angeles"; expect(initTimezone()).toBe("America/Los_Angeles"); - expect(process.env.TZ).toBe("America/Los_Angeles"); + expect(process.env["TZ"]).toBe("America/Los_Angeles"); }); test("falls back to a fixed-offset zone when the OS zone is undetectable", () => { - delete process.env.TZ; + delete process.env["TZ"]; vi.spyOn(Intl, "DateTimeFormat").mockReturnValue({ resolvedOptions: () => ({ timeZone: "UTC" }), } as unknown as Intl.DateTimeFormat); vi.spyOn(Date.prototype, "getTimezoneOffset").mockReturnValue(480); // Neither /etc/timezone nor /etc/localtime resolves → fixed-offset path. expect(initTimezone()).toBe("Etc/GMT+8"); - expect(process.env.TZ).toBe("Etc/GMT+8"); + expect(process.env["TZ"]).toBe("Etc/GMT+8"); }); test("returns null when detection yields UTC and the offset is sub-hour", () => { - delete process.env.TZ; + delete process.env["TZ"]; vi.spyOn(Intl, "DateTimeFormat").mockReturnValue({ resolvedOptions: () => ({ timeZone: "UTC" }), } as unknown as Intl.DateTimeFormat); @@ -216,6 +216,6 @@ describe("initTimezone applies a detected IANA zone", () => { // returns null and fixedOffsetZone(30) is null → no repair applied. vi.spyOn(Date.prototype, "getTimezoneOffset").mockReturnValue(30); expect(initTimezone()).toBeNull(); - expect(process.env.TZ).toBeUndefined(); + expect(process.env["TZ"]).toBeUndefined(); }); }); diff --git a/packages/cli/test/lib/timezone.test.ts b/packages/cli/test/lib/timezone.test.ts index f8a9e6549c..c2c62157d0 100644 --- a/packages/cli/test/lib/timezone.test.ts +++ b/packages/cli/test/lib/timezone.test.ts @@ -67,35 +67,35 @@ describe("detectOsTimezone", () => { }); describe("initTimezone", () => { - const originalTz = process.env.TZ; + const originalTz = process.env["TZ"]; afterEach(() => { vi.restoreAllMocks(); if (originalTz === undefined) { - delete process.env.TZ; + delete process.env["TZ"]; } else { - process.env.TZ = originalTz; + process.env["TZ"] = originalTz; } }); test("respects an already-set TZ and makes no change", () => { - process.env.TZ = "America/New_York"; + process.env["TZ"] = "America/New_York"; expect(initTimezone()).toBeNull(); - expect(process.env.TZ).toBe("America/New_York"); + expect(process.env["TZ"]).toBe("America/New_York"); }); test("does nothing when the runtime already resolved a real zone", () => { - delete process.env.TZ; + delete process.env["TZ"]; vi.spyOn(Intl, "DateTimeFormat").mockReturnValue({ resolvedOptions: () => ({ timeZone: "America/Los_Angeles" }), } as unknown as Intl.DateTimeFormat); expect(initTimezone()).toBeNull(); - expect(process.env.TZ).toBeUndefined(); + expect(process.env["TZ"]).toBeUndefined(); }); test("leaves genuine UTC machines untouched", () => { - delete process.env.TZ; + delete process.env["TZ"]; vi.spyOn(Intl, "DateTimeFormat").mockReturnValue({ resolvedOptions: () => ({ timeZone: "UTC" }), } as unknown as Intl.DateTimeFormat); @@ -103,11 +103,11 @@ describe("initTimezone", () => { vi.spyOn(Date.prototype, "getTimezoneOffset").mockReturnValue(0); expect(initTimezone()).toBeNull(); - expect(process.env.TZ).toBeUndefined(); + expect(process.env["TZ"]).toBeUndefined(); }); test("repairs the UTC fallback using the OS offset", () => { - delete process.env.TZ; + delete process.env["TZ"]; // Runtime fell back to UTC ... vi.spyOn(Intl, "DateTimeFormat").mockReturnValue({ resolvedOptions: () => ({ timeZone: "UTC" }), @@ -117,8 +117,8 @@ describe("initTimezone", () => { const applied = initTimezone(); expect(applied).not.toBeNull(); - expect(process.env.TZ).toBe(applied ?? ""); + expect(process.env["TZ"]).toBe(applied ?? ""); // Either a detected IANA name or the fixed-offset fallback. - expect(process.env.TZ?.length).toBeGreaterThan(0); + expect(process.env["TZ"]?.length).toBeGreaterThan(0); }); }); diff --git a/packages/cli/test/lib/tips.test.ts b/packages/cli/test/lib/tips.test.ts index 12584b99a8..640dfb8c9d 100644 --- a/packages/cli/test/lib/tips.test.ts +++ b/packages/cli/test/lib/tips.test.ts @@ -21,7 +21,7 @@ useTestConfigDir("test-tips-"); /** Point getEnv() at process.env with SENTRY_DISABLE_TIPS set or removed. */ function setTipsEnv(value?: string): void { const env = { ...process.env }; - delete env.SENTRY_DISABLE_TIPS; + delete env["SENTRY_DISABLE_TIPS"]; setEnv(value === undefined ? env : { ...env, SENTRY_DISABLE_TIPS: value }); } diff --git a/packages/cli/test/lib/trace-log-schema.property.test.ts b/packages/cli/test/lib/trace-log-schema.property.test.ts index a39cc2c77e..2b33dfaa24 100644 --- a/packages/cli/test/lib/trace-log-schema.property.test.ts +++ b/packages/cli/test/lib/trace-log-schema.property.test.ts @@ -103,7 +103,7 @@ describe("property: TraceLogSchema coercion", () => { const result = safeParse(TraceLogSchema, entry); expect(result.success).toBe(true); if (result.success) { - expect((result.output as Record).extra_field).toBe( + expect((result.output as Record)["extra_field"]).toBe( "should be preserved", ); } diff --git a/packages/cli/test/lib/trace-target.test.ts b/packages/cli/test/lib/trace-target.test.ts index 37694d0421..511dea7c56 100644 --- a/packages/cli/test/lib/trace-target.test.ts +++ b/packages/cli/test/lib/trace-target.test.ts @@ -11,12 +11,8 @@ import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; vi.mock("../../src/lib/api-client.js", async (importOriginal) => { const actual = await importOriginal(); - return Object.fromEntries( - Object.entries(actual).map(([key, value]) => [ - key, - typeof value === "function" ? vi.fn(value) : value, - ]), - ); + const { mockFunctionExports } = await import("../mock-exports.js"); + return mockFunctionExports(actual); }); vi.mock("../../src/lib/region.js", async (importOriginal) => { @@ -366,20 +362,20 @@ describe("trailing slashes and Sentry trace URLs (CLI-13F)", () => { let savedHost: string | undefined; beforeEach(() => { - savedUrl = process.env.SENTRY_URL; - savedHost = process.env.SENTRY_HOST; + savedUrl = process.env["SENTRY_URL"]; + savedHost = process.env["SENTRY_HOST"]; }); afterEach(() => { if (savedUrl === undefined) { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; } else { - process.env.SENTRY_URL = savedUrl; + process.env["SENTRY_URL"] = savedUrl; } if (savedHost === undefined) { - delete process.env.SENTRY_HOST; + delete process.env["SENTRY_HOST"]; } else { - process.env.SENTRY_HOST = savedHost; + process.env["SENTRY_HOST"] = savedHost; } }); @@ -473,14 +469,14 @@ describe("parsing without side effects", () => { let savedUrl: string | undefined; beforeEach(() => { - savedUrl = process.env.SENTRY_URL; + savedUrl = process.env["SENTRY_URL"]; }); afterEach(() => { if (savedUrl === undefined) { - delete process.env.SENTRY_URL; + delete process.env["SENTRY_URL"]; } else { - process.env.SENTRY_URL = savedUrl; + process.env["SENTRY_URL"] = savedUrl; } }); @@ -495,7 +491,7 @@ describe("parsing without side effects", () => { mode: "trace", trace: { baseUrl: "https://sentry.example.com" }, }); - expect(process.env.SENTRY_URL).toBe(savedUrl); + expect(process.env["SENTRY_URL"]).toBe(savedUrl); }); test("ignored extra arguments are returned as a warning", () => { diff --git a/packages/cli/test/lib/trials.test.ts b/packages/cli/test/lib/trials.test.ts index 35f149884b..a80c79d034 100644 --- a/packages/cli/test/lib/trials.test.ts +++ b/packages/cli/test/lib/trials.test.ts @@ -235,13 +235,13 @@ describe("getTrialStatus", () => { const trial = makeTrial({ isStarted: true, startDate: "2025-01-01", - endDate: tomorrow.toISOString().split("T")[0], + endDate: tomorrow.toISOString().slice(0, 10), }); expect(getTrialStatus(trial)).toBe("active"); }); test("returns 'active' when started with today as end date", () => { - const today = new Date().toISOString().split("T")[0]; + const today = new Date().toISOString().slice(0, 10); const trial = makeTrial({ isStarted: true, startDate: "2025-01-01", @@ -292,7 +292,7 @@ describe("getDaysRemaining", () => { future.setDate(future.getDate() + 10); const trial = makeTrial({ isStarted: true, - endDate: future.toISOString().split("T")[0], + endDate: future.toISOString().slice(0, 10), }); const days = getDaysRemaining(trial); expect(days).not.toBeNull(); diff --git a/packages/cli/test/lib/unknown-command-telemetry.test.ts b/packages/cli/test/lib/unknown-command-telemetry.test.ts index 8d9b6df292..0ff486794a 100644 --- a/packages/cli/test/lib/unknown-command-telemetry.test.ts +++ b/packages/cli/test/lib/unknown-command-telemetry.test.ts @@ -1,6 +1,14 @@ // oxlint-disable-next-line sentry-cli/no-namespace-import -- needed for spyOn import * as Sentry from "@sentry/node"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + beforeEach, + describe, + expect, + type MockInstance, + test, + vi, +} from "vitest"; import { runCli } from "../../src/cli.js"; import { SENTRY_CLI } from "../../src/sentry-cli.js"; import { useTestConfigDir } from "../helpers.js"; @@ -10,7 +18,7 @@ useTestConfigDir("unknown-command-telemetry-"); const SECRET = "abcd12efg0"; const originalExitCode = process.exitCode; -let setContextSpy: ReturnType; +let setContextSpy: MockInstance; beforeEach(() => { vi.spyOn(process.stdout, "write").mockReturnValue(true); diff --git a/packages/cli/test/lib/upgrade.test.ts b/packages/cli/test/lib/upgrade.test.ts index f6c2bc828d..9f528966b2 100644 --- a/packages/cli/test/lib/upgrade.test.ts +++ b/packages/cli/test/lib/upgrade.test.ts @@ -95,9 +95,9 @@ function fakeErrorProcess(message: string): FakeProc { // vi.mock() can capture the reference; tests mutate `.fn` to swap behavior. const { spawnImpl } = vi.hoisted(() => ({ spawnImpl: { - fn: (() => { - // placeholder — replaced per-test - }) as (cmd: string, args: string[], opts: object) => FakeProc, + fn: (_cmd: string, _args: string[], _opts: object): FakeProc => { + throw new Error("spawnImpl.fn is replaced before use"); + }, }, })); // Initialize with the real default now that fakeProcess is defined @@ -147,7 +147,7 @@ const { versionExists, } = await import("../../src/lib/upgrade.js"); -import { TEST_TMP_DIR, useTestConfigDir } from "../helpers.js"; +import { TEST_TMP_DIR, useTestConfigDir, at } from "../helpers.js"; // Store original fetch for restoration let originalFetch: typeof globalThis.fetch; @@ -289,6 +289,7 @@ describe("fetchLatestFromGitHub", () => { }); } controller.abort(reason); + // oxlint-disable-next-line typescript/only-throw-error -- the test rethrows the abort reason unchanged throw reason; }); @@ -1458,7 +1459,7 @@ describe("detectPackageManagerFromPath", () => { }); test("returns null when argv[1] is undefined", () => { - process.argv = [process.argv[0]]; + process.argv = [at(process.argv, 0)]; expect(detectPackageManagerFromPath()).toBeNull(); }); diff --git a/packages/cli/test/lib/version-check.test.ts b/packages/cli/test/lib/version-check.test.ts index 586d699d1b..18c49ab19d 100644 --- a/packages/cli/test/lib/version-check.test.ts +++ b/packages/cli/test/lib/version-check.test.ts @@ -155,8 +155,8 @@ describe("getUpdateNotification", () => { beforeEach(() => { // Save and clear the env var to test real implementation - savedNoUpdateCheck = process.env.SENTRY_CLI_NO_UPDATE_CHECK; - delete process.env.SENTRY_CLI_NO_UPDATE_CHECK; + savedNoUpdateCheck = process.env["SENTRY_CLI_NO_UPDATE_CHECK"]; + delete process.env["SENTRY_CLI_NO_UPDATE_CHECK"]; // Reset the in-process "already notified" latch so each test starts fresh. resetUpdateNotificationState(); // Default to TTY so the human-facing banner path is exercised. Tests @@ -167,7 +167,7 @@ describe("getUpdateNotification", () => { afterEach(() => { // Restore the env var if (savedNoUpdateCheck !== undefined) { - process.env.SENTRY_CLI_NO_UPDATE_CHECK = savedNoUpdateCheck; + process.env["SENTRY_CLI_NO_UPDATE_CHECK"] = savedNoUpdateCheck; } restoreTTY?.(); restoreTTY = undefined; @@ -272,15 +272,15 @@ describe("getErrorUpdateNotification", () => { let restoreTTY: (() => void) | undefined; beforeEach(() => { - savedNoUpdateCheck = process.env.SENTRY_CLI_NO_UPDATE_CHECK; - delete process.env.SENTRY_CLI_NO_UPDATE_CHECK; + savedNoUpdateCheck = process.env["SENTRY_CLI_NO_UPDATE_CHECK"]; + delete process.env["SENTRY_CLI_NO_UPDATE_CHECK"]; resetUpdateNotificationState(); restoreTTY = withStderrTTY(true); }); afterEach(() => { if (savedNoUpdateCheck !== undefined) { - process.env.SENTRY_CLI_NO_UPDATE_CHECK = savedNoUpdateCheck; + process.env["SENTRY_CLI_NO_UPDATE_CHECK"] = savedNoUpdateCheck; } restoreTTY?.(); restoreTTY = undefined; @@ -431,8 +431,8 @@ describe("maybeCheckForUpdateInBackground", () => { beforeEach(() => { // Save and clear the env var to test real implementation - savedNoUpdateCheck = process.env.SENTRY_CLI_NO_UPDATE_CHECK; - delete process.env.SENTRY_CLI_NO_UPDATE_CHECK; + savedNoUpdateCheck = process.env["SENTRY_CLI_NO_UPDATE_CHECK"]; + delete process.env["SENTRY_CLI_NO_UPDATE_CHECK"]; // Silence background fetch calls to GitHub API that would otherwise // hit the preload mock and produce "unexpected fetch" warnings. originalFetch = globalThis.fetch; @@ -450,7 +450,7 @@ describe("maybeCheckForUpdateInBackground", () => { globalThis.fetch = originalFetch; // Restore the env var if (savedNoUpdateCheck !== undefined) { - process.env.SENTRY_CLI_NO_UPDATE_CHECK = savedNoUpdateCheck; + process.env["SENTRY_CLI_NO_UPDATE_CHECK"] = savedNoUpdateCheck; } vi.restoreAllMocks(); }); @@ -619,6 +619,7 @@ describe("maybeCheckForUpdateInBackground", () => { init?.signal ?? (input instanceof Request ? input.signal : null); if (signal) { signals.push(signal); + // oxlint-disable-next-line typescript/prefer-promise-reject-errors -- fetch rejects with the signal's abort reason, like the platform signal.addEventListener("abort", () => reject(signal.reason)); } }), diff --git a/packages/cli/test/lib/wasm/helpers.ts b/packages/cli/test/lib/wasm/helpers.ts index 501b0c3231..05d453040f 100644 --- a/packages/cli/test/lib/wasm/helpers.ts +++ b/packages/cli/test/lib/wasm/helpers.ts @@ -6,6 +6,7 @@ * fixture built with the same bug. */ +import { at } from "../../helpers.js"; /** Magic bytes and version that open every WebAssembly module. */ export const WASM_HEADER = Uint8Array.from([ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00, @@ -42,7 +43,7 @@ export function toHex(bytes: Uint8Array): string { } /** Join byte ranges into one buffer. */ -export function concat(parts: Uint8Array[]): Uint8Array { +export function concat(parts: Uint8Array[]): Uint8Array { const total = parts.reduce((sum, part) => sum + part.length, 0); const out = new Uint8Array(total); let offset = 0; @@ -72,7 +73,7 @@ export function leb128(value: number, padTo = 0): Uint8Array { bytes.push(0x00); } for (let index = 0; index < bytes.length - 1; index++) { - bytes[index] = bytes[index] | 0x80; + bytes[index] = at(bytes, index) | 0x80; } return Uint8Array.from(bytes); } @@ -106,7 +107,7 @@ export function customSection( } /** Wrap sections in a module header. */ -export function wasmModule(sections: Uint8Array[]): Uint8Array { +export function wasmModule(sections: Uint8Array[]): Uint8Array { return concat([WASM_HEADER, ...sections]); } diff --git a/packages/cli/test/lib/windows-path.test.ts b/packages/cli/test/lib/windows-path.test.ts index cf6ee9325e..1bfcc09fed 100644 --- a/packages/cli/test/lib/windows-path.test.ts +++ b/packages/cli/test/lib/windows-path.test.ts @@ -9,7 +9,15 @@ import { randomUUID } from "node:crypto"; import { tmpdir } from "node:os"; import { join } from "node:path"; -import { afterEach, beforeEach, describe, expect, test, vi } from "vitest"; +import { + afterEach, + assert, + beforeEach, + describe, + expect, + test, + vi, +} from "vitest"; import { addToWindowsUserPath, type PowerShellRunner, @@ -30,7 +38,11 @@ describe("addToWindowsUserPath", () => { message: "Added C:\\Users\\me\\.local\\bin to your user PATH", manualCommand: null, }); - const [script, env] = run.mock.calls[0]; + // Asserted inline: the Windows registry job runs this file without the + // CLI's generated files, which ../helpers.js pulls in. + const call = run.mock.calls[0]; + assert(call, "run was not called"); + const [script, env] = call; expect(env).toEqual({ SENTRY_CLI_PATH_DIR: "C:\\Users\\me\\.local\\bin", SENTRY_CLI_PATH_KEY: USER_ENVIRONMENT_KEY, @@ -142,7 +154,7 @@ describe.runIf(process.platform === "win32")( test("treats an equivalent %VAR% entry as already present", async () => { await seedPath("%USERPROFILE%\\.local\\bin\\;C:\\Other"); - const dir = join(process.env.USERPROFILE ?? "", ".local", "BIN"); + const dir = join(process.env["USERPROFILE"] ?? "", ".local", "BIN"); const result = await addToWindowsUserPath(dir, { key }); diff --git a/packages/cli/test/mock-exports.ts b/packages/cli/test/mock-exports.ts new file mode 100644 index 0000000000..cb9c183888 --- /dev/null +++ b/packages/cli/test/mock-exports.ts @@ -0,0 +1,27 @@ +/** + * Module Mock Helpers + * + * Side-effect free, so a `vi.mock` factory can import it dynamically + * without loading the module being mocked (test/helpers.ts imports src + * modules that tests mock). + */ + +import { vi } from "vitest"; + +function isFunction(value: unknown): value is (...args: unknown[]) => unknown { + return typeof value === "function"; +} + +/** + * A copy of a module's exports with each function wrapped in `vi.fn`, + * calling through to the original. Return it from a `vi.mock` factory so + * tests can stub any export with `vi.spyOn` or `vi.mocked`. + */ +export function mockFunctionExports(actual: T): T { + return Object.fromEntries( + Object.entries(actual).map(([key, value]: [string, unknown]) => [ + key, + isFunction(value) ? vi.fn(value) : value, + ]), + ) as T; +} diff --git a/packages/cli/test/mocks/multiregion.ts b/packages/cli/test/mocks/multiregion.ts index fa22eedfb6..98ae2d5b3d 100644 --- a/packages/cli/test/mocks/multiregion.ts +++ b/packages/cli/test/mocks/multiregion.ts @@ -17,7 +17,7 @@ import usProjectsFixture from "../fixtures/regions/us/projects.json"; import userFixture from "../fixtures/user.json"; import type { MockRoute, MockServer } from "./server.js"; -import { createMockServer } from "./server.js"; +import { createMockServer, routeParam } from "./server.js"; export const TEST_TOKEN = "test-auth-token-12345"; @@ -96,9 +96,9 @@ function createRegionRoutes( method: "GET", path: "/api/0/organizations/:orgSlug/", response: (_req, params) => { - if (orgSet.has(params.orgSlug)) { + if (orgSet.has(routeParam(params, "orgSlug"))) { const org = (organizationsFixture as Array<{ slug: string }>).find( - (o) => o.slug === params.orgSlug, + (o) => o.slug === routeParam(params, "orgSlug"), ); if (org) { return { body: org }; @@ -112,8 +112,9 @@ function createRegionRoutes( method: "GET", path: "/api/0/organizations/:orgSlug/projects/", response: (_req, params) => { - if (orgSet.has(params.orgSlug)) { - const projects = projectsByOrg.get(params.orgSlug) ?? []; + if (orgSet.has(routeParam(params, "orgSlug"))) { + const projects = + projectsByOrg.get(routeParam(params, "orgSlug")) ?? []; return { body: projects }; } return { status: 404, body: notFoundFixture }; @@ -130,10 +131,11 @@ function createRegionRoutes( method: "GET", path: "/api/0/projects/:orgSlug/:projectSlug/", response: (_req, params) => { - if (orgSet.has(params.orgSlug)) { - const projects = projectsByOrg.get(params.orgSlug) ?? []; + if (orgSet.has(routeParam(params, "orgSlug"))) { + const projects = + projectsByOrg.get(routeParam(params, "orgSlug")) ?? []; const project = (projects as Array<{ slug: string }>).find( - (p) => p.slug === params.projectSlug, + (p) => p.slug === routeParam(params, "projectSlug"), ); if (project) { return { body: project }; @@ -148,7 +150,7 @@ function createRegionRoutes( method: "GET", path: "/api/0/organizations/:orgSlug/issues/", response: (req, params) => { - if (orgSet.has(params.orgSlug)) { + if (orgSet.has(routeParam(params, "orgSlug"))) { const url = new URL(req.url); const query = url.searchParams.get("query") ?? ""; const projectMatch = query.match(/project:(\S+)/); @@ -158,7 +160,8 @@ function createRegionRoutes( return { body: issues }; } // No project filter: return all issues for all projects in this org - const orgProjects = projectsByOrg.get(params.orgSlug) ?? []; + const orgProjects = + projectsByOrg.get(routeParam(params, "orgSlug")) ?? []; const allIssues = (orgProjects as Array<{ slug: string }>).flatMap( (p) => issuesByProject.get(p.slug) ?? [], ); @@ -172,8 +175,9 @@ function createRegionRoutes( method: "GET", path: "/api/0/projects/:orgSlug/:projectSlug/issues/", response: (_req, params) => { - if (orgSet.has(params.orgSlug)) { - const issues = issuesByProject.get(params.projectSlug) ?? []; + if (orgSet.has(routeParam(params, "orgSlug"))) { + const issues = + issuesByProject.get(routeParam(params, "projectSlug")) ?? []; return { body: issues }; } return { status: 404, body: notFoundFixture }; diff --git a/packages/cli/test/mocks/routes.ts b/packages/cli/test/mocks/routes.ts index 4445117430..5d2f1a812a 100644 --- a/packages/cli/test/mocks/routes.ts +++ b/packages/cli/test/mocks/routes.ts @@ -23,7 +23,7 @@ import traceSpansFixture from "../fixtures/trace-spans.json"; import transactionsFixture from "../fixtures/transactions.json"; import userFixture from "../fixtures/user.json"; import type { MockResponse, MockRoute, MockServer } from "./server.js"; -import { createMockServer } from "./server.js"; +import { createMockServer, routeParam } from "./server.js"; export const TEST_ORG = "test-org"; export const TEST_PROJECT = "test-project"; @@ -137,14 +137,15 @@ function issueIndexResponse( serverUrl: string, ): MockResponse { const supportedOrgs = [TEST_ORG, TEST_FEEDBACK_LATEST_ORG]; - if (!supportedOrgs.includes(params.orgSlug)) { + const orgSlug = params["orgSlug"]; + if (orgSlug === undefined || !supportedOrgs.includes(orgSlug)) { return { status: 404, body: notFoundFixture }; } const url = new URL(req.url); const query = url.searchParams.get("query") ?? ""; if (query.includes("issue.category:feedback")) { - return feedbackIssueIndexResponse(url, params.orgSlug, serverUrl); + return feedbackIssueIndexResponse(url, orgSlug, serverUrl); } return { body: issuesFixture }; } @@ -158,13 +159,13 @@ function issueIndexResponse( */ function resolveLogEventsBody(query: string | null) { if (query?.includes("sentry.item_id:")) { - const bracketMatch = query.match(/sentry\.item_id:\[([^\]]+)\]/); - const singleMatch = query.match(/sentry\.item_id:([0-9a-f]{32})/i); + const [, bracketIds] = query.match(/sentry\.item_id:\[([^\]]+)\]/) ?? []; + const [, singleId] = query.match(/sentry\.item_id:([0-9a-f]{32})/i) ?? []; let ids: string[] = []; - if (bracketMatch) { - ids = bracketMatch[1].split(",").map((s) => s.trim()); - } else if (singleMatch) { - ids = [singleMatch[1]]; + if (bracketIds) { + ids = bracketIds.split(",").map((s) => s.trim()); + } else if (singleId) { + ids = [singleId]; } if (ids.includes(TEST_LOG_ID)) { return logDetailFixture; @@ -204,7 +205,7 @@ export const apiRoutes: MockRoute[] = [ method: "GET", path: "/api/0/organizations/:orgSlug/", response: (_req, params) => { - if (params.orgSlug === TEST_ORG) { + if (params["orgSlug"] === TEST_ORG) { return { body: organizationFixture }; } return { status: 404, body: notFoundFixture }; @@ -233,7 +234,7 @@ export const apiRoutes: MockRoute[] = [ method: "GET", path: "/api/0/organizations/:orgSlug/projects/", response: (_req, params) => { - if (params.orgSlug === TEST_ORG) { + if (params["orgSlug"] === TEST_ORG) { return { body: projectsFixture }; } return { status: 404, body: notFoundFixture }; @@ -243,7 +244,10 @@ export const apiRoutes: MockRoute[] = [ method: "GET", path: "/api/0/projects/:orgSlug/:projectSlug/", response: (_req, params) => { - if (params.orgSlug === TEST_ORG && params.projectSlug === TEST_PROJECT) { + if ( + params["orgSlug"] === TEST_ORG && + params["projectSlug"] === TEST_PROJECT + ) { return { body: projectFixture }; } return { status: 404, body: notFoundFixture }; @@ -253,7 +257,10 @@ export const apiRoutes: MockRoute[] = [ method: "GET", path: "/api/0/projects/:orgSlug/:projectSlug/keys/", response: (_req, params) => { - if (params.orgSlug === TEST_ORG && params.projectSlug === TEST_PROJECT) { + if ( + params["orgSlug"] === TEST_ORG && + params["projectSlug"] === TEST_PROJECT + ) { return { body: projectKeysFixture }; } return { status: 404, body: notFoundFixture }; @@ -271,7 +278,10 @@ export const apiRoutes: MockRoute[] = [ method: "GET", path: "/api/0/projects/:orgSlug/:projectSlug/issues/", response: (_req, params) => { - if (params.orgSlug === TEST_ORG && params.projectSlug === TEST_PROJECT) { + if ( + params["orgSlug"] === TEST_ORG && + params["projectSlug"] === TEST_PROJECT + ) { return { body: issuesFixture }; } return { status: 404, body: notFoundFixture }; @@ -281,10 +291,10 @@ export const apiRoutes: MockRoute[] = [ method: "GET", path: "/api/0/issues/:issueId/", response: (_req, params) => { - if (params.issueId === TEST_FEEDBACK_ID) { + if (params["issueId"] === TEST_FEEDBACK_ID) { return { body: feedbackFixture }; } - if (params.issueId === TEST_ISSUE_ID) { + if (params["issueId"] === TEST_ISSUE_ID) { return { body: issueFixture }; } return { status: 404, body: notFoundFixture }; @@ -294,18 +304,21 @@ export const apiRoutes: MockRoute[] = [ method: "GET", path: "/api/0/organizations/:orgSlug/issues/:shortId/", response: (_req, params) => { - if (params.orgSlug === TEST_ORG && params.shortId === TEST_FEEDBACK_ID) { + if ( + params["orgSlug"] === TEST_ORG && + params["shortId"] === TEST_FEEDBACK_ID + ) { return { body: feedbackFixture }; } if ( - params.orgSlug === TEST_ORG && - params.shortId.toUpperCase() === TEST_FEEDBACK_SHORT_ID + params["orgSlug"] === TEST_ORG && + routeParam(params, "shortId").toUpperCase() === TEST_FEEDBACK_SHORT_ID ) { return { body: feedbackFixture }; } if ( - params.orgSlug === TEST_ORG && - params.shortId.toUpperCase() === TEST_ISSUE_SHORT_ID + params["orgSlug"] === TEST_ORG && + routeParam(params, "shortId").toUpperCase() === TEST_ISSUE_SHORT_ID ) { return { body: issueFixture }; } @@ -317,14 +330,14 @@ export const apiRoutes: MockRoute[] = [ path: "/api/0/organizations/:orgSlug/shortids/:shortId/", response: (_req, params) => { if ( - params.orgSlug === TEST_ORG && - params.shortId.toUpperCase() === TEST_FEEDBACK_SHORT_ID + params["orgSlug"] === TEST_ORG && + routeParam(params, "shortId").toUpperCase() === TEST_FEEDBACK_SHORT_ID ) { return { body: { group: feedbackFixture } }; } if ( - params.orgSlug === TEST_ORG && - params.shortId.toUpperCase() === TEST_ISSUE_SHORT_ID + params["orgSlug"] === TEST_ORG && + routeParam(params, "shortId").toUpperCase() === TEST_ISSUE_SHORT_ID ) { return { body: { group: issueFixture } }; } @@ -335,9 +348,11 @@ export const apiRoutes: MockRoute[] = [ method: "PUT", path: "/api/0/organizations/:orgSlug/issues/:issueId/", response: async (req, params) => { + const orgSlug = params["orgSlug"]; if ( - ![TEST_ORG, TEST_FEEDBACK_LATEST_ORG].includes(params.orgSlug) || - params.issueId !== TEST_FEEDBACK_ID + orgSlug === undefined || + ![TEST_ORG, TEST_FEEDBACK_LATEST_ORG].includes(orgSlug) || + params["issueId"] !== TEST_FEEDBACK_ID ) { return { status: 404, body: notFoundFixture }; } @@ -360,10 +375,16 @@ export const apiRoutes: MockRoute[] = [ method: "GET", path: "/api/0/organizations/:orgSlug/issues/:issueId/events/latest/", response: (_req, params) => { - if (params.orgSlug === TEST_ORG && params.issueId === TEST_FEEDBACK_ID) { + if ( + params["orgSlug"] === TEST_ORG && + params["issueId"] === TEST_FEEDBACK_ID + ) { return { body: feedbackEventFixture }; } - if (params.orgSlug === TEST_ORG && params.issueId === TEST_ISSUE_ID) { + if ( + params["orgSlug"] === TEST_ORG && + params["issueId"] === TEST_ISSUE_ID + ) { return { body: eventFixture }; } return { status: 404, body: notFoundFixture }; @@ -376,9 +397,9 @@ export const apiRoutes: MockRoute[] = [ path: "/api/0/projects/:orgSlug/:projectSlug/events/:eventId/", response: (_req, params) => { if ( - params.orgSlug === TEST_ORG && - params.projectSlug === TEST_PROJECT && - params.eventId === TEST_EVENT_ID + params["orgSlug"] === TEST_ORG && + params["projectSlug"] === TEST_PROJECT && + params["eventId"] === TEST_EVENT_ID ) { return { body: eventFixture }; } @@ -390,9 +411,9 @@ export const apiRoutes: MockRoute[] = [ path: "/api/0/projects/:orgSlug/:projectSlug/events/:eventId/attachments/", response: (_req, params) => { if ( - params.orgSlug === TEST_ORG && - params.projectSlug === TEST_PROJECT && - params.eventId === TEST_FEEDBACK_EVENT_ID + params["orgSlug"] === TEST_ORG && + params["projectSlug"] === TEST_PROJECT && + params["eventId"] === TEST_FEEDBACK_EVENT_ID ) { return { body: [ @@ -411,9 +432,9 @@ export const apiRoutes: MockRoute[] = [ }; } if ( - params.orgSlug === TEST_ORG && - params.projectSlug === TEST_PROJECT && - params.eventId === TEST_EVENT_ID + params["orgSlug"] === TEST_ORG && + params["projectSlug"] === TEST_PROJECT && + params["eventId"] === TEST_EVENT_ID ) { return { body: [] }; } @@ -424,7 +445,7 @@ export const apiRoutes: MockRoute[] = [ method: "GET", path: "/api/0/organizations/:orgSlug/replay-count/", response: (_req, params) => { - if (params.orgSlug === TEST_ORG) { + if (params["orgSlug"] === TEST_ORG) { return { body: { [TEST_FEEDBACK_ID]: [ @@ -443,7 +464,7 @@ export const apiRoutes: MockRoute[] = [ method: "GET", path: "/api/0/organizations/:orgSlug/events/", response: (req, params) => { - if (params.orgSlug === TEST_ORG) { + if (params["orgSlug"] === TEST_ORG) { const url = new URL(req.url); const dataset = url.searchParams.get("dataset"); const query = url.searchParams.get("query"); @@ -464,7 +485,10 @@ export const apiRoutes: MockRoute[] = [ method: "GET", path: "/api/0/organizations/:orgSlug/trace/:traceId/", response: (_req, params) => { - if (params.orgSlug === TEST_ORG && params.traceId === TEST_TRACE_ID) { + if ( + params["orgSlug"] === TEST_ORG && + params["traceId"] === TEST_TRACE_ID + ) { return { body: traceSpansFixture }; } // Empty array = no spans found for this trace @@ -477,7 +501,7 @@ export const apiRoutes: MockRoute[] = [ method: "GET", path: "/api/0/organizations/:orgSlug/trace-logs/", response: (req, params) => { - if (params.orgSlug !== TEST_ORG) { + if (params["orgSlug"] !== TEST_ORG) { return { status: 404, body: notFoundFixture }; } const url = new URL(req.url); diff --git a/packages/cli/test/mocks/server.ts b/packages/cli/test/mocks/server.ts index 035e813b6e..364b5b3f90 100644 --- a/packages/cli/test/mocks/server.ts +++ b/packages/cli/test/mocks/server.ts @@ -13,13 +13,15 @@ export type MockResponse = { headers?: Record; }; +/** JSON body a route returns as-is. */ +export type StaticResponseBody = Record | readonly unknown[]; + export type MockRoute = { method: "GET" | "POST" | "PUT" | "DELETE" | "PATCH"; /** Path pattern with optional :params (e.g., "/api/0/organizations/:orgSlug/") */ path: string; /** Static response body, or handler function for dynamic responses */ - // oxlint-disable-next-line typescript/no-redundant-type-constituents -- documents the accepted shapes - response: unknown | RouteHandler; + response: StaticResponseBody | RouteHandler; /** HTTP status code (default: 200) */ status?: number; }; @@ -33,8 +35,7 @@ type CompiledRoute = { method: string; pattern: RegExp; paramNames: string[]; - // oxlint-disable-next-line typescript/no-redundant-type-constituents -- documents the accepted shapes - response: unknown | RouteHandler; + response: StaticResponseBody | RouteHandler; status: number; }; @@ -66,10 +67,14 @@ function matchRoute( const match = pathname.match(route.pattern); if (match) { + const [, ...values] = match; const params: Record = {}; - for (let i = 0; i < route.paramNames.length; i += 1) { - params[route.paramNames[i]] = match[i + 1]; - } + route.paramNames.forEach((name, i) => { + const value = values[i]; + if (value !== undefined) { + params[name] = value; + } + }); return { route, params }; } } @@ -87,11 +92,8 @@ function isAuthorized(req: Request, validTokens: string[]): boolean { if (!authHeader) { return false; } - const match = authHeader.match(/^Bearer\s+(.+)$/i); - if (!match) { - return false; - } - return validTokens.includes(match[1]); + const [, token] = authHeader.match(/^Bearer\s+(.+)$/i) ?? []; + return token !== undefined && validTokens.includes(token); } /** Convert a Node.js IncomingMessage to a Web API Request. */ @@ -116,7 +118,11 @@ async function toWebRequest( } body = Buffer.concat(chunks).toString("utf-8"); } - return new Request(url, { method, headers, body }); + return new Request(url, { + method, + headers, + ...(body === undefined ? {} : { body }), + }); } export function createMockServer( @@ -144,6 +150,7 @@ export function createMockServer( async start() { // test mock server requires branching for route matching + // oxlint-disable-next-line typescript/no-misused-promises -- node:http ignores the handler's promise; route handlers answer every request server = createServer(async (nodeReq, nodeRes) => { const serverUrl = `http://localhost:${port}`; const req = await toWebRequest(nodeReq, serverUrl); @@ -165,11 +172,7 @@ export function createMockServer( const { route, params } = match; let responseData: MockResponse; if (typeof route.response === "function") { - responseData = await (route.response as RouteHandler)( - req, - params, - serverUrl, - ); + responseData = await route.response(req, params, serverUrl); } else { responseData = { body: route.response, status: route.status }; } @@ -204,3 +207,15 @@ export function createMockServer( }, }; } + +/** A `:name` path param of the matched route; throws if the route has none. */ +export function routeParam( + params: Record, + name: string, +): string { + const value = params[name]; + if (value === undefined) { + throw new Error(`Route has no :${name} param`); + } + return value; +} diff --git a/packages/cli/test/preload.ts b/packages/cli/test/preload.ts index b09623a471..ed0d303f64 100644 --- a/packages/cli/test/preload.ts +++ b/packages/cli/test/preload.ts @@ -8,7 +8,7 @@ // Polyfill `self` for Node.js — web worker code (e.g., grep-worker.js) references // `self.onmessage` which exists in Bun and browsers but not in Node. if (typeof globalThis.self === "undefined") { - (globalThis as Record).self = globalThis; + (globalThis as Record)["self"] = globalThis; } import { @@ -86,29 +86,37 @@ mkdirSync(testDir, { recursive: true }); // Override config directory for all tests // Note: This must match CONFIG_DIR_ENV_VAR from src/lib/config.ts -process.env.SENTRY_CONFIG_DIR = testDir; +// Override config directory for all tests +// Note: This must match CONFIG_DIR_ENV_VAR from src/lib/config.ts +process.env["SENTRY_CONFIG_DIR"] = testDir; // Clear Sentry environment variables to ensure clean state // (but preserve SENTRY_TEST_* vars for E2E tests) -delete process.env.SENTRY_DSN; -delete process.env.SENTRY_AUTH_TOKEN; -delete process.env.SENTRY_TOKEN; -delete process.env.SENTRY_CLIENT_ID; -delete process.env.SENTRY_URL; -delete process.env.SENTRY_HOST; -delete process.env.SENTRY_ORG; -delete process.env.SENTRY_PROJECT; +delete process.env["SENTRY_DSN"]; +delete process.env["SENTRY_AUTH_TOKEN"]; +delete process.env["SENTRY_TOKEN"]; +delete process.env["SENTRY_CLIENT_ID"]; +delete process.env["SENTRY_URL"]; +delete process.env["SENTRY_HOST"]; +delete process.env["SENTRY_ORG"]; +delete process.env["SENTRY_PROJECT"]; // Set a fake auth token so buildCommand's auth guard passes in tests. // Real API calls are blocked by the global fetch mock below. // Tests that specifically verify unauthenticated behavior (e.g., auth status) // mock getAuthConfig to return undefined. -process.env.SENTRY_AUTH_TOKEN = "sntrys_test-token-for-unit-tests_000000"; +// Set a fake auth token so buildCommand's auth guard passes in tests. +// Real API calls are blocked by the global fetch mock below. +// Tests that specifically verify unauthenticated behavior (e.g., auth status) +// mock getAuthConfig to return undefined. +process.env["SENTRY_AUTH_TOKEN"] = "sntrys_test-token-for-unit-tests_000000"; // Disable telemetry and background update checks in tests // This prevents Sentry SDK from keeping the process alive and making external calls -process.env.SENTRY_CLI_NO_TELEMETRY = "1"; -process.env.SENTRY_CLI_NO_UPDATE_CHECK = "1"; +// Disable telemetry and background update checks in tests +// This prevents Sentry SDK from keeping the process alive and making external calls +process.env["SENTRY_CLI_NO_TELEMETRY"] = "1"; +process.env["SENTRY_CLI_NO_UPDATE_CHECK"] = "1"; // Mock global fetch to prevent any external network calls in unit tests // Tests that need real fetch should restore it in their setup diff --git a/packages/cli/test/script/command-api.test.ts b/packages/cli/test/script/command-api.test.ts new file mode 100644 index 0000000000..9ff2004749 --- /dev/null +++ b/packages/cli/test/script/command-api.test.ts @@ -0,0 +1,56 @@ +/** + * Tests for the generated command/API references. + * + * `script/generate-command-api.ts` reads each request's query object + * statically. Keys wrapped in a call such as `omitUndefined({...})` are + * invisible to it, so the fixed `dataset` and `query` values must stay plain + * properties of the object literal. These tests catch a refactor that hides + * them. + */ + +import { readFileSync } from "node:fs"; +import { dirname, join } from "node:path"; +import { fileURLToPath } from "node:url"; +import { describe, expect, test } from "vitest"; +import type { ApiReference } from "../../src/lib/api-schema.js"; + +const pkgRoot = join(dirname(fileURLToPath(import.meta.url)), "..", ".."); + +function references(command: string): ApiReference[] { + const generated: unknown = JSON.parse( + readFileSync(join(pkgRoot, "src/generated/command-api.json"), "utf8"), + ); + if (typeof generated !== "object" || generated === null) { + throw new Error("command-api.json is not an object"); + } + const entries: unknown = Reflect.get(generated, command); + if (!Array.isArray(entries)) { + throw new Error(`command-api.json has no entry for ${command}`); + } + return entries.filter( + (entry): entry is ApiReference => + typeof entry === "object" && entry !== null && "fn" in entry, + ); +} + +const context = (query: string) => + `Known query context: ${query}. The command may add filters or requests.`; + +describe("command API references", () => { + test.each([ + [ + "sentry alert metrics list", + "listOrganizationDetectors", + "query=type:metric_issue", + ], + ["sentry log list", "listOrganizationEvents", "dataset=logs"], + ["sentry span list", "listOrganizationEvents", "dataset=spans"], + [ + "sentry trace list", + "listOrganizationEvents", + "dataset=spans, query=is_transaction:true", + ], + ])("%s records the fixed query context", (command, fn, query) => { + expect(references(command)).toContainEqual({ fn, note: context(query) }); + }); +}); diff --git a/packages/cli/test/script/dev-runner.test.ts b/packages/cli/test/script/dev-runner.test.ts index d1557aaa00..d06bf358ca 100644 --- a/packages/cli/test/script/dev-runner.test.ts +++ b/packages/cli/test/script/dev-runner.test.ts @@ -9,6 +9,7 @@ import { spawnSync } from "node:child_process"; import { readFileSync } from "node:fs"; import { join } from "node:path"; import { expect, test } from "vitest"; +import { must } from "../helpers.js"; const pkgRoot = join(import.meta.dirname, "..", ".."); const RUNNER_RE = /&& (.+) src\/bin\.ts$/; @@ -17,12 +18,12 @@ test("the cli script shares module instances with lazy requires", () => { const { scripts } = JSON.parse( readFileSync(join(pkgRoot, "package.json"), "utf-8"), ) as { scripts: Record }; - const runner = scripts.cli?.match(RUNNER_RE)?.[1]; + const runner = scripts["cli"]?.match(RUNNER_RE)?.[1]; expect(runner, "cli script runs ` src/bin.ts`").toBeDefined(); - const [command, ...args] = (runner as string).split(" "); + const [command, ...args] = must(runner, "cli runner").split(" "); const result = spawnSync( - command, + must(command, "cli runner command"), [...args, "test/fixtures/dev-runner/lazy-require.ts"], { cwd: pkgRoot, encoding: "utf-8" }, ); diff --git a/packages/cli/test/script/eval-provider.test.ts b/packages/cli/test/script/eval-provider.test.ts index ba92dd05d2..458e8b15d3 100644 --- a/packages/cli/test/script/eval-provider.test.ts +++ b/packages/cli/test/script/eval-provider.test.ts @@ -1,5 +1,6 @@ import { afterEach, describe, expect, test, vi } from "vitest"; import { resolveEvalProvider } from "../eval-common/anthropic-client.js"; +import { at, must } from "../helpers.js"; /** * Provider resolution drives which credential/endpoint the skill-eval suite uses. @@ -36,7 +37,7 @@ describe("resolveEvalProvider", () => { }); test("OpenRouter chat posts OpenAI-shaped /chat/completions with bearer key", async () => { - const fetchMock = vi.fn( + const fetchMock = vi.fn( async () => new Response( JSON.stringify({ choices: [{ message: { content: "hi there" } }] }), @@ -56,12 +57,13 @@ describe("resolveEvalProvider", () => { ); expect(text).toBe("hi there"); - const [url, init] = fetchMock.mock.calls[0]; + const [url, init] = at(fetchMock.mock.calls, 0); expect(url).toBe("https://openrouter.ai/api/v1/chat/completions"); - expect((init as RequestInit).method).toBe("POST"); - const headers = (init as RequestInit).headers as Record; - expect(headers.Authorization).toBe("Bearer or-key"); - const body = JSON.parse((init as RequestInit).body as string); + const request = must(init, "the request init"); + expect(request.method).toBe("POST"); + const headers = request.headers as Record; + expect(headers["Authorization"]).toBe("Bearer or-key"); + const body = JSON.parse(request.body as string); expect(body.model).toBe("anthropic/claude-sonnet-4.6"); expect(body.max_tokens).toBe(128); expect(body.messages).toHaveLength(2); @@ -79,7 +81,7 @@ describe("resolveEvalProvider", () => { }); test("honors OPENROUTER_BASE_URL override", async () => { - const fetchMock = vi.fn( + const fetchMock = vi.fn( async () => new Response(JSON.stringify({ choices: [] }), { status: 200 }), ); @@ -89,7 +91,7 @@ describe("resolveEvalProvider", () => { OPENROUTER_BASE_URL: "https://proxy.example/v1", }); await p?.chat("m", [], 16); - expect(fetchMock.mock.calls[0][0]).toBe( + expect(at(fetchMock.mock.calls, 0)[0]).toBe( "https://proxy.example/v1/chat/completions", ); }); diff --git a/packages/cli/test/script/generate-api-schema.test.ts b/packages/cli/test/script/generate-api-schema.test.ts index 19904638ca..d75ee31ffe 100644 --- a/packages/cli/test/script/generate-api-schema.test.ts +++ b/packages/cli/test/script/generate-api-schema.test.ts @@ -27,6 +27,7 @@ const events = { }, ], deprecated: false, + experimental: false, idempotent: true, } as const satisfies ApiOperation; diff --git a/packages/cli/test/script/source-api-usage.test.ts b/packages/cli/test/script/source-api-usage.test.ts index 6b9499a864..079ff8ab0d 100644 --- a/packages/cli/test/script/source-api-usage.test.ts +++ b/packages/cli/test/script/source-api-usage.test.ts @@ -3,6 +3,7 @@ import { analyzeSourceApiUsage, type SourceApiOperation, } from "../../script/lib/source-api-usage.js"; +import { at } from "../helpers.js"; const operations: SourceApiOperation[] = [ { @@ -167,7 +168,7 @@ describe("source API usage", () => { const analysis = analyzeSourceApiUsage(sources, [ ...operations, { - ...operations[0], + ...at(operations, 0), functionName: "anotherEvents", path: "/organizations/{org}/events/", }, diff --git a/packages/cli/test/script/ts-codegen.property.test.ts b/packages/cli/test/script/ts-codegen.property.test.ts index 4797df76b0..b9de77dd9b 100644 --- a/packages/cli/test/script/ts-codegen.property.test.ts +++ b/packages/cli/test/script/ts-codegen.property.test.ts @@ -8,7 +8,7 @@ */ import { array, assert as fcAssert, property, string } from "fast-check"; -import ts from "typescript"; +import ts from "@typescript/typescript6"; import { describe, expect, test } from "vitest"; import { f, diff --git a/packages/cli/test/script/zod-v3-stub-plugin.test.ts b/packages/cli/test/script/zod-v3-stub-plugin.test.ts index bbe0fd6332..4c23180f1d 100644 --- a/packages/cli/test/script/zod-v3-stub-plugin.test.ts +++ b/packages/cli/test/script/zod-v3-stub-plugin.test.ts @@ -80,12 +80,15 @@ describe("zodV3StubPlugin", () => { expect( inputs.filter((input) => /[\\/]zod[\\/]v3[\\/]/.test(input)), ).toEqual([]); - expect(result.jsonSchema).toMatchObject({ + expect(result["jsonSchema"]).toMatchObject({ type: "object", properties: { name: { type: "string" } }, }); - expect(result.validated).toEqual({ success: true, value: { name: "ok" } }); - expect(result.zod3Error).toBe( + expect(result["validated"]).toEqual({ + success: true, + value: { name: "ok" }, + }); + expect(result["zod3Error"]).toBe( "Zod 3 schemas are not supported in this build (zod/v3 is not bundled).", ); }); diff --git a/packages/cli/test/skill-eval/helpers/llm-client.ts b/packages/cli/test/skill-eval/helpers/llm-client.ts index 4015314210..cf1f73f9f4 100644 --- a/packages/cli/test/skill-eval/helpers/llm-client.ts +++ b/packages/cli/test/skill-eval/helpers/llm-client.ts @@ -36,11 +36,11 @@ export type LLMClient = { * @param provider - Resolved provider (OpenRouter or Anthropic direct) */ export function createClient(provider: EvalProvider): LLMClient { - const agentModels = process.env.EVAL_AGENT_MODELS - ? process.env.EVAL_AGENT_MODELS.split(",").map((m) => m.trim()) + const agentModels = process.env["EVAL_AGENT_MODELS"] + ? process.env["EVAL_AGENT_MODELS"].split(",").map((m) => m.trim()) : DEFAULT_AGENT_MODELS; - const judgeModel = process.env.EVAL_JUDGE_MODEL ?? DEFAULT_JUDGE_MODEL; + const judgeModel = process.env["EVAL_JUDGE_MODEL"] ?? DEFAULT_JUDGE_MODEL; return { provider, agentModels, judgeModel }; } diff --git a/packages/cli/test/skill-eval/helpers/verify.ts b/packages/cli/test/skill-eval/helpers/verify.ts index f9f74344a6..696abe0e06 100644 --- a/packages/cli/test/skill-eval/helpers/verify.ts +++ b/packages/cli/test/skill-eval/helpers/verify.ts @@ -10,6 +10,7 @@ import { spawn } from "node:child_process"; import { getCliCommand } from "../../fixture.js"; import type { PlannedCommand } from "./types.js"; +import { at } from "../../helpers.js"; function noop(): void { // Intentionally empty — absorbs async spawn errors @@ -36,7 +37,7 @@ function extractRoute(command: string): string[] { const route: string[] = []; for (let i = start; i < tokens.length; i++) { - const token = tokens[i]; + const token = at(tokens, i); if ( token.startsWith("-") || token.includes("/") || diff --git a/packages/cli/test/types/dashboard.property.test.ts b/packages/cli/test/types/dashboard.property.test.ts index 0a57692b2a..f9934bc904 100644 --- a/packages/cli/test/types/dashboard.property.test.ts +++ b/packages/cli/test/types/dashboard.property.test.ts @@ -15,6 +15,7 @@ import { type WidgetLayoutMode, } from "../../src/types/dashboard.js"; import { DEFAULT_NUM_RUNS } from "../model-based/helpers.js"; +import { at } from "../helpers.js"; // --------------------------------------------------------------------------- // Arbitraries @@ -116,8 +117,8 @@ describe("property: assignDefaultLayout", () => { property(array(widgetArb, { minLength: 2, maxLength: 20 }), (widgets) => { const placed = buildPlacedSequence(widgets, "sequential"); for (let i = 1; i < placed.length; i++) { - expect(placed[i].layout!.y).toBeGreaterThanOrEqual( - placed[i - 1].layout!.y, + expect(at(placed, i).layout!.y).toBeGreaterThanOrEqual( + at(placed, i - 1).layout!.y, ); } }), diff --git a/packages/cli/test/types/dashboard.test.ts b/packages/cli/test/types/dashboard.test.ts index 5108b44fb6..a51d3953ff 100644 --- a/packages/cli/test/types/dashboard.test.ts +++ b/packages/cli/test/types/dashboard.test.ts @@ -41,6 +41,7 @@ import { type WidgetDataResult, type WidgetType, } from "../../src/types/dashboard.js"; +import { at } from "../helpers.js"; // --------------------------------------------------------------------------- // Enum constants @@ -307,7 +308,7 @@ describe("DashboardWidgetInputSchema", () => { }); expect(result.success).toBe(true); if (result.success) { - expect((result.output as Record).customField).toBe( + expect((result.output as Record)["customField"]).toBe( "hello", ); } @@ -874,7 +875,7 @@ describe("stripWidgetServerFields", () => { ], }; const result = stripWidgetServerFields(widget); - const query = result.queries![0]; + const query = at(result.queries!, 0); expect(query.id).toBe("q1"); expect(query).not.toHaveProperty("widgetId"); expect(query).not.toHaveProperty("dateCreated"); From 857ee220882bf1f0abf34c41ba68827b5c0c3747 Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Sat, 14 Nov 2026 17:23:57 +0000 Subject: [PATCH 11/18] ref(mcp-core): Satisfy the strict policy and safety rules Co-Authored-By: Joshua Li <14209781+joshuarli@users.noreply.github.com> --- .../mcp-core/scripts/generate-definitions.ts | 13 +- .../scripts/generate-otel-namespaces.ts | 18 +- .../mcp-core/scripts/measure-token-cost.ts | 14 +- .../scripts/validate-skills-mapping.ts | 3 +- .../src/api-client/client-event.test.ts | 6 +- .../mcp-core/src/api-client/client.test.ts | 51 +- packages/mcp-core/src/api-client/client.ts | 487 ++++++++++-------- packages/mcp-core/src/api-client/schema.ts | 13 +- packages/mcp-core/src/api-client/types.ts | 16 +- packages/mcp-core/src/constraint-lookup.ts | 10 +- packages/mcp-core/src/errors.ts | 4 +- .../src/internal/agents/anthropic-provider.ts | 3 +- .../agents/azure-openai-provider.test.ts | 38 +- .../internal/agents/azure-openai-provider.ts | 9 +- .../internal/agents/callEmbeddedAgent.test.ts | 10 +- .../src/internal/agents/callEmbeddedAgent.ts | 4 +- .../openai-provider.integration.test.ts | 2 +- .../internal/agents/openai-provider.test.ts | 40 +- .../src/internal/agents/openai-provider.ts | 2 +- .../agents/openrouter-provider.test.ts | 37 +- .../internal/agents/openrouter-provider.ts | 22 +- .../internal/agents/provider-factory.test.ts | 126 ++--- .../src/internal/agents/provider-factory.ts | 20 +- .../agents/provider-user-agent.test.ts | 5 +- .../internal/agents/tools/dataset-fields.ts | 6 +- .../internal/agents/tools/otel-semantics.ts | 2 +- .../mcp-core/src/internal/code-location.ts | 4 +- .../src/internal/constraint-helpers.test.ts | 4 +- .../mcp-core/src/internal/error-handling.ts | 8 +- .../mcp-core/src/internal/formatting.test.ts | 6 +- packages/mcp-core/src/internal/formatting.ts | 202 ++++---- .../mcp-core/src/internal/fresh-reads.test.ts | 2 +- packages/mcp-core/src/internal/fresh-reads.ts | 2 +- .../mcp-core/src/internal/issue-helpers.ts | 6 +- .../src/internal/issue-side-quests.test.ts | 33 +- .../src/internal/issue-side-quests.ts | 24 +- .../mcp-core/src/internal/replay-timeline.ts | 76 +-- .../mcp-core/src/internal/side-quests.test.ts | 2 +- packages/mcp-core/src/internal/side-quests.ts | 2 +- .../mcp-core/src/internal/test-fixtures.ts | 2 +- .../tool-helpers/ai-conversation-actions.ts | 10 +- .../mcp-core/src/internal/tool-helpers/api.ts | 2 +- .../tool-helpers/credential-routing.ts | 9 +- .../tool-helpers/default-organization.test.ts | 24 +- .../tool-helpers/default-organization.ts | 16 +- .../src/internal/tool-helpers/issue.ts | 4 +- .../tool-helpers/resolve-region-url.ts | 2 +- .../src/internal/tool-helpers/seer.ts | 24 +- .../tool-helpers/suggested-actions.ts | 4 +- .../tool-helpers/tool-call-formatting.ts | 10 +- packages/mcp-core/src/internal/type-guards.ts | 33 ++ packages/mcp-core/src/internal/url-helpers.ts | 28 +- packages/mcp-core/src/internal/url-scope.ts | 8 +- .../mcp-core/src/internal/user-formatting.ts | 8 +- .../mcp-core/src/server.all-tools.test.ts | 6 +- packages/mcp-core/src/server.metadata.test.ts | 10 +- packages/mcp-core/src/server.test.ts | 58 +-- packages/mcp-core/src/server.ts | 22 +- packages/mcp-core/src/telem/logging.test.ts | 10 +- packages/mcp-core/src/telem/logging.ts | 14 +- packages/mcp-core/src/telem/scope.ts | 8 +- packages/mcp-core/src/telem/sentry.test.ts | 28 +- packages/mcp-core/src/telem/sentry.ts | 29 +- .../src/tools/catalog-runtime/availability.ts | 26 +- .../src/tools/catalog-runtime/search.ts | 2 +- .../catalog/analyze-issue-with-seer.test.ts | 45 +- .../catalog/create-metric-monitor.test.ts | 9 +- .../src/tools/catalog/create-monitor.ts | 17 +- .../src/tools/catalog/create-project.ts | 5 +- .../tools/catalog/create-uptime-monitor.ts | 39 +- .../tools/catalog/find-alert-rules.test.ts | 12 +- .../src/tools/catalog/find-alert-rules.ts | 2 +- .../src/tools/catalog/find-dashboards.test.ts | 18 +- .../src/tools/catalog/find-dropped-events.ts | 7 +- .../src/tools/catalog/find-monitors.test.ts | 4 +- .../src/tools/catalog/find-monitors.ts | 29 +- .../src/tools/catalog/find-organizations.ts | 4 +- .../get-agent-conversation-details.test.ts | 32 +- .../catalog/get-agent-conversation-details.ts | 90 ++-- .../src/tools/catalog/get-alert-rule.test.ts | 8 +- .../src/tools/catalog/get-alert-rule.ts | 8 +- .../catalog/get-dashboard-details.test.ts | 28 +- .../tools/catalog/get-issue-activity.test.ts | 32 +- .../src/tools/catalog/get-issue-activity.ts | 34 +- .../catalog/get-issue-breadcrumbs.test.ts | 13 +- .../get-issue-details.numeric-id.test.ts | 2 +- .../get-issue-details.structured.test.ts | 23 +- .../tools/catalog/get-issue-details.test.ts | 118 ++--- .../src/tools/catalog/get-issue-details.ts | 8 +- .../tools/catalog/get-latest-base-snapshot.ts | 12 +- .../src/tools/catalog/get-monitor-details.ts | 2 +- .../tools/catalog/get-profile-details.test.ts | 16 +- .../src/tools/catalog/get-profile-details.ts | 14 +- .../mcp-core/src/tools/catalog/get-profile.ts | 12 +- .../src/tools/catalog/get-replay-details.ts | 29 +- .../src/tools/catalog/get-sentry-mcp-info.ts | 2 +- .../tools/catalog/get-sentry-resource.test.ts | 36 +- .../src/tools/catalog/get-sentry-resource.ts | 67 ++- .../tools/catalog/get-snapshot-image.test.ts | 10 +- .../tools/catalog/get-trace-details.test.ts | 18 +- .../src/tools/catalog/get-trace-details.ts | 37 +- packages/mcp-core/src/tools/catalog/index.ts | 8 +- .../src/tools/catalog/path-traversal.test.ts | 6 +- .../search-agent-conversations.test.ts | 6 +- .../catalog/search-agent-conversations.ts | 4 +- .../src/tools/catalog/search-events.test.ts | 24 +- .../tools/catalog/search-issue-events.test.ts | 12 +- .../src/tools/catalog/search-issue-events.ts | 6 +- .../src/tools/catalog/search-issues.test.ts | 36 +- .../catalog/search-replays.structured.test.ts | 2 +- .../src/tools/catalog/support/alerts.ts | 16 +- .../tools/catalog/support/api-formatting.ts | 10 +- .../catalog/support/project-constraints.ts | 10 +- .../tools/catalog/support/uptime-monitors.ts | 17 +- .../tools/catalog/update-alert-rule.test.ts | 51 +- .../src/tools/catalog/update-alert-rule.ts | 28 +- .../src/tools/catalog/update-dsn.test.ts | 2 +- .../mcp-core/src/tools/catalog/update-dsn.ts | 23 +- .../src/tools/catalog/update-issue.test.ts | 21 +- .../src/tools/catalog/update-issue.ts | 46 +- .../catalog/update-metric-monitor.test.ts | 8 +- .../tools/catalog/update-uptime-monitor.ts | 41 +- packages/mcp-core/src/tools/catalog/whoami.ts | 7 +- packages/mcp-core/src/tools/index.ts | 2 +- .../src/tools/special/execute-tool.ts | 2 +- .../src/tools/support/alert-rule-config.ts | 4 +- .../tools/support/alert-rule-connections.ts | 14 +- .../src/tools/support/alert-rule-details.ts | 4 +- .../src/tools/support/dashboards/index.ts | 27 +- .../src/tools/support/detector-details.ts | 6 +- .../src/tools/support/event-stacktrace.ts | 15 +- .../src/tools/support/issue-event-payload.ts | 67 +-- .../src/tools/support/issue-linking/app.ts | 41 +- .../tools/support/issue-linking/index.test.ts | 2 +- .../src/tools/support/issue-linking/index.ts | 12 +- .../src/tools/support/issue-linking/tool.ts | 6 +- .../tools/support/metric-monitor-config.ts | 29 +- .../src/tools/support/metric-monitors.ts | 18 +- .../tools/support/profile/analyzer.test.ts | 27 +- .../src/tools/support/profile/analyzer.ts | 5 +- .../tools/support/profile/details-output.ts | 6 +- .../support/profile/flamegraph-output.test.ts | 39 +- .../tools/support/search-attributes/format.ts | 4 +- .../tools/support/search-attributes/search.ts | 8 +- .../src/tools/support/search-events/agent.ts | 4 +- .../search-events/dropped-events-note.ts | 2 +- .../tools/support/search-events/formatters.ts | 14 +- .../tools/support/search-events/replays.ts | 8 +- .../src/tools/support/search-events/search.ts | 51 +- .../src/tools/support/search-events/seer.ts | 13 +- .../tools/support/search-events/structured.ts | 21 +- .../tools/support/search-events/utils.test.ts | 4 +- .../src/tools/support/search-events/utils.ts | 41 +- .../support/search-issue-events/agent.ts | 9 +- .../support/search-issue-events/results.ts | 48 +- .../support/search-issue-events/utils.ts | 13 +- .../src/tools/support/search-issues/agent.ts | 9 +- .../support/search-issues/results.test.ts | 2 +- .../tools/support/search-issues/results.ts | 14 +- .../src/tools/support/snapshots/formatting.ts | 2 +- .../src/tools/support/snapshots/handlers.ts | 8 +- .../src/tools/support/snapshots/structured.ts | 13 +- .../src/tools/support/snapshots/summary.ts | 30 +- .../support/structured-stacktrace.test.ts | 6 +- .../tools/support/structured-stacktrace.ts | 2 +- .../tools/support/traces/semantic-display.ts | 16 +- packages/mcp-core/src/tools/types.ts | 6 +- .../mcp-core/src/transports/stdio.test.ts | 14 +- packages/mcp-core/src/utils/url-utils.ts | 72 ++- packages/mcp-core/src/version.ts | 2 +- packages/mcp-core/tsdown.config.ts | 34 +- 171 files changed, 2069 insertions(+), 1682 deletions(-) diff --git a/packages/mcp-core/scripts/generate-definitions.ts b/packages/mcp-core/scripts/generate-definitions.ts index 73edb70ca6..0575ae5ea9 100644 --- a/packages/mcp-core/scripts/generate-definitions.ts +++ b/packages/mcp-core/scripts/generate-definitions.ts @@ -8,6 +8,7 @@ import * as path from "node:path"; import { fileURLToPath } from "node:url"; import YAML from "yaml"; import { type ZodTypeAny, z } from "zod"; +import type { ToolDescription } from "../src/tools/types.ts"; const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); @@ -68,13 +69,7 @@ function isNonNull(value: T | null): value is T { type DefinitionTool = { name: string; - description: - | string - | ((context: { - experimentalMode: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; - }) => string); + description: ToolDescription; title: string; inputSchema: Record; outputSchema?: ZodTypeAny; @@ -386,11 +381,11 @@ function syncAgentFrontmatter(agentPath: string, toolNames: string[]) { } // parts[0] is empty (before first ---), parts[1] is frontmatter, rest is body - const frontmatterStr = parts[1]; + const [, frontmatterStr = ""] = parts; const body = parts.slice(2).join("---"); const frontmatter = YAML.parse(frontmatterStr) as Record; - frontmatter.allowedTools = toolNames; + frontmatter["allowedTools"] = toolNames; const updated = `---\n${YAML.stringify(frontmatter)}---${body}`; fs.writeFileSync(agentPath, updated); diff --git a/packages/mcp-core/scripts/generate-otel-namespaces.ts b/packages/mcp-core/scripts/generate-otel-namespaces.ts index 84f886fb43..541ebcffbd 100644 --- a/packages/mcp-core/scripts/generate-otel-namespaces.ts +++ b/packages/mcp-core/scripts/generate-otel-namespaces.ts @@ -223,7 +223,7 @@ function convertYamlToJson( namespace: string, ): JsonNamespace { // Parse YAML and validate with Zod - const parsedYaml = parseYaml(yamlContent); + const parsedYaml: unknown = parseYaml(yamlContent); const validationResult = OtelYamlFileSchema.safeParse(parsedYaml); if (!validationResult.success) { @@ -234,11 +234,10 @@ function convertYamlToJson( const otelData = validationResult.data; - if (otelData.groups.length === 0) { + const group = otelData.groups.at(0); // Take the first group + if (!group) { throw new Error(`No groups found in ${namespace}/registry.yaml`); } - - const group = otelData.groups[0]; // Take the first group const attributes: Record = {}; for (const attr of group.attributes) { @@ -329,10 +328,15 @@ async function generateNamespaceFiles() { // Check if file exists and has custom content (not from OpenTelemetry) if (existsSync(outputPath)) { const existingContent = readFileSync(outputPath, "utf8"); - const existingJson = JSON.parse(existingContent); + const existingJson: unknown = JSON.parse(existingContent); // Skip if this appears to be a custom namespace (not from OpenTelemetry) - if (existingJson.custom === true) { + if ( + typeof existingJson === "object" && + existingJson !== null && + "custom" in existingJson && + existingJson.custom === true + ) { console.log(`⏭️ Skipping custom namespace: ${namespace}`); skipped++; continue; @@ -393,7 +397,7 @@ function generateNamespacesIndex( namespaces.push({ namespace: data.namespace, description: data.description, - custom: data.custom, + ...(data.custom !== undefined && { custom: data.custom }), }); } catch (error) { console.warn(`⚠️ Failed to read ${file} for index`); diff --git a/packages/mcp-core/scripts/measure-token-cost.ts b/packages/mcp-core/scripts/measure-token-cost.ts index 2e609bff26..3ee4b8a7c1 100644 --- a/packages/mcp-core/scripts/measure-token-cost.ts +++ b/packages/mcp-core/scripts/measure-token-cost.ts @@ -12,6 +12,7 @@ import * as fs from "node:fs"; import * as path from "node:path"; import { type Tiktoken, encoding_for_model } from "tiktoken"; import { type ZodTypeAny, z } from "zod"; +import type { ToolDescription } from "../src/tools/types.ts"; // Lazy imports to avoid type bleed const toolsModule = await import("../src/tools/index.ts"); @@ -28,7 +29,7 @@ function parseArgs() { for (let i = 0; i < args.length; i++) { const arg = args[i]; if (arg === "--output" || arg === "-o") { - outputFile = args[i + 1]; + outputFile = args[i + 1] ?? null; if (!outputFile) { throw new Error("--output requires a file path"); } @@ -55,9 +56,9 @@ Examples: type ToolDefinition = { name: string; title: string; - description: string | ((context: { experimentalMode: boolean }) => string); + description: ToolDescription; inputSchema: Record; - outputSchema?: ZodTypeAny; + outputSchema?: ZodTypeAny | undefined; experimental?: boolean; hideInExperimentalMode?: boolean; deprecated?: { replacedBy: readonly string[] }; @@ -182,12 +183,13 @@ async function main() { const toolsPayload = { tools: mcpTools }; // Initialize tiktoken with GPT-4 encoding (cl100k_base) - encoder = encoding_for_model("gpt-4"); + const activeEncoder = encoding_for_model("gpt-4"); + encoder = activeEncoder; // Also calculate per-tool breakdown for reporting const toolStats = mcpTools.map((tool) => { const toolJson = JSON.stringify(tool); - const tokens = countTokens(toolJson, encoder!); + const tokens = countTokens(toolJson, activeEncoder); return { name: tool.name, @@ -198,7 +200,7 @@ async function main() { // Calculate totals - use the complete payload with tools array wrapper const payloadJson = JSON.stringify(toolsPayload); - const totalTokens = countTokens(payloadJson, encoder); + const totalTokens = countTokens(payloadJson, activeEncoder); const toolCount = toolStats.length; const avgTokensPerTool = Math.round(totalTokens / toolCount); diff --git a/packages/mcp-core/scripts/validate-skills-mapping.ts b/packages/mcp-core/scripts/validate-skills-mapping.ts index 6e8b5e05f6..93bb583bb8 100644 --- a/packages/mcp-core/scripts/validate-skills-mapping.ts +++ b/packages/mcp-core/scripts/validate-skills-mapping.ts @@ -9,7 +9,6 @@ */ import { SKILLS, getScopesForSkills, type Skill } from "../src/skills.js"; -import type { Scope } from "../src/permissions.js"; import tools from "../src/tools/index.js"; import { isCatalogInfrastructureToolName, @@ -30,7 +29,7 @@ const colors = { interface ValidationResult { skill: Skill; enabledTools: string[]; - requiredScopes: Set; + requiredScopes: Set; } /** diff --git a/packages/mcp-core/src/api-client/client-event.test.ts b/packages/mcp-core/src/api-client/client-event.test.ts index 50f233410c..eb8911c5b9 100644 --- a/packages/mcp-core/src/api-client/client-event.test.ts +++ b/packages/mcp-core/src/api-client/client-event.test.ts @@ -1,6 +1,6 @@ import { mswServer } from "@sentry/mcp-server-mocks"; import { http, HttpResponse } from "msw"; -import { afterEach, describe, expect, it, vi } from "vitest"; +import { assert, afterEach, describe, expect, it, vi } from "vitest"; import { testEvents } from "../internal/test-fixtures"; import { SentryApiService } from "./client"; import { ApiValidationError } from "@sentry/api/client"; @@ -56,7 +56,9 @@ describe("getEventForIssue context validation", () => { ); expect(log).toHaveBeenCalledTimes(1); - const output = String(log.mock.calls[0]![0]); + const [call] = log.mock.calls; + assert(call, "Expected one log call"); + const output = String(call[0]); const record = JSON.parse(output); expect(record.message).toBe("Event failed schema validation: error"); expect(record.properties.contextType).toBe(contextType); diff --git a/packages/mcp-core/src/api-client/client.test.ts b/packages/mcp-core/src/api-client/client.test.ts index eecad617e4..0e927f5d0a 100644 --- a/packages/mcp-core/src/api-client/client.test.ts +++ b/packages/mcp-core/src/api-client/client.test.ts @@ -4,7 +4,15 @@ import { teamFixture, } from "@sentry/mcp-server-mocks"; import { HttpResponse, http } from "msw"; -import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import { + assert, + afterEach, + beforeEach, + describe, + expect, + it, + vi, +} from "vitest"; import { DEFAULT_SEARCH_ISSUES_PERIOD } from "../constants"; import { ConfigurationError } from "../errors"; import { parseSentryUrl } from "../internal/url-helpers"; @@ -1918,9 +1926,14 @@ describe("rate limit retry", () => { const fetchMock = vi.fn( (_input: Request | string | URL, init?: RequestInit) => new Promise((_, reject) => { - init?.signal?.addEventListener("abort", () => - reject(init.signal?.reason), - ); + init?.signal?.addEventListener("abort", () => { + const abortReason: unknown = init.signal?.reason; + reject( + abortReason instanceof Error + ? abortReason + : new Error(String(abortReason)), + ); + }); }), ); globalThis.fetch = fetchMock; @@ -1972,8 +1985,10 @@ describe("request headers", () => { accessToken: "test-token", }).getAuthenticatedUser(); - const [, requestInit] = (globalThis.fetch as ReturnType).mock - .calls[0]!; + const [fetchCall] = (globalThis.fetch as ReturnType).mock + .calls; + assert(fetchCall, "fetch was not called"); + const [, requestInit] = fetchCall; expect(new Headers(requestInit.headers).get("User-Agent")).toBe( "sentry-mcp/0.48.0-test (https://mcp.sentry.dev)", ); @@ -2005,8 +2020,10 @@ describe("request headers", () => { await apiService.getAuthenticatedUser(); - const [, requestInit] = (globalThis.fetch as ReturnType).mock - .calls[0]!; + const [fetchCall] = (globalThis.fetch as ReturnType).mock + .calls; + assert(fetchCall, "fetch was not called"); + const [, requestInit] = fetchCall; expect(new Headers(requestInit.headers).get("X-Sentry-MCP-Client-Id")).toBe( "abc123", ); @@ -2043,8 +2060,10 @@ describe("request headers", () => { await apiService.getAuthenticatedUser(); - const [, requestInit] = (globalThis.fetch as ReturnType).mock - .calls[0]!; + const [fetchCall] = (globalThis.fetch as ReturnType).mock + .calls; + assert(fetchCall, "fetch was not called"); + const [, requestInit] = fetchCall; expect( new Headers(requestInit.headers).get("X-Sentry-MCP-Client-Id"), ).toBeNull(); @@ -2947,7 +2966,9 @@ describe("API query builders", () => { }, ]); expect(urls).toHaveLength(1); - const params = new URL(urls[0]!).searchParams; + const [url] = urls; + assert(url, "Expected one request"); + const params = new URL(url).searchParams; expect(params.get("itemType")).toBe("spans"); expect(params.get("project")).toBe("123"); expect(params.get("statsPeriod")).toBe("7d"); @@ -2985,7 +3006,9 @@ describe("API query builders", () => { }); expect(urls).toHaveLength(1); - const params = new URL(urls[0]!).searchParams; + const [url] = urls; + assert(url, "Expected one request"); + const params = new URL(url).searchParams; expect(params.get("itemType")).toBe("spans"); expect(params.get("expand")).toBe("context"); }); @@ -3554,8 +3577,8 @@ describe("API query builders", () => { }); expect(repos).toHaveLength(1); - expect(repos[0]!.externalSlug).toBeNull(); - expect(repos[0]!.externalId).toBeNull(); + expect(repos[0]?.externalSlug).toBeNull(); + expect(repos[0]?.externalId).toBeNull(); }); }); diff --git a/packages/mcp-core/src/api-client/client.ts b/packages/mcp-core/src/api-client/client.ts index 56a4d1077d..aff57526b4 100644 --- a/packages/mcp-core/src/api-client/client.ts +++ b/packages/mcp-core/src/api-client/client.ts @@ -89,6 +89,7 @@ import { z } from "zod"; import { DEFAULT_SEARCH_ISSUES_PERIOD } from "../constants"; import { ConfigurationError } from "../errors"; import { isFreshRead } from "../internal/fresh-reads"; +import { omitUndefined } from "../internal/type-guards"; import { logIssue, logWarn } from "../telem/logging"; import type { SentryProtocol } from "../types"; import { @@ -294,19 +295,19 @@ export type CrossEventQueries = { }; type ExplorerAggregateParams = { - fields?: string[]; - aggregateFunctions?: string[]; - groupByFields?: string[]; + fields?: string[] | undefined; + aggregateFunctions?: string[] | undefined; + groupByFields?: string[] | undefined; }; type ExplorerUrlParams = ExplorerAggregateParams & { organizationSlug: string; query: string; - projectId?: string; - sort?: string; - statsPeriod?: string; - start?: string; - end?: string; + projectId?: string | undefined; + sort?: string | undefined; + statsPeriod?: string | undefined; + start?: string | undefined; + end?: string | undefined; }; function formatWorkflowNameQuery(query: string): string { @@ -333,7 +334,7 @@ function formatWorkflowNameQuery(query: string): string { */ type RequestOptions = { - host?: string; + host?: string | undefined; allowStatuses?: number[]; }; @@ -381,19 +382,13 @@ export type TraceItemType = "spans" | "logs" | "tracemetrics"; export type TraceItemAttributeType = "string" | "number" | "boolean" | "array"; export type TraceItemAttributeSourceType = "sentry" | "user"; -export type TraceItemAttributeSource = { - source_type: TraceItemAttributeSourceType; - is_transformed_alias?: boolean; -}; +export type TraceItemAttributeSource = z.infer< + typeof TraceItemAttributeSourceSchema +>; -export type TraceItemAttributeContext = { - isConvention?: boolean; - brief?: string; - isDeprecated?: boolean; - details?: string[]; - examples?: Array; - replacementAttribute?: string; -}; +export type TraceItemAttributeContext = z.infer< + typeof TraceItemAttributeContextSchema +>; export type TraceItemAttribute = { key: string; @@ -558,7 +553,7 @@ const TraceItemAttributeSchema = z type: attributeType, attributeSource, ...(secondaryAliases && { secondaryAliases }), - context, + ...(context && { context }), }), ); @@ -655,13 +650,13 @@ export class SentryApiService { signal, }: { accessToken?: string | null; - host?: string; - protocol?: SentryProtocol; - clientId?: string | null; - clientName?: string | null; - clientFamily?: string | null; - utmSource?: string | null; - signal?: AbortSignal; + host?: string | undefined; + protocol?: SentryProtocol | undefined; + clientId?: string | null | undefined; + clientName?: string | null | undefined; + clientFamily?: string | null | undefined; + utmSource?: string | null | undefined; + signal?: AbortSignal | undefined; }) { this.accessToken = accessToken; this.clientId = clientId; @@ -735,7 +730,7 @@ export class SentryApiService { if (authorization === null) { throw new ConfigurationError("Malformed authentication token"); } - headers.Authorization = authorization; + headers["Authorization"] = authorization; } if (this.clientId) { headers["X-Sentry-MCP-Client-Id"] = this.clientId; @@ -778,11 +773,17 @@ export class SentryApiService { private async request( path: string, options: RequestInit = {}, - { host, allowStatuses }: { host?: string; allowStatuses?: number[] } = {}, - ): Promise { - return await this.core.request(this.origin(host), path, options, { + { + host, allowStatuses, - }); + }: { host?: string | undefined; allowStatuses?: number[] } = {}, + ): Promise { + return await this.core.request( + this.origin(host), + path, + options, + omitUndefined({ allowStatuses }), + ); } /** @@ -799,7 +800,7 @@ export class SentryApiService { private async requestJSON( path: string, options: RequestInit = {}, - requestOptions?: { host?: string }, + requestOptions?: { host?: string | undefined }, ): Promise { return await this.core.requestJson( this.origin(requestOptions?.host), @@ -889,12 +890,12 @@ export class SentryApiService { getAIConversationsUrl( organizationSlug: string, options?: { - query?: string; - project?: string[]; - environment?: string | string[]; - statsPeriod?: string; - start?: string; - end?: string; + query?: string | undefined; + project?: string[] | undefined; + environment?: string | string[] | undefined; + statsPeriod?: string | undefined; + start?: string | undefined; + end?: string | undefined; }, ): string { return getAIConversationsUrlUtil( @@ -1044,14 +1045,14 @@ export class SentryApiService { private buildDiscoverUrl(params: { organizationSlug: string; query: string; - projectId?: string; - fields?: string[]; - sort?: string; - statsPeriod?: string; - start?: string; - end?: string; - aggregateFunctions?: string[]; - groupByFields?: string[]; + projectId?: string | undefined; + fields?: string[] | undefined; + sort?: string | undefined; + statsPeriod?: string | undefined; + start?: string | undefined; + end?: string | undefined; + aggregateFunctions?: string[] | undefined; + groupByFields?: string[] | undefined; }): string { const { organizationSlug, @@ -1104,7 +1105,7 @@ export class SentryApiService { if (isAggregate) { urlParams.set("mode", "aggregate"); // For aggregate queries in Discover, set yAxis to the first aggregate function - const firstAggregate = aggregateFunctions?.[0]; + const [firstAggregate] = aggregateFunctions ?? []; if (firstAggregate !== undefined) { urlParams.set("yAxis", firstAggregate); } @@ -1178,7 +1179,11 @@ export class SentryApiService { private appendExplorerTimeParams( urlParams: URLSearchParams, - params: { statsPeriod?: string; start?: string; end?: string }, + params: { + statsPeriod?: string | undefined; + start?: string | undefined; + end?: string | undefined; + }, ): void { if (params.start && params.end) { urlParams.set("start", params.start); @@ -1436,15 +1441,15 @@ export class SentryApiService { * ``` */ async listOrganizations(params?: { - query?: string; + query?: string | undefined; limit?: number; - cursor?: string | null; + cursor?: string | null | undefined; }): Promise<{ organizations: OrganizationList; nextCursor: string | null }> { // Public SaaS lists across regions on sentry.io; single-tenant instances // keep organization discovery on their configured host. const { items, nextCursor } = await listOrganizations( this.target(this.isPublicSaas() ? "sentry.io" : this.host), - params ?? {}, + omitUndefined(params ?? {}), OrganizationListSchema, ); return { @@ -1488,12 +1493,16 @@ export class SentryApiService { */ async listTeams( organizationSlug: string, - params?: { query?: string; limit?: number; cursor?: string | null }, + params?: { + query?: string | undefined; + limit?: number; + cursor?: string | null | undefined; + }, opts?: RequestOptions, ): Promise<{ teams: TeamList; nextCursor: string | null }> { const { items, nextCursor } = await listTeams( this.target(opts?.host), - { organizationSlug, ...params }, + omitUndefined({ organizationSlug, ...params }), TeamListSchema, ); return { @@ -1542,12 +1551,16 @@ export class SentryApiService { */ async listProjects( organizationSlug: string, - params?: { query?: string; limit?: number; cursor?: string | null }, + params?: { + query?: string | undefined; + limit?: number; + cursor?: string | null | undefined; + }, opts?: RequestOptions, ): Promise<{ projects: ProjectList; nextCursor: string | null }> { const { items, nextCursor } = await listProjects( this.target(opts?.host), - { organizationSlug, ...params }, + omitUndefined({ organizationSlug, ...params }), ProjectListSchema, ); return { @@ -1565,16 +1578,16 @@ export class SentryApiService { cursor, }: { organizationSlug: string; - query?: string | null; + query?: string | null | undefined; sortBy?: "title" | "-title" | "dateCreated" | "-dateCreated"; limit?: number; - cursor?: string | null; + cursor?: string | null | undefined; }, opts?: RequestOptions, ): Promise<{ dashboards: DashboardListItem[]; nextCursor: string | null }> { const { items, nextCursor } = await listDashboards( this.target(opts?.host), - { organizationSlug, query, sortBy, limit, cursor }, + omitUndefined({ organizationSlug, query, sortBy, limit, cursor }), DashboardListSchema, ); return { dashboards: items, nextCursor }; @@ -1621,7 +1634,7 @@ export class SentryApiService { ): Promise { return await getProject( this.target(opts?.host), - { organizationSlug, projectSlugOrId, collapse }, + omitUndefined({ organizationSlug, projectSlugOrId, collapse }), ProjectSchema, ); } @@ -1656,7 +1669,7 @@ export class SentryApiService { ): Promise { return await createProject( this.target(opts?.host), - { organizationSlug, teamSlug, name, slug, platform }, + omitUndefined({ organizationSlug, teamSlug, name, slug, platform }), ProjectSchema, ); } @@ -1708,7 +1721,7 @@ export class SentryApiService { ): Promise { return await updateProject( this.target(opts?.host), - { organizationSlug, projectSlug, name, slug, platform }, + omitUndefined({ organizationSlug, projectSlug, name, slug, platform }), ProjectSchema, ); } @@ -1725,7 +1738,7 @@ export class SentryApiService { ) { return await listRepositories( this.target(opts?.host), - { organizationSlug, query }, + omitUndefined({ organizationSlug, query }), RepositoryListSchema, ); } @@ -1746,7 +1759,7 @@ export class SentryApiService { ) { return await linkProjectRepository( this.target(opts?.host), - { organizationSlug, projectSlug, repository, provider }, + omitUndefined({ organizationSlug, projectSlug, repository, provider }), ProjectRepositoryMappingSchema, ); } @@ -1774,9 +1787,9 @@ export class SentryApiService { limit, }: { organizationSlug: string; - projectSlug?: string; - query?: string; - cursor?: string; + projectSlug?: string | undefined; + query?: string | undefined; + cursor?: string | undefined; limit?: number; }, opts?: RequestOptions, @@ -1818,7 +1831,7 @@ export class SentryApiService { ruleId, }: { organizationSlug: string; - projectSlug?: string; + projectSlug?: string | undefined; ruleId: string | number; }, opts?: RequestOptions, @@ -1974,11 +1987,11 @@ export class SentryApiService { limit = 25, }: { organizationSlug: string; - projectId?: string; - types?: string[]; - query?: string; - cursor?: string; - limit?: number; + projectId?: string | undefined; + types?: string[] | undefined; + query?: string | undefined; + cursor?: string | undefined; + limit?: number | undefined; }, opts?: RequestOptions, ): Promise<{ detectors: Detector[]; nextCursor: string | null }> { @@ -2012,8 +2025,8 @@ export class SentryApiService { limit = 25, }: { organizationSlug: string; - types?: string[]; - cursor?: string; + types?: string[] | undefined; + cursor?: string | undefined; limit?: number; }, opts?: RequestOptions, @@ -2045,7 +2058,7 @@ export class SentryApiService { }: { organizationSlug: string; group: "workflow_trigger" | "action_filter"; - cursor?: string; + cursor?: string | undefined; limit?: number; }, opts?: RequestOptions, @@ -2242,9 +2255,9 @@ export class SentryApiService { organizationSlug: string; name: string; alertType: "alert_rule"; - projectId?: string | number; - cursor?: string; - limit?: number; + projectId?: string | number | undefined; + cursor?: string | undefined; + limit?: number | undefined; }, opts?: RequestOptions, ): Promise<{ data: unknown; nextCursor: string | null }> { @@ -2391,7 +2404,7 @@ export class SentryApiService { ): Promise { return await createClientKey( this.target(opts?.host), - { organizationSlug, projectSlug, name }, + omitUndefined({ organizationSlug, projectSlug, name }), ClientKeySchema, ); } @@ -2480,15 +2493,15 @@ export class SentryApiService { limit, }: { organizationSlug: string; - projectSlug?: string; - query?: string; + projectSlug?: string | undefined; + query?: string | undefined; limit?: number; }, opts?: RequestOptions, ): Promise { return await listReleases( this.target(opts?.host), - { organizationSlug, projectSlug, query, limit }, + omitUndefined({ organizationSlug, projectSlug, query, limit }), ReleaseListSchema, ); } @@ -2502,14 +2515,19 @@ export class SentryApiService { }: { organizationSlug: string; releaseVersion: string; - projectSlugOrId?: string; + projectSlugOrId?: string | undefined; includeHealth?: boolean; }, opts?: RequestOptions, ): Promise { return await getRelease( this.target(opts?.host), - { organizationSlug, releaseVersion, projectSlugOrId, includeHealth }, + omitUndefined({ + organizationSlug, + releaseVersion, + projectSlugOrId, + includeHealth, + }), ReleaseDetailsSchema, ); } @@ -2523,14 +2541,19 @@ export class SentryApiService { }: { organizationSlug: string; releaseVersion: string; - projectSlugOrId?: string; + projectSlugOrId?: string | undefined; limit?: number; }, opts?: RequestOptions, ): Promise { return await listReleaseDeploys( this.target(opts?.host), - { organizationSlug, releaseVersion, projectSlugOrId, limit }, + omitUndefined({ + organizationSlug, + releaseVersion, + projectSlugOrId, + limit, + }), DeployListSchema, ); } @@ -2544,14 +2567,19 @@ export class SentryApiService { }: { organizationSlug: string; releaseVersion: string; - projectSlugOrId?: string; + projectSlugOrId?: string | undefined; limit?: number; }, opts?: RequestOptions, ): Promise { return await listReleaseCommits( this.target(opts?.host), - { organizationSlug, releaseVersion, projectSlugOrId, limit }, + omitUndefined({ + organizationSlug, + releaseVersion, + projectSlugOrId, + limit, + }), CommitListSchema, ); } @@ -2591,17 +2619,24 @@ export class SentryApiService { limit, }: { organizationSlug: string; - projectSlug?: string; - environment?: string; - owner?: string; - query?: string; + projectSlug?: string | undefined; + environment?: string | undefined; + owner?: string | undefined; + query?: string | undefined; limit?: number; }, opts?: RequestOptions, ): Promise { return await listMonitors( this.target(opts?.host), - { organizationSlug, projectSlug, environment, owner, query, limit }, + omitUndefined({ + organizationSlug, + projectSlug, + environment, + owner, + query, + limit, + }), MonitorListSchema, ); } @@ -2614,15 +2649,20 @@ export class SentryApiService { environment, }: { organizationSlug: string; - projectSlug?: string; + projectSlug?: string | undefined; monitorSlug: string; - environment?: string; + environment?: string | undefined; }, opts?: RequestOptions, ): Promise { return await getMonitor( this.target(opts?.host), - { organizationSlug, projectSlug, monitorSlug, environment }, + omitUndefined({ + organizationSlug, + projectSlug, + monitorSlug, + environment, + }), MonitorSchema, ); } @@ -2653,10 +2693,10 @@ export class SentryApiService { organizationSlug: string; projectSlug: string; name: string; - slug?: string; - status?: "active" | "disabled"; - owner?: string; - workflowIds?: string[]; + slug?: string | undefined; + status?: "active" | "disabled" | undefined; + owner?: string | undefined; + workflowIds?: string[] | undefined; config: { schedule_type: "crontab" | "interval"; schedule: string | [number, string]; @@ -2694,7 +2734,7 @@ export class SentryApiService { const detector = DetectorSchema.parse(response); return { detector, - monitor: MonitorSchema.parse(detector.dataSources?.[0]?.queryObj), + monitor: MonitorSchema.parse(detector.dataSources?.[0]?.["queryObj"]), }; } @@ -2736,19 +2776,19 @@ export class SentryApiService { limit, }: { organizationSlug: string; - projectSlug?: string; + projectSlug?: string | undefined; monitorSlug: string; - environment?: string; - statsPeriod?: string; - start?: string; - end?: string; + environment?: string | undefined; + statsPeriod?: string | undefined; + start?: string | undefined; + end?: string | undefined; limit?: number; }, opts?: RequestOptions, ): Promise { return await listMonitorCheckIns( this.target(opts?.host), - { + omitUndefined({ organizationSlug, projectSlug, monitorSlug, @@ -2757,7 +2797,7 @@ export class SentryApiService { start, end, limit, - }, + }), MonitorCheckInListSchema, ); } @@ -2774,19 +2814,19 @@ export class SentryApiService { rollup, }: { organizationSlug: string; - projectSlug?: string; + projectSlug?: string | undefined; monitorSlug: string; - environment?: string; - statsPeriod?: string; - start?: string; - end?: string; - rollup?: number; + environment?: string | undefined; + statsPeriod?: string | undefined; + start?: string | undefined; + end?: string | undefined; + rollup?: number | undefined; }, opts?: RequestOptions, ): Promise { return await getMonitorStats( this.target(opts?.host), - { + omitUndefined({ organizationSlug, projectSlug, monitorSlug, @@ -2795,7 +2835,7 @@ export class SentryApiService { start, end, rollup, - }, + }), MonitorStatsSchema, ); } @@ -2814,10 +2854,10 @@ export class SentryApiService { limit, }: { organizationSlug: string; - projectSlug?: string; - environment?: string; - owner?: string; - query?: string; + projectSlug?: string | undefined; + environment?: string | undefined; + owner?: string | undefined; + query?: string | undefined; limit?: number; }, opts?: RequestOptions, @@ -2834,7 +2874,14 @@ export class SentryApiService { : undefined; return await listUptimeMonitors( this.target(opts?.host), - { organizationSlug, projectId, environment, owner, query, limit }, + omitUndefined({ + organizationSlug, + projectId, + environment, + owner, + query, + limit, + }), UptimeMonitorListSchema, ); } @@ -2860,16 +2907,16 @@ export class SentryApiService { organizationSlug: string; projectSlug: string; uptimeMonitorId: string; - statsPeriod?: string; - start?: string; - end?: string; + statsPeriod?: string | undefined; + start?: string | undefined; + end?: string | undefined; limit?: number; }, opts?: RequestOptions, ): Promise { return await listUptimeMonitorChecks( this.target(opts?.host), - params, + omitUndefined(params), UptimeCheckListSchema, ); } @@ -2963,10 +3010,10 @@ export class SentryApiService { }: { organizationSlug: string; dataset?: "events" | "errors" | "replays" | "search_issues"; - project?: string; - statsPeriod?: string; - start?: string; - end?: string; + project?: string | undefined; + statsPeriod?: string | undefined; + start?: string | undefined; + end?: string | undefined; useCache?: boolean; useFlagsBackend?: boolean; }, @@ -3003,9 +3050,9 @@ export class SentryApiService { organizationSlug: string; query?: string; limit?: number; - projectId?: string; + projectId?: string | undefined; sort?: string; - environment?: string | string[]; + environment?: string | string[] | undefined; statsPeriod?: string; start?: string; end?: string; @@ -3015,7 +3062,7 @@ export class SentryApiService { ): Promise { const response = await searchReplays( this.target(opts?.host), - params, + omitUndefined(params), ReplayListResponseSchema, ); return response.data; @@ -3051,14 +3098,14 @@ export class SentryApiService { }: { organizationSlug: string; itemType?: TraceItemType; - project?: string; - statsPeriod?: string; - start?: string; - end?: string; - attributeTypes?: TraceItemAttributeType[]; - substringMatch?: string; - query?: string; - context?: boolean; + project?: string | undefined; + statsPeriod?: string | undefined; + start?: string | undefined; + end?: string | undefined; + attributeTypes?: TraceItemAttributeType[] | undefined; + substringMatch?: string | undefined; + query?: string | undefined; + context?: boolean | undefined; }, opts?: RequestOptions, ): Promise { @@ -3101,11 +3148,11 @@ export class SentryApiService { fields?: string[]; query?: string; orderby?: string[]; - project?: string; - environment?: string | string[]; - statsPeriod?: string; - start?: string; - end?: string; + project?: string | undefined; + environment?: string | string[] | undefined; + statsPeriod?: string | undefined; + start?: string | undefined; + end?: string | undefined; }, opts?: RequestOptions, ): Promise { @@ -3181,7 +3228,7 @@ export class SentryApiService { projectId, }: { organizationSlug: string; - projectId?: string; + projectId?: string | undefined; }, opts?: RequestOptions, ): Promise { @@ -3277,7 +3324,7 @@ export class SentryApiService { statsPeriod = DEFAULT_SEARCH_ISSUES_PERIOD, }: { organizationSlug: string; - projectId?: string; + projectId?: string | undefined; query?: string | null; sortBy?: "user" | "freq" | "date" | "new" | "recommended"; limit?: number; @@ -3297,7 +3344,7 @@ export class SentryApiService { opts?.host, ), path: { organization_id_or_slug: organizationSlug }, - query: { + query: omitUndefined({ limit, sort: sortBy, statsPeriod, @@ -3305,8 +3352,8 @@ export class SentryApiService { // only when the parameter is missing. query: query ?? "", project: projectId ? [projectId] : undefined, - collapse: ["unhandled"], - }, + collapse: ["unhandled" as const], + }), throwOnError: true, }); return IssueListSchema.parse(data); @@ -3503,7 +3550,7 @@ export class SentryApiService { organization_id_or_slug: organizationSlug, issue_id: issueId, }, - query: { cursor }, + query: omitUndefined({ cursor }), throwOnError: true, }), ExternalIssueListSchema, @@ -3566,7 +3613,7 @@ export class SentryApiService { organization_id_or_slug: organizationSlug, issue_id: issueId, }, - query: { per_page: 100, cursor }, + query: omitUndefined({ per_page: 100, cursor }), throwOnError: true, }), IssueIntegrationListSchema, @@ -3662,9 +3709,9 @@ export class SentryApiService { }: { installationUuid: string; uri: string; - query?: string; - projectId?: string; - dependentData?: Record; + query?: string | undefined; + projectId?: string | undefined; + dependentData?: Record | undefined; }, opts?: RequestOptions, ): Promise { @@ -3853,21 +3900,23 @@ export class SentryApiService { // The API response doesn't match our expected structure at all const bodyObj = body as Record; const eventType = - typeof bodyObj.type === "string" ? bodyObj.type : String(bodyObj.type); + typeof bodyObj["type"] === "string" + ? bodyObj["type"] + : String(bodyObj["type"]); logIssue(`Event failed schema validation: ${eventType}`, { extra: { eventType, - eventId: bodyObj.id, + eventId: bodyObj["id"], validationError: parseResult.error.message, validationIssues: parseResult.error.issues, // Log the container type, not user-provided extra data. contextType: - bodyObj.context === null + bodyObj["context"] === null ? "null" - : Array.isArray(bodyObj.context) + : Array.isArray(bodyObj["context"]) ? "array" - : typeof bodyObj.context, + : typeof bodyObj["context"], }, }); @@ -3922,14 +3971,14 @@ export class SentryApiService { organizationSlug: string; projectSlug: string; file: string; - platform?: string; + platform?: string | undefined; lineNo?: number; - absPath?: string; - module?: string; - package?: string; - commitId?: string; - groupId?: string; - sdkName?: string; + absPath?: string | undefined; + module?: string | undefined; + package?: string | undefined; + commitId?: string | undefined; + groupId?: string | undefined; + sdkName?: string | undefined; signal?: AbortSignal; }, opts?: RequestOptions, @@ -3947,7 +3996,7 @@ export class SentryApiService { const body = await this.requestJSON( apiPath`/projects/${organizationSlug}/${projectSlug}/stacktrace-link/` + `?${query.toString()}`, - { signal }, + omitUndefined({ signal }), opts, ); return StacktraceLinkSchema.parse(body); @@ -3975,7 +4024,7 @@ export class SentryApiService { ): Promise { const body = await this.requestJSON( apiPath`/projects/${organizationSlug}/${projectSlug}/events/${eventId}/source-map-debug/`, - { signal }, + omitUndefined({ signal }), opts, ); return SourceMapDebugSchema.parse(body); @@ -4016,12 +4065,12 @@ export class SentryApiService { opts?.host, ), path: { organization_id_or_slug: organizationSlug, issue_id: issueId }, - query: { + query: omitUndefined({ query: query || undefined, per_page: limit, ...(statsPeriod ? { statsPeriod } : start && end ? { start, end } : {}), full: full || undefined, - }, + }), throwOnError: true, }); return data; @@ -4254,16 +4303,16 @@ export class SentryApiService { }: { organizationSlug: string; issueId: string; - status?: string; - assignedTo?: string | null; - priority?: string; - substatus?: string; - ignoreDuration?: number; - ignoreCount?: number; - ignoreWindow?: number; - ignoreUserCount?: number; - ignoreUserWindow?: number; - statusDetails?: IssueResolutionDetails; + status?: string | undefined; + assignedTo?: string | null | undefined; + priority?: string | undefined; + substatus?: string | undefined; + ignoreDuration?: number | undefined; + ignoreCount?: number | undefined; + ignoreWindow?: number | undefined; + ignoreUserCount?: number | undefined; + ignoreUserWindow?: number | undefined; + statusDetails?: IssueResolutionDetails | undefined; }, opts?: RequestOptions, ): Promise { @@ -4516,11 +4565,11 @@ export class SentryApiService { query: string; fields: string[]; limit: number; - projectId?: string; + projectId?: string | undefined; dataset?: "errors" | "tracemetrics" | "profiles"; - statsPeriod?: string; - start?: string; - end?: string; + statsPeriod?: string | undefined; + start?: string | undefined; + end?: string | undefined; sort: string; }): URLSearchParams { const queryParams = new URLSearchParams(); @@ -4557,13 +4606,13 @@ export class SentryApiService { query: string; fields: string[]; limit: number; - projectId?: string; + projectId?: string | undefined; dataset: "spans" | "logs"; - statsPeriod?: string; - start?: string; - end?: string; + statsPeriod?: string | undefined; + start?: string | undefined; + end?: string | undefined; sort: string; - crossEventQueries?: CrossEventQueries; + crossEventQueries?: CrossEventQueries | undefined; }): URLSearchParams { const queryParams = new URLSearchParams(); @@ -4626,13 +4675,13 @@ export class SentryApiService { query: string; fields: string[]; limit?: number; - projectId?: string; + projectId?: string | undefined; dataset?: EventsDataset; statsPeriod?: string; start?: string; end?: string; sort?: string; - crossEventQueries?: CrossEventQueries; + crossEventQueries?: CrossEventQueries | undefined; }, opts?: RequestOptions, ) { @@ -4702,8 +4751,8 @@ export class SentryApiService { organizationSlug: string; query: string; yAxis: string; - interval?: string; - projectId?: string; + interval?: string | undefined; + projectId?: string | undefined; dataset?: EventsDataset; statsPeriod?: string; start?: string; @@ -4745,14 +4794,14 @@ export class SentryApiService { reason, }: { organizationSlug: string; - interval?: string; - projectId?: string; + interval?: string | undefined; + projectId?: string | undefined; dataset?: EventsDataset; - statsPeriod?: string; - start?: string; - end?: string; - outcome?: string; - reason?: string; + statsPeriod?: string | undefined; + start?: string | undefined; + end?: string | undefined; + outcome?: string | undefined; + reason?: string | undefined; }, opts?: RequestOptions, ) { @@ -4789,7 +4838,7 @@ export class SentryApiService { }: { organizationSlug: string; issueId: string; - instruction?: string; + instruction?: string | undefined; }, opts?: RequestOptions, ): Promise { @@ -4966,8 +5015,8 @@ export class SentryApiService { conversationId: string; project?: string | string[]; statsPeriod?: string; - start?: string; - end?: string; + start?: string | undefined; + end?: string | undefined; perPage?: number; maxPages?: number; }, @@ -5036,14 +5085,14 @@ export class SentryApiService { cursor, }: { organizationSlug: string; - query?: string; - project?: string | string[]; - environment?: string | string[]; - statsPeriod?: string; - start?: string; - end?: string; + query?: string | undefined; + project?: string | string[] | undefined; + environment?: string | string[] | undefined; + statsPeriod?: string | undefined; + start?: string | undefined; + end?: string | undefined; limit?: number; - cursor?: string; + cursor?: string | undefined; }, opts?: RequestOptions, ): Promise<{ @@ -5205,7 +5254,7 @@ export class SentryApiService { ); // Normalize the Sentry {chunk: ...} wrapper to the internal chunks array. const [chunk] = response.chunks; - if (chunk === undefined) { + if (!chunk) { throw new ApiNotFoundError( `No profile chunk found for profiler_id ${params.profilerId}`, undefined, @@ -5273,11 +5322,11 @@ export class SentryApiService { async getLatestBaseSnapshot(params: { organizationSlug: string; appId: string; - branch?: string; - project?: string; - projectSlug?: string; + branch?: string | undefined; + project?: string | undefined; + projectSlug?: string | undefined; compactMetadata?: boolean; }): Promise { - return await getLatestBaseSnapshot(this.target(), params); + return await getLatestBaseSnapshot(this.target(), omitUndefined(params)); } } diff --git a/packages/mcp-core/src/api-client/schema.ts b/packages/mcp-core/src/api-client/schema.ts index 70a658e71d..79b4a826f5 100644 --- a/packages/mcp-core/src/api-client/schema.ts +++ b/packages/mcp-core/src/api-client/schema.ts @@ -1078,7 +1078,8 @@ const EventTagsSchema = z.preprocess((value) => { // Sentry can occasionally return malformed tag entries (e.g. null keys). // Drop invalid tags so event parsing can still succeed. - return value.filter((tag) => { + const tags: unknown[] = value; + return tags.filter((tag) => { if (typeof tag !== "object" || tag === null) { return false; } @@ -2123,15 +2124,15 @@ export const FlamegraphSchema = z.preprocess( // parseable so tools can render the explicit no-profile-data result. const body = value as Record; const metadata = - body.metadata && typeof body.metadata === "object" - ? (body.metadata as Record) + body["metadata"] && typeof body["metadata"] === "object" + ? (body["metadata"] as Record) : {}; return { ...body, - platform: body.platform ?? metadata.platform, - projectID: body.projectID ?? metadata.projectID, - transactionName: body.transactionName ?? metadata.transactionName, + platform: body["platform"] ?? metadata["platform"], + projectID: body["projectID"] ?? metadata["projectID"], + transactionName: body["transactionName"] ?? metadata["transactionName"], }; }, z diff --git a/packages/mcp-core/src/api-client/types.ts b/packages/mcp-core/src/api-client/types.ts index fa86a5da52..505c8cd1f1 100644 --- a/packages/mcp-core/src/api-client/types.ts +++ b/packages/mcp-core/src/api-client/types.ts @@ -163,16 +163,16 @@ export type AlertRuleProjectScope = z.infer; export type Detector = z.infer; export type MetricMonitorUpdate = { name?: string; - description?: string | null; + description?: string | null | undefined; enabled?: boolean; - owner?: string | null; + owner?: string | null | undefined; workflowIds?: string[]; config?: Record; conditionGroup?: { - id?: string | number; + id?: string | number | undefined; logicType: string; conditions: Array<{ - id?: string | number; + id?: string | number | undefined; type: string; comparison: unknown; conditionResult: unknown; @@ -185,7 +185,7 @@ export type MetricMonitorUpdate = { timeWindow: number; environment: string | null; eventTypes: string[]; - extrapolationMode?: string | null; + extrapolationMode?: string | null | undefined; }>; }; export type MetricMonitorCreate = Pick< @@ -202,9 +202,9 @@ export type AlertRuleUpdate = { name: string; enabled: boolean; config?: Record; - environment?: string | null; - owner?: string | null; - triggers?: NonNullable; + environment?: string | null | undefined; + owner?: string | null | undefined; + triggers?: NonNullable | undefined; actionFilters?: NonNullable; detectorIds?: string[]; }; diff --git a/packages/mcp-core/src/constraint-lookup.ts b/packages/mcp-core/src/constraint-lookup.ts index 7bcbcc5764..eb98e75bfe 100644 --- a/packages/mcp-core/src/constraint-lookup.ts +++ b/packages/mcp-core/src/constraint-lookup.ts @@ -22,11 +22,13 @@ import { validateRegionUrl } from "./internal/tool-helpers/validate-region-url"; /** Rejects a lookup that took longer than its time limit. */ export class ConstraintLookupTimeoutError extends Error { - constructor( - readonly resource: "organization" | "project", - readonly timeoutMs: number, - ) { + readonly resource: "organization" | "project"; + readonly timeoutMs: number; + + constructor(resource: "organization" | "project", timeoutMs: number) { super(`The ${resource} lookup timed out after ${timeoutMs}ms`); + this.resource = resource; + this.timeoutMs = timeoutMs; this.name = "ConstraintLookupTimeoutError"; } } diff --git a/packages/mcp-core/src/errors.ts b/packages/mcp-core/src/errors.ts index 5ccb014b90..2ab93b1820 100644 --- a/packages/mcp-core/src/errors.ts +++ b/packages/mcp-core/src/errors.ts @@ -19,7 +19,7 @@ export type AgentExecutionErrorOptions = ErrorOptions & { * Sentry event id from the single logIssue call that already reported this * unexpected agent failure. Downstream handlers must not file another issue. */ - eventId?: string; + eventId?: string | undefined; }; /** @@ -32,7 +32,7 @@ export type AgentExecutionErrorOptions = ErrorOptions & { * is filed before this error is thrown; do not call logIssue again for it. */ export class AgentExecutionError extends Error { - readonly eventId?: string; + readonly eventId?: string | undefined; constructor(message: string, options?: AgentExecutionErrorOptions) { super(message, options); diff --git a/packages/mcp-core/src/internal/agents/anthropic-provider.ts b/packages/mcp-core/src/internal/agents/anthropic-provider.ts index d08d35274c..6858e21212 100644 --- a/packages/mcp-core/src/internal/agents/anthropic-provider.ts +++ b/packages/mcp-core/src/internal/agents/anthropic-provider.ts @@ -25,7 +25,8 @@ export function setAnthropicBaseUrl(baseUrl: string | undefined): void { * - Base URL: Must be set via setAnthropicBaseUrl() - NOT from env vars (security risk) */ export function getAnthropicModel(model?: string): LanguageModel { - const defaultModel = process.env.ANTHROPIC_MODEL || DEFAULT_ANTHROPIC_MODEL; + const defaultModel = + process.env["ANTHROPIC_MODEL"] || DEFAULT_ANTHROPIC_MODEL; const factory = createAnthropic({ ...(configuredBaseUrl && { baseURL: configuredBaseUrl }), diff --git a/packages/mcp-core/src/internal/agents/azure-openai-provider.test.ts b/packages/mcp-core/src/internal/agents/azure-openai-provider.test.ts index caff5cc055..0498914a23 100644 --- a/packages/mcp-core/src/internal/agents/azure-openai-provider.test.ts +++ b/packages/mcp-core/src/internal/agents/azure-openai-provider.test.ts @@ -9,41 +9,41 @@ import { } from "./azure-openai-provider.js"; describe("azure-openai-provider", () => { - const originalModel = process.env.OPENAI_MODEL; - const originalApiKey = process.env.OPENAI_API_KEY; - const originalOpenRouterApiKey = process.env.OPENROUTER_API_KEY; - const originalApiVersion = process.env.OPENAI_API_VERSION; + const originalModel = process.env["OPENAI_MODEL"]; + const originalApiKey = process.env["OPENAI_API_KEY"]; + const originalOpenRouterApiKey = process.env["OPENROUTER_API_KEY"]; + const originalApiVersion = process.env["OPENAI_API_VERSION"]; beforeEach(() => { setAzureOpenAIBaseUrl(undefined); - delete process.env.OPENAI_MODEL; - delete process.env.OPENROUTER_API_KEY; - delete process.env.OPENAI_API_VERSION; + delete process.env["OPENAI_MODEL"]; + delete process.env["OPENROUTER_API_KEY"]; + delete process.env["OPENAI_API_VERSION"]; }); afterEach(() => { if (originalModel === undefined) { - delete process.env.OPENAI_MODEL; + delete process.env["OPENAI_MODEL"]; } else { - process.env.OPENAI_MODEL = originalModel; + process.env["OPENAI_MODEL"] = originalModel; } if (originalApiKey === undefined) { - delete process.env.OPENAI_API_KEY; + delete process.env["OPENAI_API_KEY"]; } else { - process.env.OPENAI_API_KEY = originalApiKey; + process.env["OPENAI_API_KEY"] = originalApiKey; } if (originalOpenRouterApiKey === undefined) { - delete process.env.OPENROUTER_API_KEY; + delete process.env["OPENROUTER_API_KEY"]; } else { - process.env.OPENROUTER_API_KEY = originalOpenRouterApiKey; + process.env["OPENROUTER_API_KEY"] = originalOpenRouterApiKey; } if (originalApiVersion === undefined) { - delete process.env.OPENAI_API_VERSION; + delete process.env["OPENAI_API_VERSION"]; } else { - process.env.OPENAI_API_VERSION = originalApiVersion; + process.env["OPENAI_API_VERSION"] = originalApiVersion; } vi.unstubAllGlobals(); @@ -64,8 +64,8 @@ describe("azure-openai-provider", () => { }); it("uses responses API for Azure v1 endpoints", async () => { - process.env.OPENAI_API_KEY = "test-key"; - process.env.OPENAI_API_VERSION = "2024-02-15-preview"; + process.env["OPENAI_API_KEY"] = "test-key"; + process.env["OPENAI_API_VERSION"] = "2024-02-15-preview"; setAzureOpenAIBaseUrl("https://proxy.example.com/openai/v1/"); let requestUrl: string | undefined; let apiKeyHeader: string | null | undefined; @@ -112,8 +112,8 @@ describe("azure-openai-provider", () => { }); it("uses chat completions for deployment-style Azure endpoints", async () => { - process.env.OPENAI_API_KEY = "test-key"; - process.env.OPENAI_API_VERSION = "2024-02-15-preview"; + process.env["OPENAI_API_KEY"] = "test-key"; + process.env["OPENAI_API_VERSION"] = "2024-02-15-preview"; setAzureOpenAIBaseUrl( "https://proxy.example.com/openai/deployments/test-model", ); diff --git a/packages/mcp-core/src/internal/agents/azure-openai-provider.ts b/packages/mcp-core/src/internal/agents/azure-openai-provider.ts index c240fbe515..bfc247b426 100644 --- a/packages/mcp-core/src/internal/agents/azure-openai-provider.ts +++ b/packages/mcp-core/src/internal/agents/azure-openai-provider.ts @@ -44,7 +44,7 @@ export function getAzureOpenAIApiSurface(): AzureOpenAIApiSurface { } function getAzureOpenAIApiVersion(): string | undefined { - const apiVersion = process.env.OPENAI_API_VERSION?.trim(); + const apiVersion = process.env["OPENAI_API_VERSION"]?.trim(); return apiVersion && apiVersion.length > 0 ? apiVersion : undefined; } @@ -72,10 +72,10 @@ function createAzureOpenAIFetch(baseUrl: string): typeof fetch { } } - if (process.env.OPENAI_API_KEY) { + if (process.env["OPENAI_API_KEY"]) { // Azure API-key auth uses the `api-key` header. Keep the existing // Authorization header as well for proxy compatibility. - headers.set("api-key", process.env.OPENAI_API_KEY); + headers.set("api-key", process.env["OPENAI_API_KEY"]); } if (input instanceof Request) { @@ -100,7 +100,8 @@ export function getAzureOpenAIModel(model?: string): LanguageModel { } const apiSurface = getAzureOpenAIApiSurface(); - const modelId = model ?? (process.env.OPENAI_MODEL || DEFAULT_OPENAI_MODEL); + const modelId = + model ?? (process.env["OPENAI_MODEL"] || DEFAULT_OPENAI_MODEL); const factory = createOpenAI({ baseURL: configuredBaseUrl, diff --git a/packages/mcp-core/src/internal/agents/callEmbeddedAgent.test.ts b/packages/mcp-core/src/internal/agents/callEmbeddedAgent.test.ts index c7aef39175..058b8eed30 100644 --- a/packages/mcp-core/src/internal/agents/callEmbeddedAgent.test.ts +++ b/packages/mcp-core/src/internal/agents/callEmbeddedAgent.test.ts @@ -6,7 +6,7 @@ import { NoOutputGeneratedError, RetryError, type StepResult, - type Tool, + type ToolSet, } from "ai"; import { beforeEach, describe, expect, it, vi } from "vitest"; import { z } from "zod"; @@ -64,8 +64,8 @@ describe("callEmbeddedAgent", () => { "./provider-factory", ); vi.mocked(getAgentProvider).mockImplementation(actual.getAgentProvider); - process.env.OPENAI_API_KEY = "test-key"; - process.env.OPENROUTER_API_KEY = ""; + process.env["OPENAI_API_KEY"] = "test-key"; + process.env["OPENROUTER_API_KEY"] = ""; }); it("keeps the five-step limit when no finalization condition is supplied", async () => { @@ -85,9 +85,7 @@ describe("callEmbeddedAgent", () => { throw new Error("Expected a stop condition"); } - const step = { toolResults: [{ output: false }] } as StepResult< - Record - >; + const step = { toolResults: [{ output: false }] } as StepResult; const firstFour = Array.from({ length: 4 }, () => step); expect(stopWhen({ steps: firstFour })).toBe(false); expect(stopWhen({ steps: [...firstFour, step] })).toBe(true); diff --git a/packages/mcp-core/src/internal/agents/callEmbeddedAgent.ts b/packages/mcp-core/src/internal/agents/callEmbeddedAgent.ts index c8409283fc..aa4a54a6e7 100644 --- a/packages/mcp-core/src/internal/agents/callEmbeddedAgent.ts +++ b/packages/mcp-core/src/internal/agents/callEmbeddedAgent.ts @@ -380,7 +380,7 @@ function extractJsonCandidates(text: string): string[] { const codeBlockRegex = /```(?:json)?\s*\n?([\s\S]*?)\n?```/g; const allMatches = [...text.matchAll(codeBlockRegex)]; for (const match of allMatches) { - candidates.add(match[1]!.trim()); + candidates.add((match[1] ?? "").trim()); } // Strategy 2: Find balanced JSON objects anywhere in the text. @@ -403,7 +403,7 @@ function rescueFromText( ): TOutput | null { for (const candidate of extractJsonCandidates(text)) { try { - const parsed = JSON.parse(candidate); + const parsed: unknown = JSON.parse(candidate); const result = schema.safeParse(parsed); if (result.success) { return result.data; diff --git a/packages/mcp-core/src/internal/agents/openai-provider.integration.test.ts b/packages/mcp-core/src/internal/agents/openai-provider.integration.test.ts index 68b0bfdd04..71c7f41750 100644 --- a/packages/mcp-core/src/internal/agents/openai-provider.integration.test.ts +++ b/packages/mcp-core/src/internal/agents/openai-provider.integration.test.ts @@ -45,7 +45,7 @@ const mswServer = setupServer( ); describe("OpenAI Provider Integration", () => { - const hasOpenAIKey = Boolean(process.env.OPENAI_API_KEY); + const hasOpenAIKey = Boolean(process.env["OPENAI_API_KEY"]); beforeAll(() => { if (hasOpenAIKey) { diff --git a/packages/mcp-core/src/internal/agents/openai-provider.test.ts b/packages/mcp-core/src/internal/agents/openai-provider.test.ts index 7926fa7ed8..e204b9065a 100644 --- a/packages/mcp-core/src/internal/agents/openai-provider.test.ts +++ b/packages/mcp-core/src/internal/agents/openai-provider.test.ts @@ -4,41 +4,41 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; import { getOpenAIModel, setOpenAIBaseUrl } from "./openai-provider.js"; describe("openai-provider", () => { - const originalModel = process.env.OPENAI_MODEL; - const originalApiKey = process.env.OPENAI_API_KEY; - const originalOpenRouterApiKey = process.env.OPENROUTER_API_KEY; - const originalApiVersion = process.env.OPENAI_API_VERSION; + const originalModel = process.env["OPENAI_MODEL"]; + const originalApiKey = process.env["OPENAI_API_KEY"]; + const originalOpenRouterApiKey = process.env["OPENROUTER_API_KEY"]; + const originalApiVersion = process.env["OPENAI_API_VERSION"]; beforeEach(() => { setOpenAIBaseUrl(undefined); - delete process.env.OPENAI_MODEL; - delete process.env.OPENROUTER_API_KEY; - delete process.env.OPENAI_API_VERSION; + delete process.env["OPENAI_MODEL"]; + delete process.env["OPENROUTER_API_KEY"]; + delete process.env["OPENAI_API_VERSION"]; }); afterEach(() => { if (originalModel === undefined) { - delete process.env.OPENAI_MODEL; + delete process.env["OPENAI_MODEL"]; } else { - process.env.OPENAI_MODEL = originalModel; + process.env["OPENAI_MODEL"] = originalModel; } if (originalApiKey === undefined) { - delete process.env.OPENAI_API_KEY; + delete process.env["OPENAI_API_KEY"]; } else { - process.env.OPENAI_API_KEY = originalApiKey; + process.env["OPENAI_API_KEY"] = originalApiKey; } if (originalOpenRouterApiKey === undefined) { - delete process.env.OPENROUTER_API_KEY; + delete process.env["OPENROUTER_API_KEY"]; } else { - process.env.OPENROUTER_API_KEY = originalOpenRouterApiKey; + process.env["OPENROUTER_API_KEY"] = originalOpenRouterApiKey; } if (originalApiVersion === undefined) { - delete process.env.OPENAI_API_VERSION; + delete process.env["OPENAI_API_VERSION"]; } else { - process.env.OPENAI_API_VERSION = originalApiVersion; + process.env["OPENAI_API_VERSION"] = originalApiVersion; } vi.unstubAllGlobals(); @@ -62,7 +62,7 @@ describe("openai-provider", () => { }); it("uses responses API for generic custom base URL requests", async () => { - process.env.OPENAI_API_KEY = "test-key"; + process.env["OPENAI_API_KEY"] = "test-key"; setOpenAIBaseUrl("https://proxy.example.com/v1"); let requestUrl: string | undefined; @@ -105,7 +105,7 @@ describe("openai-provider", () => { }); it("keeps responses API for deployment-style URLs in generic openai mode", async () => { - process.env.OPENAI_API_KEY = "test-key"; + process.env["OPENAI_API_KEY"] = "test-key"; setOpenAIBaseUrl( "https://proxy.example.com/openai/deployments/test-model", ); @@ -152,8 +152,8 @@ describe("openai-provider", () => { }); it("ignores OPENAI_API_VERSION for generic openai provider requests", async () => { - process.env.OPENAI_API_KEY = "test-key"; - process.env.OPENAI_API_VERSION = "2024-02-15-preview"; + process.env["OPENAI_API_KEY"] = "test-key"; + process.env["OPENAI_API_VERSION"] = "2024-02-15-preview"; setOpenAIBaseUrl("https://proxy.example.com/v1"); let requestUrl: string | undefined; @@ -211,7 +211,7 @@ describe("openai-provider", () => { }); it("uses OPENAI_MODEL env var when set", () => { - process.env.OPENAI_MODEL = "gpt-4-turbo"; + process.env["OPENAI_MODEL"] = "gpt-4-turbo"; const model = getOpenAIModel() as LanguageModelV3; diff --git a/packages/mcp-core/src/internal/agents/openai-provider.ts b/packages/mcp-core/src/internal/agents/openai-provider.ts index 1efa1ed639..7e760cec07 100644 --- a/packages/mcp-core/src/internal/agents/openai-provider.ts +++ b/packages/mcp-core/src/internal/agents/openai-provider.ts @@ -37,7 +37,7 @@ export function setOpenAIBaseUrl(baseUrl: string | undefined): void { * provider so generic OpenAI-compatible endpoints keep predictable behavior. */ export function getOpenAIModel(model?: string): LanguageModel { - const defaultModel = process.env.OPENAI_MODEL || DEFAULT_OPENAI_MODEL; + const defaultModel = process.env["OPENAI_MODEL"] || DEFAULT_OPENAI_MODEL; const factory = createOpenAI({ ...(configuredBaseUrl && { baseURL: configuredBaseUrl }), diff --git a/packages/mcp-core/src/internal/agents/openrouter-provider.test.ts b/packages/mcp-core/src/internal/agents/openrouter-provider.test.ts index 47ddd6dc8b..02bc863cdb 100644 --- a/packages/mcp-core/src/internal/agents/openrouter-provider.test.ts +++ b/packages/mcp-core/src/internal/agents/openrouter-provider.test.ts @@ -8,33 +8,33 @@ import { } from "./openrouter-provider.js"; describe("openrouter-provider", () => { - const originalApiKey = process.env.OPENROUTER_API_KEY; - const originalModel = process.env.OPENROUTER_MODEL; - const originalReasoningEffort = process.env.OPENROUTER_REASONING_EFFORT; + const originalApiKey = process.env["OPENROUTER_API_KEY"]; + const originalModel = process.env["OPENROUTER_MODEL"]; + const originalReasoningEffort = process.env["OPENROUTER_REASONING_EFFORT"]; beforeEach(() => { - process.env.OPENROUTER_API_KEY = "test-openrouter-key"; - delete process.env.OPENROUTER_MODEL; - delete process.env.OPENROUTER_REASONING_EFFORT; + process.env["OPENROUTER_API_KEY"] = "test-openrouter-key"; + delete process.env["OPENROUTER_MODEL"]; + delete process.env["OPENROUTER_REASONING_EFFORT"]; }); afterEach(() => { if (originalApiKey === undefined) { - delete process.env.OPENROUTER_API_KEY; + delete process.env["OPENROUTER_API_KEY"]; } else { - process.env.OPENROUTER_API_KEY = originalApiKey; + process.env["OPENROUTER_API_KEY"] = originalApiKey; } if (originalModel === undefined) { - delete process.env.OPENROUTER_MODEL; + delete process.env["OPENROUTER_MODEL"]; } else { - process.env.OPENROUTER_MODEL = originalModel; + process.env["OPENROUTER_MODEL"] = originalModel; } if (originalReasoningEffort === undefined) { - delete process.env.OPENROUTER_REASONING_EFFORT; + delete process.env["OPENROUTER_REASONING_EFFORT"]; } else { - process.env.OPENROUTER_REASONING_EFFORT = originalReasoningEffort; + process.env["OPENROUTER_REASONING_EFFORT"] = originalReasoningEffort; } vi.unstubAllGlobals(); @@ -89,7 +89,7 @@ describe("openrouter-provider", () => { "openai/gpt-5.6-luna", ); - process.env.OPENROUTER_MODEL = "anthropic/claude-sonnet-4"; + process.env["OPENROUTER_MODEL"] = "anthropic/claude-sonnet-4"; expect((getOpenRouterModel() as LanguageModelV3).modelId).toBe( "anthropic/claude-sonnet-4", @@ -108,7 +108,7 @@ describe("openrouter-provider", () => { }, }); - process.env.OPENROUTER_REASONING_EFFORT = "low"; + process.env["OPENROUTER_REASONING_EFFORT"] = "low"; expect(getOpenRouterProviderOptions()).toEqual({ openai: { @@ -118,7 +118,7 @@ describe("openrouter-provider", () => { }, }); - process.env.OPENROUTER_REASONING_EFFORT = ""; + process.env["OPENROUTER_REASONING_EFFORT"] = ""; expect(getOpenRouterProviderOptions()).toEqual({ openai: { @@ -129,7 +129,7 @@ describe("openrouter-provider", () => { }); it("maps max to xhigh and rejects unknown reasoning effort", () => { - process.env.OPENROUTER_REASONING_EFFORT = "max"; + process.env["OPENROUTER_REASONING_EFFORT"] = "max"; expect(getOpenRouterProviderOptions()).toEqual({ openai: { @@ -139,7 +139,7 @@ describe("openrouter-provider", () => { }, }); - process.env.OPENROUTER_REASONING_EFFORT = "ludicrous"; + process.env["OPENROUTER_REASONING_EFFORT"] = "ludicrous"; expect(() => getOpenRouterProviderOptions()).toThrow(ConfigurationError); expect(() => getOpenRouterProviderOptions()).toThrow( @@ -147,7 +147,8 @@ describe("openrouter-provider", () => { ); // Prototype keys must not bypass validation via inherited Object props. - process.env.OPENROUTER_REASONING_EFFORT = "constructor"; + // Prototype keys must not bypass validation via inherited Object props. + process.env["OPENROUTER_REASONING_EFFORT"] = "constructor"; expect(() => getOpenRouterProviderOptions()).toThrow(ConfigurationError); }); diff --git a/packages/mcp-core/src/internal/agents/openrouter-provider.ts b/packages/mcp-core/src/internal/agents/openrouter-provider.ts index ce8f9d9b29..3aa9260745 100644 --- a/packages/mcp-core/src/internal/agents/openrouter-provider.ts +++ b/packages/mcp-core/src/internal/agents/openrouter-provider.ts @@ -20,14 +20,14 @@ const OPENROUTER_REASONING_EFFORTS = [ type OpenRouterReasoningEffort = (typeof OPENROUTER_REASONING_EFFORTS)[number]; -// Null prototype so Object.prototype keys like "constructor" cannot slip through. -const OPENROUTER_REASONING_EFFORT_ALIASES: Record< +// A Map so Object.prototype keys like "constructor" cannot slip through. +const OPENROUTER_REASONING_EFFORT_ALIASES = new Map< string, OpenRouterReasoningEffort -> = Object.assign(Object.create(null), { +>([ // OpenRouter sometimes documents "max"; AI SDK accepts "xhigh". - max: "xhigh", -}); + ["max", "xhigh"], +]); function resolveOpenRouterReasoningEffort( value: string | undefined, @@ -42,8 +42,9 @@ function resolveOpenRouterReasoningEffort( } const normalized = value.trim().toLowerCase(); - if (Object.hasOwn(OPENROUTER_REASONING_EFFORT_ALIASES, normalized)) { - return OPENROUTER_REASONING_EFFORT_ALIASES[normalized]; + const alias = OPENROUTER_REASONING_EFFORT_ALIASES.get(normalized); + if (alias !== undefined) { + return alias; } if ( @@ -63,8 +64,9 @@ function resolveOpenRouterReasoningEffort( * Builds an OpenRouter chat-completions model for embedded agent calls. */ export function getOpenRouterModel(model?: string): LanguageModel { + const apiKey = process.env["OPENROUTER_API_KEY"]; const factory = createOpenAI({ - apiKey: process.env.OPENROUTER_API_KEY, + ...(apiKey !== undefined && { apiKey }), baseURL: OPENROUTER_BASE_URL, headers: { "User-Agent": getUserAgent(), @@ -74,7 +76,7 @@ export function getOpenRouterModel(model?: string): LanguageModel { }); return factory.chat( - model ?? process.env.OPENROUTER_MODEL ?? DEFAULT_OPENROUTER_MODEL, + model ?? process.env["OPENROUTER_MODEL"] ?? DEFAULT_OPENROUTER_MODEL, ); } @@ -86,7 +88,7 @@ export function getOpenRouterModel(model?: string): LanguageModel { */ export function getOpenRouterProviderOptions(): ProviderOptions { const reasoningEffort = resolveOpenRouterReasoningEffort( - process.env.OPENROUTER_REASONING_EFFORT, + process.env["OPENROUTER_REASONING_EFFORT"], ); return { diff --git a/packages/mcp-core/src/internal/agents/provider-factory.test.ts b/packages/mcp-core/src/internal/agents/provider-factory.test.ts index ccaa8ab522..41afe4fd9a 100644 --- a/packages/mcp-core/src/internal/agents/provider-factory.test.ts +++ b/packages/mcp-core/src/internal/agents/provider-factory.test.ts @@ -8,43 +8,43 @@ import { setAzureOpenAIBaseUrl } from "./azure-openai-provider.js"; import { ConfigurationError } from "../../errors.js"; describe("provider-factory", () => { - const originalAnthropicKey = process.env.ANTHROPIC_API_KEY; - const originalOpenAIKey = process.env.OPENAI_API_KEY; - const originalOpenRouterKey = process.env.OPENROUTER_API_KEY; - const originalProviderEnv = process.env.EMBEDDED_AGENT_PROVIDER; + const originalAnthropicKey = process.env["ANTHROPIC_API_KEY"]; + const originalOpenAIKey = process.env["OPENAI_API_KEY"]; + const originalOpenRouterKey = process.env["OPENROUTER_API_KEY"]; + const originalProviderEnv = process.env["EMBEDDED_AGENT_PROVIDER"]; beforeEach(() => { // Reset module state setAgentProvider(undefined); setAzureOpenAIBaseUrl(undefined); // Clear environment variables - delete process.env.ANTHROPIC_API_KEY; - delete process.env.OPENAI_API_KEY; - delete process.env.OPENROUTER_API_KEY; - delete process.env.EMBEDDED_AGENT_PROVIDER; + delete process.env["ANTHROPIC_API_KEY"]; + delete process.env["OPENAI_API_KEY"]; + delete process.env["OPENROUTER_API_KEY"]; + delete process.env["EMBEDDED_AGENT_PROVIDER"]; }); afterEach(() => { // Restore original environment if (originalAnthropicKey === undefined) { - delete process.env.ANTHROPIC_API_KEY; + delete process.env["ANTHROPIC_API_KEY"]; } else { - process.env.ANTHROPIC_API_KEY = originalAnthropicKey; + process.env["ANTHROPIC_API_KEY"] = originalAnthropicKey; } if (originalOpenAIKey === undefined) { - delete process.env.OPENAI_API_KEY; + delete process.env["OPENAI_API_KEY"]; } else { - process.env.OPENAI_API_KEY = originalOpenAIKey; + process.env["OPENAI_API_KEY"] = originalOpenAIKey; } if (originalOpenRouterKey === undefined) { - delete process.env.OPENROUTER_API_KEY; + delete process.env["OPENROUTER_API_KEY"]; } else { - process.env.OPENROUTER_API_KEY = originalOpenRouterKey; + process.env["OPENROUTER_API_KEY"] = originalOpenRouterKey; } if (originalProviderEnv === undefined) { - delete process.env.EMBEDDED_AGENT_PROVIDER; + delete process.env["EMBEDDED_AGENT_PROVIDER"]; } else { - process.env.EMBEDDED_AGENT_PROVIDER = originalProviderEnv; + process.env["EMBEDDED_AGENT_PROVIDER"] = originalProviderEnv; } setAgentProvider(undefined); setAzureOpenAIBaseUrl(undefined); @@ -52,21 +52,21 @@ describe("provider-factory", () => { describe("single API key auto-detection", () => { it("detects anthropic when only ANTHROPIC_API_KEY is set", () => { - process.env.ANTHROPIC_API_KEY = "sk-ant-test"; + process.env["ANTHROPIC_API_KEY"] = "sk-ant-test"; const provider = getAgentProvider(); expect(provider.type).toBe("anthropic"); }); it("detects openai when only OPENAI_API_KEY is set", () => { - process.env.OPENAI_API_KEY = "sk-test"; + process.env["OPENAI_API_KEY"] = "sk-test"; const provider = getAgentProvider(); expect(provider.type).toBe("openai"); }); it("detects openrouter when only OPENROUTER_API_KEY is set", () => { - process.env.OPENROUTER_API_KEY = "sk-or-test"; + process.env["OPENROUTER_API_KEY"] = "sk-or-test"; const provider = getAgentProvider(); expect(provider.type).toBe("openrouter"); @@ -87,27 +87,27 @@ describe("provider-factory", () => { describe("multiple API keys with explicit provider", () => { it("uses openai when both keys present and EMBEDDED_AGENT_PROVIDER=openai", () => { - process.env.ANTHROPIC_API_KEY = "sk-ant-test"; - process.env.OPENAI_API_KEY = "sk-test"; - process.env.EMBEDDED_AGENT_PROVIDER = "openai"; + process.env["ANTHROPIC_API_KEY"] = "sk-ant-test"; + process.env["OPENAI_API_KEY"] = "sk-test"; + process.env["EMBEDDED_AGENT_PROVIDER"] = "openai"; const provider = getAgentProvider(); expect(provider.type).toBe("openai"); }); it("uses anthropic when both keys present and EMBEDDED_AGENT_PROVIDER=anthropic", () => { - process.env.ANTHROPIC_API_KEY = "sk-ant-test"; - process.env.OPENAI_API_KEY = "sk-test"; - process.env.EMBEDDED_AGENT_PROVIDER = "anthropic"; + process.env["ANTHROPIC_API_KEY"] = "sk-ant-test"; + process.env["OPENAI_API_KEY"] = "sk-test"; + process.env["EMBEDDED_AGENT_PROVIDER"] = "anthropic"; const provider = getAgentProvider(); expect(provider.type).toBe("anthropic"); }); it("uses azure-openai when both keys present and EMBEDDED_AGENT_PROVIDER=azure-openai", () => { - process.env.ANTHROPIC_API_KEY = "sk-ant-test"; - process.env.OPENAI_API_KEY = "sk-test"; - process.env.EMBEDDED_AGENT_PROVIDER = "azure-openai"; + process.env["ANTHROPIC_API_KEY"] = "sk-ant-test"; + process.env["OPENAI_API_KEY"] = "sk-test"; + process.env["EMBEDDED_AGENT_PROVIDER"] = "azure-openai"; setAzureOpenAIBaseUrl("https://example.openai.azure.com/openai/v1/"); const provider = getAgentProvider(); @@ -115,18 +115,18 @@ describe("provider-factory", () => { }); it("uses openrouter when multiple keys are present and EMBEDDED_AGENT_PROVIDER=openrouter", () => { - process.env.ANTHROPIC_API_KEY = "sk-ant-test"; - process.env.OPENAI_API_KEY = "sk-test"; - process.env.OPENROUTER_API_KEY = "sk-or-test"; - process.env.EMBEDDED_AGENT_PROVIDER = "openrouter"; + process.env["ANTHROPIC_API_KEY"] = "sk-ant-test"; + process.env["OPENAI_API_KEY"] = "sk-test"; + process.env["OPENROUTER_API_KEY"] = "sk-or-test"; + process.env["EMBEDDED_AGENT_PROVIDER"] = "openrouter"; const provider = getAgentProvider(); expect(provider.type).toBe("openrouter"); }); it("uses openai when both keys present and setAgentProvider called", () => { - process.env.ANTHROPIC_API_KEY = "sk-ant-test"; - process.env.OPENAI_API_KEY = "sk-test"; + process.env["ANTHROPIC_API_KEY"] = "sk-ant-test"; + process.env["OPENAI_API_KEY"] = "sk-test"; setAgentProvider("openai"); const provider = getAgentProvider(); @@ -134,9 +134,9 @@ describe("provider-factory", () => { }); it("returns correct provider from getResolvedProviderType with explicit config", () => { - process.env.ANTHROPIC_API_KEY = "sk-ant-test"; - process.env.OPENAI_API_KEY = "sk-test"; - process.env.EMBEDDED_AGENT_PROVIDER = "openai"; + process.env["ANTHROPIC_API_KEY"] = "sk-ant-test"; + process.env["OPENAI_API_KEY"] = "sk-test"; + process.env["EMBEDDED_AGENT_PROVIDER"] = "openai"; const providerType = getResolvedProviderType(); expect(providerType).toBe("openai"); @@ -145,15 +145,15 @@ describe("provider-factory", () => { describe("multiple API keys without explicit provider", () => { it("throws ConfigurationError when both keys present", () => { - process.env.ANTHROPIC_API_KEY = "sk-ant-test"; - process.env.OPENAI_API_KEY = "sk-test"; + process.env["ANTHROPIC_API_KEY"] = "sk-ant-test"; + process.env["OPENAI_API_KEY"] = "sk-test"; expect(() => getAgentProvider()).toThrow(ConfigurationError); }); it("provides helpful error message about setting EMBEDDED_AGENT_PROVIDER", () => { - process.env.ANTHROPIC_API_KEY = "sk-ant-test"; - process.env.OPENAI_API_KEY = "sk-test"; + process.env["ANTHROPIC_API_KEY"] = "sk-ant-test"; + process.env["OPENAI_API_KEY"] = "sk-test"; expect(() => getAgentProvider()).toThrow(/Multiple LLM API keys are set/); expect(() => getAgentProvider()).toThrow( @@ -165,8 +165,8 @@ describe("provider-factory", () => { }); it("returns undefined from getResolvedProviderType when both keys present", () => { - process.env.ANTHROPIC_API_KEY = "sk-ant-test"; - process.env.OPENAI_API_KEY = "sk-test"; + process.env["ANTHROPIC_API_KEY"] = "sk-ant-test"; + process.env["OPENAI_API_KEY"] = "sk-test"; const providerType = getResolvedProviderType(); expect(providerType).toBeUndefined(); @@ -175,7 +175,7 @@ describe("provider-factory", () => { describe("explicit provider validation", () => { it("throws ConfigurationError when explicit provider lacks API key", () => { - process.env.EMBEDDED_AGENT_PROVIDER = "openai"; + process.env["EMBEDDED_AGENT_PROVIDER"] = "openai"; // No OPENAI_API_KEY set expect(() => getAgentProvider()).toThrow(ConfigurationError); @@ -183,7 +183,7 @@ describe("provider-factory", () => { }); it("returns undefined from getResolvedProviderType when explicit provider lacks API key", () => { - process.env.EMBEDDED_AGENT_PROVIDER = "openai"; + process.env["EMBEDDED_AGENT_PROVIDER"] = "openai"; // No OPENAI_API_KEY set const providerType = getResolvedProviderType(); @@ -191,23 +191,23 @@ describe("provider-factory", () => { }); it("throws ConfigurationError when explicit openrouter lacks API key", () => { - process.env.EMBEDDED_AGENT_PROVIDER = "openrouter"; + process.env["EMBEDDED_AGENT_PROVIDER"] = "openrouter"; expect(() => getAgentProvider()).toThrow(ConfigurationError); expect(() => getAgentProvider()).toThrow(/OPENROUTER_API_KEY is not set/); }); it("throws ConfigurationError when azure-openai lacks a supported base URL", () => { - process.env.OPENAI_API_KEY = "sk-test"; - process.env.EMBEDDED_AGENT_PROVIDER = "azure-openai"; + process.env["OPENAI_API_KEY"] = "sk-test"; + process.env["EMBEDDED_AGENT_PROVIDER"] = "azure-openai"; expect(() => getAgentProvider()).toThrow(ConfigurationError); expect(() => getAgentProvider()).toThrow(/requires --openai-base-url/); }); it("returns undefined from getResolvedProviderType when azure-openai lacks a supported base URL", () => { - process.env.OPENAI_API_KEY = "sk-test"; - process.env.EMBEDDED_AGENT_PROVIDER = "azure-openai"; + process.env["OPENAI_API_KEY"] = "sk-test"; + process.env["EMBEDDED_AGENT_PROVIDER"] = "azure-openai"; const providerType = getResolvedProviderType(); expect(providerType).toBeUndefined(); @@ -216,9 +216,9 @@ describe("provider-factory", () => { describe("provider precedence", () => { it("prefers setAgentProvider over EMBEDDED_AGENT_PROVIDER", () => { - process.env.ANTHROPIC_API_KEY = "sk-ant-test"; - process.env.OPENAI_API_KEY = "sk-test"; - process.env.EMBEDDED_AGENT_PROVIDER = "anthropic"; + process.env["ANTHROPIC_API_KEY"] = "sk-ant-test"; + process.env["OPENAI_API_KEY"] = "sk-test"; + process.env["EMBEDDED_AGENT_PROVIDER"] = "anthropic"; setAgentProvider("openai"); const provider = getAgentProvider(); @@ -226,9 +226,9 @@ describe("provider-factory", () => { }); it("prefers EMBEDDED_AGENT_PROVIDER over auto-detection", () => { - process.env.ANTHROPIC_API_KEY = "sk-ant-test"; - process.env.OPENAI_API_KEY = "sk-test"; - process.env.EMBEDDED_AGENT_PROVIDER = "openai"; + process.env["ANTHROPIC_API_KEY"] = "sk-ant-test"; + process.env["OPENAI_API_KEY"] = "sk-test"; + process.env["EMBEDDED_AGENT_PROVIDER"] = "openai"; const provider = getAgentProvider(); expect(provider.type).toBe("openai"); @@ -237,22 +237,22 @@ describe("provider-factory", () => { describe("provider labels", () => { it("labels openai as responses", () => { - process.env.OPENAI_API_KEY = "sk-test"; + process.env["OPENAI_API_KEY"] = "sk-test"; const provider = getAgentProvider(); expect(provider.label).toBe("openai responses API"); }); it("labels anthropic without an API surface suffix", () => { - process.env.ANTHROPIC_API_KEY = "sk-ant-test"; + process.env["ANTHROPIC_API_KEY"] = "sk-ant-test"; const provider = getAgentProvider(); expect(provider.label).toBe("anthropic"); }); it("labels azure-openai v1 endpoints as responses", () => { - process.env.OPENAI_API_KEY = "sk-test"; - process.env.EMBEDDED_AGENT_PROVIDER = "azure-openai"; + process.env["OPENAI_API_KEY"] = "sk-test"; + process.env["EMBEDDED_AGENT_PROVIDER"] = "azure-openai"; setAzureOpenAIBaseUrl("https://example.openai.azure.com/openai/v1/"); const provider = getAgentProvider(); @@ -260,8 +260,8 @@ describe("provider-factory", () => { }); it("labels azure-openai deployment endpoints as chat completions", () => { - process.env.OPENAI_API_KEY = "sk-test"; - process.env.EMBEDDED_AGENT_PROVIDER = "azure-openai"; + process.env["OPENAI_API_KEY"] = "sk-test"; + process.env["EMBEDDED_AGENT_PROVIDER"] = "azure-openai"; setAzureOpenAIBaseUrl( "https://example.openai.azure.com/openai/deployments/my-assistant", ); @@ -271,7 +271,7 @@ describe("provider-factory", () => { }); it("labels openrouter", () => { - process.env.OPENROUTER_API_KEY = "sk-or-test"; + process.env["OPENROUTER_API_KEY"] = "sk-or-test"; const provider = getAgentProvider(); expect(provider.label).toBe("openrouter"); diff --git a/packages/mcp-core/src/internal/agents/provider-factory.ts b/packages/mcp-core/src/internal/agents/provider-factory.ts index a324ca3486..948e5db523 100644 --- a/packages/mcp-core/src/internal/agents/provider-factory.ts +++ b/packages/mcp-core/src/internal/agents/provider-factory.ts @@ -43,9 +43,9 @@ export function setProviderBaseUrls(config: { function detectProviderConflict(): boolean { return ( [ - process.env.ANTHROPIC_API_KEY, - process.env.OPENAI_API_KEY, - process.env.OPENROUTER_API_KEY, + process.env["ANTHROPIC_API_KEY"], + process.env["OPENAI_API_KEY"], + process.env["OPENROUTER_API_KEY"], ].filter(Boolean).length > 1 ); } @@ -56,12 +56,12 @@ function detectProviderConflict(): boolean { function hasApiKeyForProvider(type: AgentProviderType): boolean { switch (type) { case "anthropic": - return Boolean(process.env.ANTHROPIC_API_KEY); + return Boolean(process.env["ANTHROPIC_API_KEY"]); case "openai": case "azure-openai": - return Boolean(process.env.OPENAI_API_KEY); + return Boolean(process.env["OPENAI_API_KEY"]); case "openrouter": - return Boolean(process.env.OPENROUTER_API_KEY); + return Boolean(process.env["OPENROUTER_API_KEY"]); } } @@ -147,7 +147,7 @@ function resolveProviderType(): AgentProviderType | undefined { } // 2. Environment variable - const envProvider = process.env.EMBEDDED_AGENT_PROVIDER?.toLowerCase(); + const envProvider = process.env["EMBEDDED_AGENT_PROVIDER"]?.toLowerCase(); if ( envProvider === "openai" || envProvider === "azure-openai" || @@ -163,9 +163,9 @@ function resolveProviderType(): AgentProviderType | undefined { } // 4. Auto-detect - if (process.env.ANTHROPIC_API_KEY) return "anthropic"; - if (process.env.OPENAI_API_KEY) return "openai"; - if (process.env.OPENROUTER_API_KEY) return "openrouter"; + if (process.env["ANTHROPIC_API_KEY"]) return "anthropic"; + if (process.env["OPENAI_API_KEY"]) return "openai"; + if (process.env["OPENROUTER_API_KEY"]) return "openrouter"; return undefined; } diff --git a/packages/mcp-core/src/internal/agents/provider-user-agent.test.ts b/packages/mcp-core/src/internal/agents/provider-user-agent.test.ts index fb12ebe3cb..2ba4c3263b 100644 --- a/packages/mcp-core/src/internal/agents/provider-user-agent.test.ts +++ b/packages/mcp-core/src/internal/agents/provider-user-agent.test.ts @@ -63,7 +63,10 @@ describe("provider User-Agent on direct streamText calls", () => { vi.stubEnv(key, key === apiKey ? "test-key" : ""); } setAgentProvider(provider); - setProviderBaseUrls({ openaiBaseUrl, anthropicBaseUrl }); + setProviderBaseUrls({ + ...(openaiBaseUrl !== undefined && { openaiBaseUrl }), + ...(anthropicBaseUrl !== undefined && { anthropicBaseUrl }), + }); setServerVersion("1.2.3-x"); const userAgents: (string | null)[] = []; diff --git a/packages/mcp-core/src/internal/agents/tools/dataset-fields.ts b/packages/mcp-core/src/internal/agents/tools/dataset-fields.ts index 9dbe8f5db1..0d262d14eb 100644 --- a/packages/mcp-core/src/internal/agents/tools/dataset-fields.ts +++ b/packages/mcp-core/src/internal/agents/tools/dataset-fields.ts @@ -9,7 +9,7 @@ export interface DatasetField { key: string; name: string; totalValues: number; - examples?: string[]; + examples?: string[] | undefined; } export interface DatasetFieldsResult { @@ -112,7 +112,7 @@ export async function discoverDatasetFields( organizationSlug: string, dataset: DatasetType, options: { - projectId?: string; + projectId?: string | undefined; } = {}, ): Promise { const { projectId } = options; @@ -162,7 +162,7 @@ export function createDatasetFieldsTool(options: { apiService: SentryApiService; organizationSlug: string; dataset: DatasetType; - projectId?: string; + projectId?: string | undefined; }) { const { apiService, organizationSlug, dataset, projectId } = options; return agentTool({ diff --git a/packages/mcp-core/src/internal/agents/tools/otel-semantics.ts b/packages/mcp-core/src/internal/agents/tools/otel-semantics.ts index f9718e880e..ef42e0284d 100644 --- a/packages/mcp-core/src/internal/agents/tools/otel-semantics.ts +++ b/packages/mcp-core/src/internal/agents/tools/otel-semantics.ts @@ -163,7 +163,7 @@ interface NamespaceData { { description: string; type: string; - examples?: Array; + examples?: Array; note?: string; stability?: string; } diff --git a/packages/mcp-core/src/internal/code-location.ts b/packages/mcp-core/src/internal/code-location.ts index 9c7c21056a..8b5279d40f 100644 --- a/packages/mcp-core/src/internal/code-location.ts +++ b/packages/mcp-core/src/internal/code-location.ts @@ -4,8 +4,8 @@ import type { FrameInterface } from "../api-client"; export type Frame = z.infer; export type CodeLocation = { - repository?: string; - path?: string; + repository?: string | undefined; + path?: string | undefined; line?: number; url: string; }; diff --git a/packages/mcp-core/src/internal/constraint-helpers.test.ts b/packages/mcp-core/src/internal/constraint-helpers.test.ts index 8cadb99574..e2b60fd885 100644 --- a/packages/mcp-core/src/internal/constraint-helpers.test.ts +++ b/packages/mcp-core/src/internal/constraint-helpers.test.ts @@ -296,8 +296,8 @@ describe("Constraint Helpers", () => { // Both should handle the explicit constraint the same way expect(keysToFilter).toContain("projectSlugOrId"); - expect(paramsToInject.projectSlugOrId).toBe("project-b"); - expect(paramsToInject.projectSlug).toBeUndefined(); + expect(paramsToInject["projectSlugOrId"]).toBe("project-b"); + expect(paramsToInject["projectSlug"]).toBeUndefined(); }); }); }); diff --git a/packages/mcp-core/src/internal/error-handling.ts b/packages/mcp-core/src/internal/error-handling.ts index cc45ad7076..624b2ab47f 100644 --- a/packages/mcp-core/src/internal/error-handling.ts +++ b/packages/mcp-core/src/internal/error-handling.ts @@ -153,7 +153,7 @@ export function isExpectedToolError(error: unknown): boolean { function formatServerConfigError( error: Error, detailedParts: string[], - options?: { transport?: TransportType }, + options?: { transport?: TransportType | undefined }, ): string { if (options?.transport === "http") { logIssue(error); @@ -172,7 +172,7 @@ function formatServerConfigError( function formatAiProviderError( error: Error, detailedParts: string[], - options?: { transport?: TransportType }, + options?: { transport?: TransportType | undefined }, ): string { logWarn(error, { loggerScope: ["error-handling", "llm-provider"], @@ -207,7 +207,7 @@ function formatAiProviderError( export async function formatErrorForUser( error: unknown, options?: { - transport?: TransportType; + transport?: TransportType | undefined; /** Tool surface of the session, used to suggest reporting likely bugs. */ session?: Pick; }, @@ -398,7 +398,7 @@ export async function formatErrorForUser( if (eventId) { parts.push(`**Event ID**: ${eventId}`); } - if (process.env.NODE_ENV !== "production") { + if (process.env["NODE_ENV"] !== "production") { const errorMsg = error instanceof Error ? error.message : String(error); if (errorMsg) { parts.push(errorMsg); diff --git a/packages/mcp-core/src/internal/formatting.test.ts b/packages/mcp-core/src/internal/formatting.test.ts index 74e8f3b5a4..59f207b610 100644 --- a/packages/mcp-core/src/internal/formatting.test.ts +++ b/packages/mcp-core/src/internal/formatting.test.ts @@ -2469,7 +2469,7 @@ describe("formatEventOutput metric alert details", () => { it("formats below-threshold conditions and omits an empty environment", () => { const evidenceData = createLogsMonitorEvidence({ environment: null }); - evidenceData.conditions = [{ type: "lt", comparison: 10 }]; + evidenceData["conditions"] = [{ type: "lt", comparison: 10 }]; const output = formatEventOutput(createMetricIssueEvent({ evidenceData })); @@ -2500,12 +2500,12 @@ describe("formatEventOutput metric alert details", () => { it("formats dynamic alert values without object placeholders", () => { const evidenceData = createLogsMonitorEvidence(); - evidenceData.value = { + evidenceData["value"] = { value: 12.5, source_id: "123", timestamp: 1780272000, }; - evidenceData.conditions = [ + evidenceData["conditions"] = [ { type: "anomaly_detection", comparison: { diff --git a/packages/mcp-core/src/internal/formatting.ts b/packages/mcp-core/src/internal/formatting.ts index 5b0a2d0786..a10125415a 100644 --- a/packages/mcp-core/src/internal/formatting.ts +++ b/packages/mcp-core/src/internal/formatting.ts @@ -197,8 +197,8 @@ export function formatFrameHeader( * misnames the error text. */ export function isPerformanceIssueType(issue: { - issueType?: string | null; - issueCategory?: string | null; + issueType?: string | null | undefined; + issueCategory?: string | null | undefined; }): boolean { return ( issue.issueType?.startsWith("performance_") === true || @@ -228,14 +228,14 @@ export function isSupportedEventType(event: { type?: unknown }): boolean { export function formatEventOutput( event: Event, options?: { - performanceTrace?: Trace; + performanceTrace?: Trace | undefined; replaySummary?: { apiService: SentryApiService; organizationSlug: string; - relatedReplayIds?: string[]; + relatedReplayIds?: string[] | undefined; experimentalMode?: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; }; }, ) { @@ -274,7 +274,6 @@ export function formatEventOutput( // Error message (if present) if (messageEntry) { output += formatMessageInterfaceOutput( - eventToRender, messageEntry.data as z.infer, ); } @@ -297,14 +296,13 @@ export function formatEventOutput( // Request info (if HTTP error) if (requestEntry) { output += formatRequestInterfaceOutput( - eventToRender, requestEntry.data as z.infer, ); } // CSP violation details if (cspEntry) { - output += formatCspInterfaceOutput(eventToRender, cspEntry.data); + output += formatCspInterfaceOutput(cspEntry.data); } // Performance issue details (N+1 queries, etc.) @@ -514,8 +512,8 @@ function getExceptionChainMessage( } } -function formatCspInterfaceOutput(event: Event, data: any) { - if (!data) { +function formatCspInterfaceOutput(data: unknown) { + if (!isPlainObject(data)) { return ""; } @@ -523,37 +521,50 @@ function formatCspInterfaceOutput(event: Event, data: any) { parts.push("### CSP Violation"); parts.push(""); - if (data.blocked_uri) { - parts.push(`**Blocked URI**: ${data.blocked_uri}`); + const field = (key: string): string | undefined => { + const value = data[key]; + return value ? formatPrimitive(value) : undefined; + }; + + const blockedUri = field("blocked_uri"); + if (blockedUri) { + parts.push(`**Blocked URI**: ${blockedUri}`); } - if (data.violated_directive) { - parts.push(`**Violated Directive**: ${data.violated_directive}`); + const violatedDirective = field("violated_directive"); + if (violatedDirective) { + parts.push(`**Violated Directive**: ${violatedDirective}`); } - if (data.effective_directive) { - parts.push(`**Effective Directive**: ${data.effective_directive}`); + const effectiveDirective = field("effective_directive"); + if (effectiveDirective) { + parts.push(`**Effective Directive**: ${effectiveDirective}`); } - if (data.document_uri) { - parts.push(`**Document URI**: ${data.document_uri}`); + const documentUri = field("document_uri"); + if (documentUri) { + parts.push(`**Document URI**: ${documentUri}`); } - if (data.source_file) { - parts.push(`**Source File**: ${data.source_file}`); - if (data.line_number) { - parts.push(`**Line Number**: ${data.line_number}`); + const sourceFile = field("source_file"); + if (sourceFile) { + parts.push(`**Source File**: ${sourceFile}`); + const lineNumber = field("line_number"); + if (lineNumber) { + parts.push(`**Line Number**: ${lineNumber}`); } } - if (data.disposition) { - parts.push(`**Disposition**: ${data.disposition}`); + const disposition = field("disposition"); + if (disposition) { + parts.push(`**Disposition**: ${disposition}`); } - if (data.original_policy) { + const originalPolicy = field("original_policy"); + if (originalPolicy) { parts.push(""); parts.push("**Original Policy:**"); - parts.push(codeBlock(data.original_policy)); + parts.push(codeBlock(originalPolicy)); } parts.push(""); @@ -563,7 +574,6 @@ function formatCspInterfaceOutput(event: Event, data: any) { } function formatRequestInterfaceOutput( - event: Event, data: z.infer, ) { if (!data.method || !data.url) { @@ -573,7 +583,6 @@ function formatRequestInterfaceOutput( } function formatMessageInterfaceOutput( - event: Event, data: z.infer, ) { if (!data.formatted && !data.message) { @@ -966,7 +975,7 @@ function selectTraceSpanRoots( function indexSpan(span: TraceSpan): void { // Try to get span_id from additional_attributes, fall back to event_id const spanId = - normalizeSpanId(span.additional_attributes?.span_id) || span.event_id; + normalizeSpanId(span.additional_attributes?.["span_id"]) || span.event_id; if (spanId && spanId.length > 0) { spanMap.set(spanId, span); } @@ -1097,7 +1106,7 @@ function convertTraceSpanToPerformanceSpan( // Get span ID from additional_attributes or fall back to event_id const spanId = - normalizeSpanId(span.additional_attributes?.span_id) || span.event_id; + normalizeSpanId(span.additional_attributes?.["span_id"]) || span.event_id; const performanceSpan: PerformanceSpan = { span_id: spanId, @@ -1418,8 +1427,9 @@ function formatN1QueryEvidence( } // Show the query pattern - if single line, render as SQL block; if multiple, as list - if (repeatingLines.length === 1) { - parts.push(codeBlock(repeatingLines[0]!, "sql")); + const [onlyRepeatingLine] = repeatingLines; + if (repeatingLines.length === 1 && onlyRepeatingLine !== undefined) { + parts.push(codeBlock(onlyRepeatingLine, "sql")); parts.push(""); } else { parts.push("**Repeated operations:**"); @@ -1527,26 +1537,36 @@ function formatPerformanceIssueOutput( event: Event, spansData: unknown, options?: { - performanceTrace?: Trace; + performanceTrace?: Trace | undefined; }, ): string { const parts: string[] = []; - // Check if we have occurrence data - const occurrence = (event as any).occurrence; - if (!occurrence) { + // Check if we have occurrence data. Only transaction and generic events + // model it, and its evidence fields vary by issue type, so read it as + // untrusted data. + const occurrence: unknown = + "occurrence" in event ? event.occurrence : undefined; + if (!isPlainObject(occurrence)) { return ""; } // Get issue type - occurrence.type is numeric, issueType may be a string + const occurrenceType = occurrence["type"]; let issueType: string | undefined; - if (typeof occurrence.type === "number") { - issueType = OCCURRENCE_TYPE_TO_ISSUE_TYPE[occurrence.type]; + if (typeof occurrenceType === "number") { + issueType = OCCURRENCE_TYPE_TO_ISSUE_TYPE[occurrenceType]; } else { - issueType = occurrence.issueType || occurrence.type; + const rawIssueType = occurrence["issueType"]; + issueType = + (typeof rawIssueType === "string" && rawIssueType) || + (typeof occurrenceType === "string" ? occurrenceType : undefined); } - const evidenceData = occurrence.evidenceData; + const rawEvidenceData = occurrence["evidenceData"]; + const evidenceData = isPlainObject(rawEvidenceData) + ? rawEvidenceData + : undefined; // Process evidence data based on known performance issue types if (evidenceData) { @@ -1584,18 +1604,24 @@ function formatPerformanceIssueOutput( } // Show transaction name if available for any performance issue (generic field) - if (evidenceData?.transactionName) { + const transactionName = evidenceData?.["transactionName"]; + const formattedTransactionName = transactionName + ? formatPrimitive(transactionName) + : undefined; + if (formattedTransactionName) { parts.push("**Transaction:**"); - parts.push(`${evidenceData.transactionName}`); + parts.push(formattedTransactionName); parts.push(""); } // Always show evidence display if available (this is generic and doesn't require type knowledge) - if (occurrence.evidenceDisplay?.length > 0) { - for (const display of occurrence.evidenceDisplay) { - if (display.important) { - parts.push(`**${display.name}:**`); - parts.push(`${display.value}`); + const evidenceDisplay = occurrence["evidenceDisplay"]; + if (Array.isArray(evidenceDisplay)) { + const displays: unknown[] = evidenceDisplay; + for (const display of displays) { + if (isPlainObject(display) && display["important"]) { + parts.push(`**${String(display["name"])}:**`); + parts.push(String(display["value"])); parts.push(""); } } @@ -1639,19 +1665,19 @@ function asUnverified(value: unknown): Unverified | undefined { } type MetricAlertQuery = { - dataset?: string; - aggregate?: string; - query?: string; - timeWindowSeconds?: number; - environment?: string; + dataset?: string | undefined; + aggregate?: string | undefined; + query?: string | undefined; + timeWindowSeconds?: number | undefined; + environment?: string | undefined; eventTypes: string[]; }; export type MetricAlertContext = { evidenceData: Unverified; - query?: MetricAlertQuery; - monitorId?: string; - alertRuleId?: string; + query?: MetricAlertQuery | undefined; + monitorId?: string | undefined; + alertRuleId?: string | undefined; }; /** @@ -1816,7 +1842,7 @@ export function formatMetricAlertValue(value: unknown): string | undefined { } if (isPlainObject(value)) { - return formatPrimitive(value.value); + return formatPrimitive(value["value"]); } return undefined; @@ -1968,8 +1994,8 @@ function buildMetricAlertResponseNotes({ event: Event; context: MetricAlertContext; experimentalMode: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; }): string[] { const notes: string[] = []; const calls = getMetricAlertFollowUpCalls({ @@ -2287,22 +2313,22 @@ export function formatIssueOutput({ availableToolNames, directToolNames, }: { - packageNames?: string[]; + packageNames?: string[] | undefined; organizationSlug: string; issue: Issue; event: Event; apiService: SentryApiService; - autofixState?: AutofixRunState; - performanceTrace?: Trace; - externalIssues?: ExternalIssueList; - relatedReplayIds?: string[]; + autofixState?: AutofixRunState | undefined; + performanceTrace?: Trace | undefined; + externalIssues?: ExternalIssueList | undefined; + relatedReplayIds?: string[] | undefined; aiConversations?: AIConversationReference[]; - codeLocation?: CodeLocation; - committers?: CommitterList; - sourceMapDebug?: SourceMapDebug; - experimentalMode?: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + codeLocation?: CodeLocation | undefined; + committers?: CommitterList | undefined; + sourceMapDebug?: SourceMapDebug | undefined; + experimentalMode?: boolean | undefined; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; }) { let output = `# Issue ${issue.shortId} in **${organizationSlug}**\n\n`; @@ -2535,16 +2561,16 @@ export function buildIssueResponseNotes({ issue: Issue; event: Event; apiService: SentryApiService; - aiConversations?: AIConversationReference[]; - experimentalMode?: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + aiConversations?: AIConversationReference[] | undefined; + experimentalMode?: boolean | undefined; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; }): string[] { const notes: string[] = []; const traceId = - typeof event.contexts?.trace?.trace_id === "string" && - event.contexts.trace.trace_id.length > 0 - ? event.contexts.trace.trace_id + typeof event.contexts?.["trace"]?.["trace_id"] === "string" && + event.contexts["trace"]["trace_id"].length > 0 + ? event.contexts["trace"]["trace_id"] : undefined; const commitIssueReference = /^\d+$/.test(issue.shortId) @@ -2697,8 +2723,8 @@ function buildAIConversationResponseNotes({ aiConversations: AIConversationReference[]; organizationSlug: string; experimentalMode: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; }): string[] { const instructions = formatAIConversationActionInstructions({ organizationSlug, @@ -2708,8 +2734,8 @@ function buildAIConversationResponseNotes({ directToolNames, }); - if (aiConversations.length === 1) { - const conversation = aiConversations[0]!; + const [conversation] = aiConversations; + if (aiConversations.length === 1 && conversation) { const spanSuffix = conversation.spanId ? ` Matching span: \`${conversation.spanId}\`.` : ""; @@ -2742,10 +2768,10 @@ function formatIssueReplayOutput({ apiService: SentryApiService; organizationSlug: string; event: Event; - relatedReplayIds?: string[]; + relatedReplayIds?: string[] | undefined; experimentalMode: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; }): string { const attachedReplayId = getReplayIdFromEvent(event); const normalizedRelatedReplayIds = dedupeReplayIds(relatedReplayIds ?? []); @@ -2820,10 +2846,10 @@ function formatIssueReplayOutput({ } export function getReplayIdFromEvent(event: Event): string | null { - const replayContext = event.contexts?.replay; + const replayContext = event.contexts?.["replay"]; const replayContextId = - typeof replayContext?.replay_id === "string" - ? replayContext.replay_id + typeof replayContext?.["replay_id"] === "string" + ? replayContext["replay_id"] : null; const replayTagId = event.tags?.find((tag) => tag.key === "replayId" || tag.key === "replay.id") @@ -2865,7 +2891,7 @@ export function stripReplayMetadata(event: Event): Event { const tags = event.tags?.filter( (tag) => tag.key !== "replay.id" && tag.key !== "replayId", ); - const replayContext = event.contexts?.replay; + const replayContext = event.contexts?.["replay"]; if (!replayContext) { return { ...event, tags }; diff --git a/packages/mcp-core/src/internal/fresh-reads.test.ts b/packages/mcp-core/src/internal/fresh-reads.test.ts index caaf474759..2a1924d3ec 100644 --- a/packages/mcp-core/src/internal/fresh-reads.test.ts +++ b/packages/mcp-core/src/internal/fresh-reads.test.ts @@ -26,7 +26,7 @@ function probeTool() { calls.push({ params, fresh: isFreshRead() }); return "ok"; }, - } satisfies ToolConfig); + } satisfies ToolConfig); return { tool, calls }; } diff --git a/packages/mcp-core/src/internal/fresh-reads.ts b/packages/mcp-core/src/internal/fresh-reads.ts index 99721d1b4a..ec87771e17 100644 --- a/packages/mcp-core/src/internal/fresh-reads.ts +++ b/packages/mcp-core/src/internal/fresh-reads.ts @@ -21,7 +21,7 @@ export function isFreshRead(): boolean { * Add the `fresh` input to a read tool. The handler runs in a fresh scope when * the caller sets it, and never sees the input itself. */ -export function withFreshReadInput>(tool: T): T { +export function withFreshReadInput(tool: T): T { return { ...tool, inputSchema: { ...tool.inputSchema, fresh: ParamFresh }, diff --git a/packages/mcp-core/src/internal/issue-helpers.ts b/packages/mcp-core/src/internal/issue-helpers.ts index 6f65d67fe9..a07ea3f4b3 100644 --- a/packages/mcp-core/src/internal/issue-helpers.ts +++ b/packages/mcp-core/src/internal/issue-helpers.ts @@ -127,9 +127,9 @@ export function parseIssueParams({ issueId, organizationSlug, }: { - issueUrl?: string | null; - issueId?: string | null; - organizationSlug?: string | null; + issueUrl?: string | null | undefined; + issueId?: string | null | undefined; + organizationSlug?: string | null | undefined; }): { organizationSlug: string; issueId: string; diff --git a/packages/mcp-core/src/internal/issue-side-quests.test.ts b/packages/mcp-core/src/internal/issue-side-quests.test.ts index ab0474a778..894aab0c0a 100644 --- a/packages/mcp-core/src/internal/issue-side-quests.test.ts +++ b/packages/mcp-core/src/internal/issue-side-quests.test.ts @@ -1,6 +1,7 @@ import { eventFixture, sourceMapDebugFixture } from "@sentry/mcp-server-mocks"; -import { describe, expect, it } from "vitest"; +import { assert, describe, expect, it } from "vitest"; import { EventSchema, SourceMapDebugSchema } from "../api-client/schema"; +import type { SourceMapDebug } from "../api-client/types"; import { ISSUE_SIDE_QUEST_IDS, buildIssueSideQuests, @@ -16,11 +17,14 @@ const files = ["/a.js", "/b.js", "/c.js"]; function eventWithFourFiles() { const fixture = structuredClone(eventFixture); for (const entry of fixture.entries) { - if (entry.type !== "exception") { + if (entry.type !== "exception" || !("values" in entry.data)) { continue; } - for (const value of entry.data.values) { - value.rawStacktrace?.frames.forEach( + for (const value of entry.data.values ?? []) { + if (!("rawStacktrace" in value)) { + continue; + } + value.rawStacktrace.frames.forEach( (frame: { absPath: string | null }, index: number) => { frame.absPath = files[index] ?? frame.absPath; }, @@ -51,8 +55,7 @@ describe("buildIssueSideQuests", () => { const event = eventWithFourFiles(); const debug = SourceMapDebugSchema.parse(sourceMapDebugFixture); // `/b.js` has a debug ID, but nothing was uploaded for it - debug.exceptions[0].frames[1].debug_id_process.debug_id = - "41f4b626-efd6-5847-915c-69f5d33361fb"; + setFrameDebugId(debug, 1, "41f4b626-efd6-5847-915c-69f5d33361fb"); expect(buildIssueSideQuests({ event, sourceMapDebug: debug }, session)) .toMatchInlineSnapshot(` @@ -75,16 +78,14 @@ describe("buildIssueSideQuests", () => { const event = eventWithFourFiles(); const debug = SourceMapDebugSchema.parse(sourceMapDebugFixture); // `/b.js` and `/c.js` each have their own debug ID, with nothing uploaded - debug.exceptions[0].frames[1].debug_id_process.debug_id = - "41f4b626-efd6-5847-915c-69f5d33361fb"; - debug.exceptions[0].frames[2].debug_id_process.debug_id = - "6f88580e-719d-56bb-81e1-afad5d3d78ac"; + setFrameDebugId(debug, 1, "41f4b626-efd6-5847-915c-69f5d33361fb"); + setFrameDebugId(debug, 2, "6f88580e-719d-56bb-81e1-afad5d3d78ac"); const [quest] = buildIssueSideQuests({ event, sourceMapDebug: debug }, session) ?? []; // the third cause joins the remainder, so `/d.js` is still explained - expect(quest.details).toMatchInlineSnapshot(` + expect(quest?.details).toMatchInlineSnapshot(` [ "\`/a.js\` has no debug ID, and the project has no debug ID uploads. Inject debug IDs with the bundler plugin or \`sentry-cli sourcemaps inject\`, deploy, then upload those same files.", "\`/b.js\` has debug ID \`41f4b626-efd6-5847-915c-69f5d33361fb\`, but no source file or source map with it was uploaded. Upload the deployed build output after injecting debug IDs, with the bundler plugin or \`sentry-cli sourcemaps upload\`.", @@ -93,3 +94,13 @@ describe("buildIssueSideQuests", () => { `); }); }); + +function setFrameDebugId( + debug: SourceMapDebug, + frameIndex: number, + debugId: string, +): void { + const frame = debug.exceptions[0]?.frames[frameIndex]; + assert(frame, `Fixture has no frame at index ${frameIndex}`); + frame.debug_id_process.debug_id = debugId; +} diff --git a/packages/mcp-core/src/internal/issue-side-quests.ts b/packages/mcp-core/src/internal/issue-side-quests.ts index d7dbf68de4..b344f99660 100644 --- a/packages/mcp-core/src/internal/issue-side-quests.ts +++ b/packages/mcp-core/src/internal/issue-side-quests.ts @@ -22,7 +22,7 @@ import type { ToolSession } from "./tool-helpers/tool-call-formatting"; export interface IssueSideQuestInput { event: Event; /** Optional; a detector works without it. */ - sourceMapDebug?: SourceMapDebug; + sourceMapDebug?: SourceMapDebug | undefined; } /** @@ -143,7 +143,7 @@ const JS_SOURCE_MAP_ERRORS: ReadonlyMap< function getErrorFile(data: Record | null | undefined) { // most JS processing errors name the file in `url`; sources content and // location errors name it in `source` - const file = data?.url ?? data?.source; + const file = data?.["url"] ?? data?.["source"]; return typeof file === "string" && file.length > 0 ? file : null; } @@ -212,7 +212,7 @@ function detectJsSourceMapFailure({ return quest(`${NOT_APPLIED}${where}, ${MINIFIED}: ${fallback}`); } const [only] = diagnosis; - if (diagnosis.length === 1 && diagnosed.size === files.size) { + if (only && diagnosis.length === 1 && diagnosed.size === files.size) { return quest(`${NOT_APPLIED}, ${MINIFIED}: ${only.problem}. ${only.fix}`); } @@ -337,8 +337,8 @@ function isRecord(value: unknown): value is Record { function hasFrames(stacktrace: unknown): boolean { return ( isRecord(stacktrace) && - Array.isArray(stacktrace.frames) && - stacktrace.frames.length > 0 + Array.isArray(stacktrace["frames"]) && + stacktrace["frames"].length > 0 ); } @@ -359,9 +359,11 @@ function hasStackFrames(event: Event): boolean { if (type !== "exception" && type !== "threads") { return false; } - const values = Array.isArray(data.values) ? data.values : [data.value]; + const values = Array.isArray(data["values"]) + ? data["values"] + : [data["value"]]; return values.some( - (value) => isRecord(value) && hasFrames(value.stacktrace), + (value) => isRecord(value) && hasFrames(value["stacktrace"]), ); }); } @@ -505,12 +507,14 @@ function getEventMessages(event: Event): string[] { continue; } if (type === "message") { - messages.push(data.formatted, data.message); + messages.push(data["formatted"], data["message"]); } if (type === "exception") { - const values = Array.isArray(data.values) ? data.values : [data.value]; + const values = Array.isArray(data["values"]) + ? data["values"] + : [data["value"]]; for (const value of values) { - messages.push(isRecord(value) ? value.value : null); + messages.push(isRecord(value) ? value["value"] : null); } } } diff --git a/packages/mcp-core/src/internal/replay-timeline.ts b/packages/mcp-core/src/internal/replay-timeline.ts index c53e08e29a..d2a76b2f10 100644 --- a/packages/mcp-core/src/internal/replay-timeline.ts +++ b/packages/mcp-core/src/internal/replay-timeline.ts @@ -39,7 +39,7 @@ export interface ReplayTimelineEvent { /** Present on dead, rage, and slow clicks and on failed requests. */ problem?: "dead click" | "rage click" | "slow click" | "failed request"; /** Identifies the clicked node, for deduplication. */ - nodeId?: number; + nodeId?: number | undefined; /** Set on `navigation` breadcrumbs, which can duplicate navigation spans. */ fromBreadcrumb?: boolean; } @@ -111,23 +111,23 @@ export class ReplayTimelineBuilder { function parseRecordingEvent(rawEvent: unknown): ReplayTimelineEvent | null { const event = asRecord(rawEvent); - const data = asRecord(event?.data); - const payload = asRecord(data?.payload); + const data = asRecord(event?.["data"]); + const payload = asRecord(data?.["payload"]); if (!event || !data || !payload) { return null; } - const eventTimestampMs = asNumber(event.timestamp); - if (data.tag === "breadcrumb") { + const eventTimestampMs = asNumber(event["timestamp"]); + if (data["tag"] === "breadcrumb") { return parseBreadcrumb( payload, - secondsToMs(asNumber(payload.timestamp)) ?? eventTimestampMs, + secondsToMs(asNumber(payload["timestamp"])) ?? eventTimestampMs, ); } - if (data.tag === "performanceSpan") { + if (data["tag"] === "performanceSpan") { return parseSpan( payload, - secondsToMs(asNumber(payload.startTimestamp)) ?? eventTimestampMs, + secondsToMs(asNumber(payload["startTimestamp"])) ?? eventTimestampMs, ); } return null; @@ -137,7 +137,7 @@ function parseBreadcrumb( payload: UnknownRecord, timestampMs: number | null, ): ReplayTimelineEvent | null { - const category = asString(payload.category); + const category = asString(payload["category"]); if (timestampMs === null || !category) { return null; } @@ -150,8 +150,8 @@ function parseBreadcrumb( return null; } - const data = asRecord(payload.data); - const message = truncate(asString(payload.message)); + const data = asRecord(payload["data"]); + const message = truncate(asString(payload["message"])); const base = { timestampMs, details: [] as ReplayTimelineDetail[] }; switch (category) { @@ -164,12 +164,12 @@ function parseBreadcrumb( target: message, details: nodeTextDetails(data), notable: true, - nodeId: asNumber(data?.nodeId) ?? undefined, + nodeId: asNumber(data?.["nodeId"]) ?? undefined, }; case "ui.slowClickDetected": return parseSlowClick(base, message, data); case "ui.multiClick": { - const clickCount = asNumber(data?.clickCount) ?? 0; + const clickCount = asNumber(data?.["clickCount"]) ?? 0; if (clickCount < RAGE_CLICK_COUNT) { return null; } @@ -209,7 +209,7 @@ function parseBreadcrumb( }; } case "navigation": { - const to = truncate(asString(data?.to)); + const to = truncate(asString(data?.["to"])); if (!to) { return null; } @@ -223,10 +223,10 @@ function parseBreadcrumb( }; } case "console": { - if (data?.logger === "replay" || message === null) { + if (data?.["logger"] === "replay" || message === null) { return null; } - const level = asString(payload.level) ?? "log"; + const level = asString(payload["level"]) ?? "log"; return { ...base, category: "console", @@ -240,7 +240,7 @@ function parseBreadcrumb( ...base, category: "other", label: "user feedback", - target: asString(data?.feedbackId), + target: asString(data?.["feedbackId"]), notable: true, }; case "replay.hydrate-error": @@ -248,11 +248,11 @@ function parseBreadcrumb( ...base, category: "other", label: "hydration error", - target: truncate(asString(data?.url)), + target: truncate(asString(data?.["url"])), notable: true, }; case "replay.mutations": { - const count = asNumber(data?.count); + const count = asNumber(data?.["count"]); return { ...base, category: "other", @@ -284,11 +284,11 @@ function parseSlowClick( message: string | null, data: UnknownRecord | null, ): ReplayTimelineEvent { - const node = asRecord(data?.node); - const tagName = asString(node?.tagName)?.toLowerCase() ?? ""; - const endReason = asString(data?.endReason); - const timeAfterClickMs = asNumber(data?.timeAfterClickMs); - const clickCount = asNumber(data?.clickCount); + const node = asRecord(data?.["node"]); + const tagName = asString(node?.["tagName"])?.toLowerCase() ?? ""; + const endReason = asString(data?.["endReason"]); + const timeAfterClickMs = asNumber(data?.["timeAfterClickMs"]); + const clickCount = asNumber(data?.["clickCount"]); // Same rule as isDeadClick in Sentry: an interactive element that produced // no DOM change before the SDK gave up waiting. const isDead = DEAD_CLICK_TAGS.has(tagName) && endReason === "timeout"; @@ -317,7 +317,7 @@ function parseSlowClick( details, notable: true, problem: label, - nodeId: asNumber(data?.nodeId) ?? undefined, + nodeId: asNumber(data?.["nodeId"]) ?? undefined, }; } @@ -325,12 +325,12 @@ function parseSpan( payload: UnknownRecord, timestampMs: number | null, ): ReplayTimelineEvent | null { - const op = asString(payload.op); + const op = asString(payload["op"]); if (timestampMs === null || !op) { return null; } - const description = truncate(asString(payload.description)); + const description = truncate(asString(payload["description"])); const navigationLabel = NAVIGATION_SPAN_LABELS[op]; if (navigationLabel) { return { @@ -347,10 +347,10 @@ function parseSpan( return null; } - const data = asRecord(payload.data); - const method = asString(data?.method); - const statusCode = asNumber(data?.statusCode); - const endTimestampMs = secondsToMs(asNumber(payload.endTimestamp)); + const data = asRecord(payload["data"]); + const method = asString(data?.["method"]); + const statusCode = asNumber(data?.["statusCode"]); + const endTimestampMs = secondsToMs(asNumber(payload["endTimestamp"])); const details: ReplayTimelineDetail[] = []; if (statusCode !== null) { details.push({ label: "status", value: String(statusCode) }); @@ -416,21 +416,21 @@ function removeDuplicateNavigations( } function nodeTextDetails(data: UnknownRecord | null): ReplayTimelineDetail[] { - const node = asRecord(data?.node); - const textContent = truncate(asString(node?.textContent)); + const node = asRecord(data?.["node"]); + const textContent = truncate(asString(node?.["textContent"])); return textContent ? [{ label: "text", value: textContent }] : []; } function formatKey(data: UnknownRecord | null): string | null { - const key = data?.key === " " ? "Space" : asString(data?.key); + const key = data?.["key"] === " " ? "Space" : asString(data?.["key"]); if (!key) { return null; } const modifiers = [ - { pressed: data?.ctrlKey, key: "Control", label: "Ctrl" }, - { pressed: data?.metaKey, key: "Meta", label: "Meta" }, - { pressed: data?.altKey, key: "Alt", label: "Alt" }, - { pressed: data?.shiftKey, key: "Shift", label: "Shift" }, + { pressed: data?.["ctrlKey"], key: "Control", label: "Ctrl" }, + { pressed: data?.["metaKey"], key: "Meta", label: "Meta" }, + { pressed: data?.["altKey"], key: "Alt", label: "Alt" }, + { pressed: data?.["shiftKey"], key: "Shift", label: "Shift" }, ] // A modifier pressed on its own reports itself as both key and modifier. .filter((modifier) => modifier.pressed === true && modifier.key !== key) diff --git a/packages/mcp-core/src/internal/side-quests.test.ts b/packages/mcp-core/src/internal/side-quests.test.ts index 0412884ccf..121aba2e0d 100644 --- a/packages/mcp-core/src/internal/side-quests.test.ts +++ b/packages/mcp-core/src/internal/side-quests.test.ts @@ -72,7 +72,7 @@ describe("buildSideQuests", () => { session, ) ?? []; - expect(quest.next).toEqual([ + expect(quest?.next).toEqual([ { tool: "search_events", args: { query: "a" } }, { tool: "get_issue_details", args: { issueId: "WEB-1" } }, ]); diff --git a/packages/mcp-core/src/internal/side-quests.ts b/packages/mcp-core/src/internal/side-quests.ts index 931045bed9..be29b1e1a5 100644 --- a/packages/mcp-core/src/internal/side-quests.ts +++ b/packages/mcp-core/src/internal/side-quests.ts @@ -27,7 +27,7 @@ export interface SideQuest { /** A docs.sentry.io page for the fix. */ docs?: string; /** One line per cause, when causes differ by file. */ - details?: string[]; + details?: string[] | undefined; } interface SideQuestCall { diff --git a/packages/mcp-core/src/internal/test-fixtures.ts b/packages/mcp-core/src/internal/test-fixtures.ts index fa2028c2ca..2421448ef4 100644 --- a/packages/mcp-core/src/internal/test-fixtures.ts +++ b/packages/mcp-core/src/internal/test-fixtures.ts @@ -113,7 +113,7 @@ type MutableEvent = { dateReceived?: string; // ErrorEvent specific fields culprit?: string | null; - dateCreated?: string; + dateCreated?: string | undefined; // TransactionEvent specific fields occurrence?: { id?: string; diff --git a/packages/mcp-core/src/internal/tool-helpers/ai-conversation-actions.ts b/packages/mcp-core/src/internal/tool-helpers/ai-conversation-actions.ts index 63ff7bd828..a4ad63ed23 100644 --- a/packages/mcp-core/src/internal/tool-helpers/ai-conversation-actions.ts +++ b/packages/mcp-core/src/internal/tool-helpers/ai-conversation-actions.ts @@ -8,7 +8,7 @@ import { formatToolCall } from "./tool-call-formatting"; export interface AIConversationReference { conversationId: string; - spanId?: string; + spanId?: string | undefined; } /** Builds transcript actions that match the session's direct or catalog surface. */ @@ -22,8 +22,8 @@ export function getAIConversationSuggestedActions({ organizationSlug: string; aiConversations: AIConversationReference[]; experimentalMode: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; }): SuggestedToolAction[] { return aiConversations .slice(0, MAX_SUGGESTED_ACTIONS) @@ -54,8 +54,8 @@ export function formatAIConversationActionInstructions({ organizationSlug: string; aiConversations: AIConversationReference[]; experimentalMode: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; }): string[] { const actions = getAIConversationSuggestedActions({ organizationSlug, diff --git a/packages/mcp-core/src/internal/tool-helpers/api.ts b/packages/mcp-core/src/internal/tool-helpers/api.ts index 47a248df0e..c9d6c92d94 100644 --- a/packages/mcp-core/src/internal/tool-helpers/api.ts +++ b/packages/mcp-core/src/internal/tool-helpers/api.ts @@ -18,7 +18,7 @@ import { validateRegionUrl } from "./validate-region-url"; */ export function apiServiceFromContext( context: ServerContext, - opts: { regionUrl?: string } = {}, + opts: { regionUrl?: string | undefined } = {}, ) { let host = context.sentryHost; diff --git a/packages/mcp-core/src/internal/tool-helpers/credential-routing.ts b/packages/mcp-core/src/internal/tool-helpers/credential-routing.ts index 5a5e4727de..cd37690a29 100644 --- a/packages/mcp-core/src/internal/tool-helpers/credential-routing.ts +++ b/packages/mcp-core/src/internal/tool-helpers/credential-routing.ts @@ -29,7 +29,7 @@ const ORGANIZATION_URL_PARAMS = [ export function getTargetOrganizationSlug( params: Record, ): string | null { - const slug = params.organizationSlug; + const slug = params["organizationSlug"]; if (typeof slug === "string" && slug.trim()) { return slug.trim(); } @@ -199,9 +199,12 @@ export async function mapCredentialContexts( }), ); const results: Array<{ entry: CredentialContext; value: T }> = []; - let firstError: unknown; + let firstError: ApiError | undefined; for (const [index, result] of settled.entries()) { - const entry = entries[index]!; + const entry = entries[index]; + if (!entry) { + continue; + } if (result.status === "fulfilled") { results.push({ entry, value: result.value }); continue; diff --git a/packages/mcp-core/src/internal/tool-helpers/default-organization.test.ts b/packages/mcp-core/src/internal/tool-helpers/default-organization.test.ts index a8a995bbc5..ad93948344 100644 --- a/packages/mcp-core/src/internal/tool-helpers/default-organization.test.ts +++ b/packages/mcp-core/src/internal/tool-helpers/default-organization.test.ts @@ -11,7 +11,7 @@ import { import type { ToolConfig } from "../../tools/types"; import type { CredentialRouter, ServerContext } from "../../types"; -const requiredOrgTool: ToolConfig = { +const requiredOrgTool: ToolConfig = { name: "required_org_tool", title: "Required Org Tool", description: "required_org_tool description", @@ -30,7 +30,7 @@ const requiredOrgTool: ToolConfig = { handler: async () => "ok", }; -const optionalOrgTool: ToolConfig = { +const optionalOrgTool: ToolConfig = { ...requiredOrgTool, name: "optional_org_tool", inputSchema: { @@ -71,7 +71,7 @@ function serveOrganizations( } async function prepare( - tool: ToolConfig, + tool: ToolConfig, params: Record, context: ServerContext = getServerContext({ sentryHost: "sentry.io" }), ) { @@ -88,8 +88,10 @@ describe("applyDefaultOrganization", () => { requiredOrgTool, getServerContext(), ); - expect(unscoped.organizationSlug?.safeParse(undefined).success).toBe(true); - expect(unscoped.organizationSlug?.safeParse("").success).toBe(false); + expect(unscoped["organizationSlug"]?.safeParse(undefined).success).toBe( + true, + ); + expect(unscoped["organizationSlug"]?.safeParse("").success).toBe(false); const scoped = getFilteredInputSchema( requiredOrgTool, @@ -168,7 +170,7 @@ describe("applyDefaultOrganization", () => { it("defaults a required slug even when the tool's url is an external one", async () => { serveOrganizations([organization("solo-org")]); - const uptimeLikeTool: ToolConfig = { + const uptimeLikeTool: ToolConfig = { ...requiredOrgTool, name: "uptime_like_tool", inputSchema: { @@ -275,14 +277,15 @@ describe("applyDefaultOrganization", () => { : HttpResponse.json({ detail: "Internal error" }, { status: 500 }); }), ); + const workCredential = { id: "work", accessToken: "work-token" }; const credentials = [ - { id: "work", accessToken: "work-token" }, + workCredential, { id: "personal", accessToken: "personal-token" }, ]; const context = getServerContext({ sentryHost: "sentry.io", credentialRouter: { - resolve: async () => credentials[0]!, + resolve: async () => workCredential, list: async () => credentials, }, }); @@ -312,12 +315,13 @@ describe("applyDefaultOrganization", () => { ), ), ); + const workCredential = { id: "work", accessToken: "work-token" }; const credentials = [ - { id: "work", accessToken: "work-token" }, + workCredential, { id: "personal", accessToken: "personal-token" }, ]; const credentialRouter: CredentialRouter = { - resolve: async () => credentials[0]!, + resolve: async () => workCredential, list: async () => credentials, }; const context = getServerContext({ diff --git a/packages/mcp-core/src/internal/tool-helpers/default-organization.ts b/packages/mcp-core/src/internal/tool-helpers/default-organization.ts index 347638d6da..f8ebd20dd8 100644 --- a/packages/mcp-core/src/internal/tool-helpers/default-organization.ts +++ b/packages/mcp-core/src/internal/tool-helpers/default-organization.ts @@ -138,7 +138,7 @@ function isMissing(value: unknown): boolean { /** Whether `value` is what the tool's schema fills in for an omitted `key`. */ function isDefaultValue( - tool: ToolConfig, + tool: ToolConfig, key: string, value: unknown, ): boolean { @@ -155,7 +155,7 @@ function isDefaultValue( * equal to a default are left out to keep the retry short. */ function formatRetry( - tool: ToolConfig, + tool: ToolConfig, rawParams: Record, organizationSlug: string, context: ServerContext, @@ -179,7 +179,7 @@ function formatRetry( } function formatMultipleOrganizationsError( - tool: ToolConfig, + tool: ToolConfig, rawParams: Record, reachable: ReachableOrganizations, context: ServerContext, @@ -226,13 +226,13 @@ export async function applyDefaultOrganization({ rawParams, context, }: { - tool: ToolConfig; + tool: ToolConfig; params: Record; rawParams: Record; context: ServerContext; }): Promise> { - const organizationSchema = tool.inputSchema.organizationSlug; - if (!organizationSchema || !isMissing(params.organizationSlug)) { + const organizationSchema = tool.inputSchema["organizationSlug"]; + if (!organizationSchema || !isMissing(params["organizationSlug"])) { return params; } const isRequired = isOrganizationSlugRequired(organizationSchema); @@ -279,9 +279,9 @@ export async function applyDefaultOrganization({ if ( only.regionUrl && "regionUrl" in tool.inputSchema && - isMissing(params.regionUrl) + isMissing(params["regionUrl"]) ) { - defaulted.regionUrl = only.regionUrl; + defaulted["regionUrl"] = only.regionUrl; } return defaulted; } diff --git a/packages/mcp-core/src/internal/tool-helpers/issue.ts b/packages/mcp-core/src/internal/tool-helpers/issue.ts index 9e9037c717..b242f2b878 100644 --- a/packages/mcp-core/src/internal/tool-helpers/issue.ts +++ b/packages/mcp-core/src/internal/tool-helpers/issue.ts @@ -19,7 +19,7 @@ export function assertIssueWithinProjectConstraint({ resourceLabel = "Issue", }: { issue: Pick; - projectSlug?: string | null; + projectSlug?: string | null | undefined; resourceLabel?: string; }): void { assertScopedProjectSlug({ @@ -39,7 +39,7 @@ export async function ensureIssueWithinProjectConstraint({ apiService: SentryApiService; organizationSlug: string; issueId: string; - projectSlug?: string | null; + projectSlug?: string | null | undefined; resourceLabel?: string; }): Promise { if (!projectSlug) { diff --git a/packages/mcp-core/src/internal/tool-helpers/resolve-region-url.ts b/packages/mcp-core/src/internal/tool-helpers/resolve-region-url.ts index 8a4c696bf9..b7555c20d1 100644 --- a/packages/mcp-core/src/internal/tool-helpers/resolve-region-url.ts +++ b/packages/mcp-core/src/internal/tool-helpers/resolve-region-url.ts @@ -52,7 +52,7 @@ export async function resolveRegionUrlForOrganization({ }: { context: ServerContext; organizationSlug: string; - regionUrl?: string | null; + regionUrl?: string | null | undefined; }): Promise { if (typeof regionUrl === "string") { const trimmed = regionUrl.trim(); diff --git a/packages/mcp-core/src/internal/tool-helpers/seer.ts b/packages/mcp-core/src/internal/tool-helpers/seer.ts index 74628f61fb..2e6d35f634 100644 --- a/packages/mcp-core/src/internal/tool-helpers/seer.ts +++ b/packages/mcp-core/src/internal/tool-helpers/seer.ts @@ -158,12 +158,12 @@ function lookupKnownKey( export function getSeerPaymentRequiredMessage(responseBody: unknown): string { if ( !isPlainObject(responseBody) || - !lookupKnownKey(SEER_OUT_OF_CREDITS_CODES, responseBody.code) + !lookupKnownKey(SEER_OUT_OF_CREDITS_CODES, responseBody["code"]) ) { return SEER_NO_QUOTA_MESSAGE; } return ( - lookupKnownKey(SEER_DENIAL_MESSAGES, responseBody.denialReason) ?? + lookupKnownKey(SEER_DENIAL_MESSAGES, responseBody["denialReason"]) ?? SEER_START_OUT_OF_CREDITS_MESSAGE ); } @@ -177,13 +177,13 @@ export function getSeerSetupRequiredMessage( ): string | null { if ( !isPlainObject(responseBody) || - !lookupKnownKey(SEER_SETUP_REQUIRED_CODES, responseBody.code) || - typeof responseBody.detail !== "string" + !lookupKnownKey(SEER_SETUP_REQUIRED_CODES, responseBody["code"]) || + typeof responseBody["detail"] !== "string" ) { return null; } return [ - responseBody.detail, + responseBody["detail"], "", "Retrying won't help until someone sets this up in Sentry. Investigate without Seer by reading the issue and its events.", ].join("\n"); @@ -334,7 +334,7 @@ export function getOutputForAutofixRun( const artifacts = getAutofixArtifacts(autofix); let output = ""; - const rootCause = formatRootCauseArtifact(artifacts.root_cause); + const rootCause = formatRootCauseArtifact(artifacts["root_cause"]); if (rootCause) { output += wrapSeerAnalysisOutput({ output: `## Root Cause Analysis\n\n${rootCause}`, @@ -345,7 +345,7 @@ export function getOutputForAutofixRun( output += "\n"; } - const solution = formatSolutionArtifact(artifacts.solution); + const solution = formatSolutionArtifact(artifacts["solution"]); if (solution) { output += wrapSeerAnalysisOutput({ output: `## Proposed Solution\n\n${solution}`, @@ -375,8 +375,10 @@ export function getAutofixArtifactSummaries(autofix: AutofixRun): { solution: string | null; } { const artifacts = getAutofixArtifacts(autofix); - const rootCause = RootCauseArtifactDataSchema.safeParse(artifacts.root_cause); - const solution = SolutionArtifactDataSchema.safeParse(artifacts.solution); + const rootCause = RootCauseArtifactDataSchema.safeParse( + artifacts["root_cause"], + ); + const solution = SolutionArtifactDataSchema.safeParse(artifacts["solution"]); return { rootCause: (rootCause.success && @@ -391,8 +393,8 @@ export function getAutofixArtifactSummaries(autofix: AutofixRun): { * a run is processing. */ export function getActiveAutofixTodo(autofix: AutofixRun): string | null { - for (const block of autofix.blocks.toReversed()) { - const todos = block.todos; + for (let i = autofix.blocks.length - 1; i >= 0; i--) { + const todos = autofix.blocks[i]?.todos; if (!todos?.length) { continue; } diff --git a/packages/mcp-core/src/internal/tool-helpers/suggested-actions.ts b/packages/mcp-core/src/internal/tool-helpers/suggested-actions.ts index d29e190c9e..23c79fe0bf 100644 --- a/packages/mcp-core/src/internal/tool-helpers/suggested-actions.ts +++ b/packages/mcp-core/src/internal/tool-helpers/suggested-actions.ts @@ -43,8 +43,8 @@ export function buildSuggestedToolAction({ arguments: Record; reason: string; experimentalMode: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; }): SuggestedToolAction | null { const route = getToolCallRoute(toolName, { experimentalMode, diff --git a/packages/mcp-core/src/internal/tool-helpers/tool-call-formatting.ts b/packages/mcp-core/src/internal/tool-helpers/tool-call-formatting.ts index 04b861d006..1124d5180b 100644 --- a/packages/mcp-core/src/internal/tool-helpers/tool-call-formatting.ts +++ b/packages/mcp-core/src/internal/tool-helpers/tool-call-formatting.ts @@ -55,8 +55,8 @@ function isDirectTool( /** The tools the current session exposes, for checking a follow-up call. */ export interface ToolSession { experimentalMode: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; } /** @@ -110,9 +110,9 @@ export function formatToolCallInstruction({ arguments?: Record; showArguments?: boolean; experimentalMode: boolean; - purpose?: string; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + purpose?: string | undefined; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; fallbackInstruction?: string; }): string { const route = getToolCallRoute(toolName, { diff --git a/packages/mcp-core/src/internal/type-guards.ts b/packages/mcp-core/src/internal/type-guards.ts index 4890ff83b5..fc557f7449 100644 --- a/packages/mcp-core/src/internal/type-guards.ts +++ b/packages/mcp-core/src/internal/type-guards.ts @@ -3,3 +3,36 @@ export function isPlainObject( ): value is Record { return typeof value === "object" && value !== null && !Array.isArray(value); } + +/** + * `T` with every property that may hold `undefined` made optional instead, + * so the result fits types that model "unset" as an absent key + * (`exactOptionalPropertyTypes`). + */ +export type OmitUndefined = { + [K in keyof T as undefined extends T[K] ? never : K]: T[K]; +} & { + [K in keyof T as undefined extends T[K] ? K : never]?: Exclude< + T[K], + undefined + >; +}; + +/** + * Copies `value` without the keys whose value is `undefined`. + * + * Use it where a caller forwards optional values (for example MCP tool + * params) to an API that treats an absent key as "unset" and does not accept + * an explicit `undefined`. + */ +export function omitUndefined(value: T): OmitUndefined { + const result: Record = {}; + for (const [key, entry] of Object.entries(value)) { + if (entry !== undefined) { + result[key] = entry; + } + } + // Every key left holds a defined value, which is what OmitUndefined + // describes; TypeScript cannot follow that through Object.entries. + return result as OmitUndefined; +} diff --git a/packages/mcp-core/src/internal/url-helpers.ts b/packages/mcp-core/src/internal/url-helpers.ts index 6b5a647253..2caa76524a 100644 --- a/packages/mcp-core/src/internal/url-helpers.ts +++ b/packages/mcp-core/src/internal/url-helpers.ts @@ -40,19 +40,19 @@ export interface ParsedSentryUrl { /** AI conversation ID (for Explore conversation URLs) */ conversationId?: string; /** Span ID (for trace URLs with span focus, from query param) */ - spanId?: string; + spanId?: string | undefined; /** Event ID (for event URLs) */ eventId?: string; /** Project slug or numeric ID (for profile, monitor, and AI conversation URLs) */ - projectSlugOrId?: string; + projectSlugOrId?: string | undefined; /** Transaction profile ID from profile flamegraph URLs */ - profileId?: string; + profileId?: string | undefined; /** Profiler ID (for profile URLs, from query param) */ - profilerId?: string; + profilerId?: string | undefined; /** Start timestamp (for profile URLs, from query param) */ - start?: string; + start?: string | undefined; /** End timestamp (for profile URLs, from query param) */ - end?: string; + end?: string | undefined; /** Replay ID/slug (for replay URLs) */ replayId?: string; /** Monitor slug (for cron monitor URLs) */ @@ -64,7 +64,7 @@ export interface ParsedSentryUrl { /** Snapshot ID (for preprod snapshot URLs) */ snapshotId?: string; /** Selected snapshot image name (from ?selectedSnapshot= query param) */ - selectedSnapshot?: string; + selectedSnapshot?: string | undefined; /** Dashboard numeric ID (for dashboard URLs) */ dashboardId?: string; } @@ -174,14 +174,14 @@ function extractOrganizationSlug(parsedUrl: URL, pathParts: string[]): string { "insights", "preprod", ]; - const [firstPathPart, secondPathPart] = pathParts; + const [firstPart, secondPart] = pathParts; if ( - firstPathPart !== undefined && - secondPathPart !== undefined && - !knownSegments.includes(firstPathPart) && - knownSegments.includes(secondPathPart) + firstPart !== undefined && + secondPart !== undefined && + !knownSegments.includes(firstPart) && + knownSegments.includes(secondPart) ) { - return firstPathPart; + return firstPart; } // Check for subdomain (e.g., my-org.sentry.io) @@ -192,8 +192,8 @@ function extractOrganizationSlug(parsedUrl: URL, pathParts: string[]): string { // Non-region subdomain (e.g., my-org.sentry.io or sentry.mycompany.com) const [subdomain] = hostParts; if ( - subdomain !== undefined && hostParts.length >= 2 && + subdomain !== undefined && !regionPrefixes.includes(subdomain) ) { return subdomain; diff --git a/packages/mcp-core/src/internal/url-scope.ts b/packages/mcp-core/src/internal/url-scope.ts index 254c3f1c8b..8946cababa 100644 --- a/packages/mcp-core/src/internal/url-scope.ts +++ b/packages/mcp-core/src/internal/url-scope.ts @@ -7,7 +7,7 @@ export function resolveScopedOrganizationSlug({ urlOrganizationSlug, }: { resourceLabel: string; - scopedOrganizationSlug?: string | null; + scopedOrganizationSlug?: string | null | undefined; urlOrganizationSlug: string; }): string { if (!scopedOrganizationSlug) { @@ -29,7 +29,7 @@ export function resolveScopedProjectSlug({ urlProjectSlug, }: { resourceLabel: string; - scopedProjectSlug?: string | null; + scopedProjectSlug?: string | null | undefined; urlProjectSlug: string; }): string { if (!scopedProjectSlug) { @@ -51,7 +51,7 @@ export function assertScopedProjectSlug({ actualProjectSlug, }: { resourceLabel: string; - scopedProjectSlug?: string | null; + scopedProjectSlug?: string | null | undefined; actualProjectSlug: string; }): string { if (!scopedProjectSlug) { @@ -73,7 +73,7 @@ export function resolveScopedProjectSlugOrId({ urlProjectSlug, }: { resourceLabel: string; - scopedProjectSlugOrId?: string | number | null; + scopedProjectSlugOrId?: string | number | null | undefined; urlProjectSlug: string; }): string | number { if ( diff --git a/packages/mcp-core/src/internal/user-formatting.ts b/packages/mcp-core/src/internal/user-formatting.ts index ef3865e151..5b87094206 100644 --- a/packages/mcp-core/src/internal/user-formatting.ts +++ b/packages/mcp-core/src/internal/user-formatting.ts @@ -8,10 +8,10 @@ export function formatUserGeoSummary(value: unknown): string | null { } const parts = [ - value.country_code, - value.city, - value.region, - value.country_name, + value["country_code"], + value["city"], + value["region"], + value["country_name"], ].filter( (part): part is string => typeof part === "string" && part.length > 0, ); diff --git a/packages/mcp-core/src/server.all-tools.test.ts b/packages/mcp-core/src/server.all-tools.test.ts index f0f3db58b8..be504d760e 100644 --- a/packages/mcp-core/src/server.all-tools.test.ts +++ b/packages/mcp-core/src/server.all-tools.test.ts @@ -78,8 +78,10 @@ function findArraysWithoutItemSchema( } const record = schema as Record; - const types = Array.isArray(record.type) ? record.type : [record.type]; - const items = record.items; + const types = Array.isArray(record["type"]) + ? record["type"] + : [record["type"]]; + const items = record["items"]; const violations = types.includes("array") && (!items || typeof items !== "object" || Array.isArray(items)) diff --git a/packages/mcp-core/src/server.metadata.test.ts b/packages/mcp-core/src/server.metadata.test.ts index 626fedc71b..b6ad31bb02 100644 --- a/packages/mcp-core/src/server.metadata.test.ts +++ b/packages/mcp-core/src/server.metadata.test.ts @@ -231,10 +231,14 @@ describe("outputSchema skip lists", () => { it("name listed tools without an outputSchema", () => { const problems = [ - ...Object.keys(OUTPUT_SCHEMA_EXEMPT).map((name) => ["EXEMPT", name]), - ...Object.keys(OUTPUT_SCHEMA_PENDING).map((name) => ["PENDING", name]), + ...Object.keys(OUTPUT_SCHEMA_EXEMPT).map( + (name) => ["EXEMPT", name] as const, + ), + ...Object.keys(OUTPUT_SCHEMA_PENDING).map( + (name) => ["PENDING", name] as const, + ), ].flatMap(([list, name]) => { - const tools = listings(name!); + const tools = listings(name); if (tools.length === 0) { return [`${name}: in OUTPUT_SCHEMA_${list} but not listed`]; } diff --git a/packages/mcp-core/src/server.test.ts b/packages/mcp-core/src/server.test.ts index d252f71925..a5e12dbc5a 100644 --- a/packages/mcp-core/src/server.test.ts +++ b/packages/mcp-core/src/server.test.ts @@ -17,7 +17,7 @@ import { projectFixture, } from "@sentry/mcp-server-mocks"; import { HttpResponse, http } from "msw"; -import { beforeEach, describe, expect, it, vi } from "vitest"; +import { assert, beforeEach, describe, expect, it, vi } from "vitest"; import { z } from "zod"; import { MAX_TOOL_INPUT_ELEMENTS } from "@sentry/toolkit-core/mcp-limits"; import { ApiAuthenticationError } from "./api-client"; @@ -34,7 +34,7 @@ import { } from "./test-utils/structured-content"; import type { GetIssueDetailsPayload } from "./tools/catalog/get-issue-details"; import { createExecuteTool } from "./tools/special/execute-tool"; -import type { ToolConfig } from "./tools/types"; +import type { DescriptionContext, ToolConfig } from "./tools/types"; import type { CredentialRouter, ServerContext } from "./types"; import { LIB_VERSION } from "./version"; @@ -309,12 +309,12 @@ describe("buildServer", () => { "https://sentry.io/api/0/organizations/:org/", ({ params, request }) => { seen.push({ - org: String(params.org), + org: String(params["org"]), authorization: request.headers.get("authorization"), }); return HttpResponse.json({ id: "1", - slug: params.org, + slug: params["org"], name: "Org", }); }, @@ -325,7 +325,7 @@ describe("buildServer", () => { tools: { org_tool: orgTool(async (params, context) => { const org = await apiServiceFromContext(context).getOrganization( - String(params.organizationSlug), + String(params["organizationSlug"]), ); return org.slug; }), @@ -424,7 +424,7 @@ describe("buildServer", () => { return "ok"; }), }; - registry.execute_sentry_tool = createExecuteTool(() => registry); + registry["execute_sentry_tool"] = createExecuteTool(() => registry); const server = buildServer({ context: { ...baseContext, credentialRouter: router }, tools: registry, @@ -663,7 +663,7 @@ describe("buildServer", () => { }, }), }; - registry.execute_sentry_tool = createExecuteTool(() => registry); + registry["execute_sentry_tool"] = createExecuteTool(() => registry); const server = buildServer({ context: baseContext, tools: registry }); await callRegisteredTool(server, "execute_sentry_tool", { @@ -699,9 +699,9 @@ describe("buildServer", () => { } )._registeredTools; - expect(registeredTools.v2_tool).toBeDefined(); + expect(registeredTools["v2_tool"]).toBeDefined(); await expect( - registeredTools.v2_tool?.handler({ value: "ok" }), + registeredTools["v2_tool"]?.handler({ value: "ok" }), ).resolves.toMatchObject({ content: [{ type: "text", text: "v2:ok" }], }); @@ -955,7 +955,9 @@ describe("buildServer", () => { } )._registeredTools; - await registeredTools.example_tool!.handler({}, {}); + const exampleTool = registeredTools["example_tool"]; + assert(exampleTool, "example_tool was not registered"); + await exampleTool.handler({}, {}); expect(setUser).toHaveBeenCalledWith({ id: "user-123", @@ -986,7 +988,7 @@ describe("buildServer", () => { it("keeps it from stable sessions, which still get markdown", async () => { const [tool] = await listRegisteredTools(createServer(false)); - expect(tool!.outputSchema).toBeUndefined(); + expect(tool?.outputSchema).toBeUndefined(); }); }); @@ -1289,15 +1291,10 @@ describe("buildServer", () => { describe("dynamic descriptions", () => { it("resolves function descriptions with context", () => { - const dynamicDescription = vi.fn( - (ctx: { - experimentalMode: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; - }) => - ctx.experimentalMode - ? "Experimental description" - : "Normal description", + const dynamicDescription = vi.fn((ctx: DescriptionContext) => + ctx.experimentalMode + ? "Experimental description" + : "Normal description", ); buildServer({ @@ -1740,7 +1737,8 @@ describe("buildServer", () => { } & Record >; }>(result); - const firstResult = payload.results[0]; + const [firstResult] = payload.results; + assert(firstResult, "Expected at least one tool search result"); expect(payload.query).toBe("replay"); expect(getTextContent(result)).toBe( @@ -1748,8 +1746,8 @@ describe("buildServer", () => { ); expect(getTextContent(result)).not.toContain("# Tool Search Results"); expect(getTextContent(result)).not.toContain("```json"); - expect(firstResult?.name).toBe("get_replay_details"); - expect(Object.keys(firstResult!).sort()).toEqual([ + expect(firstResult.name).toBe("get_replay_details"); + expect(Object.keys(firstResult).sort()).toEqual([ "annotations", "description", "inputSchema", @@ -1758,7 +1756,7 @@ describe("buildServer", () => { expect(firstResult).not.toHaveProperty("requiredSkills"); expect(firstResult).not.toHaveProperty("requiredScopes"); expect(firstResult).not.toHaveProperty("skills"); - expect(firstResult!.inputSchema.properties).not.toHaveProperty( + expect(firstResult.inputSchema.properties).not.toHaveProperty( "organizationSlug", ); }); @@ -2275,7 +2273,7 @@ describe("buildServer", () => { http.post( "*/api/0/organizations/:org/issues/:issueId/notes/", ({ params }) => { - expect(params.org).toBe("sentry-mcp-evals"); + expect(params["org"]).toBe("sentry-mcp-evals"); return HttpResponse.json({ id: "activity-1", commentId: "comment-1", @@ -3188,7 +3186,7 @@ describe("buildServer", () => { return `${parsed.organizationSlug}:${parsed.filter}:${parsed.nested.limit}`; }); const registry: Record = {}; - registry.fake_catalog_tool = createMockTool("fake_catalog_tool", { + registry["fake_catalog_tool"] = createMockTool("fake_catalog_tool", { inputSchema: { organizationSlug: z.string(), filter: z.string(), @@ -3196,7 +3194,7 @@ describe("buildServer", () => { }, handler, }); - registry.execute_sentry_tool = createExecuteTool(() => registry); + registry["execute_sentry_tool"] = createExecuteTool(() => registry); const server = buildServer({ context: { ...baseContext, @@ -3245,12 +3243,12 @@ describe("buildServer", () => { it("marks the catalog tool span as errored when execute_sentry_tool validation fails", async () => { const registry: Record = {}; - registry.fake_catalog_tool = createMockTool("fake_catalog_tool", { + registry["fake_catalog_tool"] = createMockTool("fake_catalog_tool", { inputSchema: { requiredValue: z.string(), }, }); - registry.execute_sentry_tool = createExecuteTool(() => registry); + registry["execute_sentry_tool"] = createExecuteTool(() => registry); const server = buildServer({ context: baseContext, tools: registry, @@ -3276,7 +3274,7 @@ describe("buildServer", () => { const span = startedSpans[0]; expect(span?.setStatus).toHaveBeenCalledWith({ code: 2 }); // Expected validation failures mark the span failed without recording an exception. - expect(span!.recordException).not.toHaveBeenCalled(); + expect(span?.recordException).not.toHaveBeenCalled(); }); it("execute_sentry_tool injects constrained arguments for catalog-only tools", async () => { diff --git a/packages/mcp-core/src/server.ts b/packages/mcp-core/src/server.ts index 3ade13e5c0..4d56161486 100644 --- a/packages/mcp-core/src/server.ts +++ b/packages/mcp-core/src/server.ts @@ -130,7 +130,7 @@ function markUnknownToolCalls( } requestHandlers.set("tools/call", async (request, ctx) => { - const name = request.params?.name; + const name = request.params?.["name"]; if (typeof name !== "string" || registeredToolNames.has(name)) { return await handleToolsCall(request, ctx); } @@ -231,17 +231,18 @@ function toWellFormedOutput(value: T): T { return value; } if (Array.isArray(value)) { + const items: unknown[] = value; let copy: unknown[] | undefined; - for (let index = 0; index < value.length; index++) { - const next = toWellFormedOutput(value[index]); - if (next !== value[index]) { - copy ??= [...value]; + for (let index = 0; index < items.length; index++) { + const next = toWellFormedOutput(items[index]); + if (next !== items[index]) { + copy ??= [...items]; copy[index] = next; } } return (copy ?? value) as T; } - const prototype = Object.getPrototypeOf(value); + const prototype: unknown = Object.getPrototypeOf(value); if (prototype !== Object.prototype && prototype !== null) { return value; } @@ -311,6 +312,9 @@ export function buildServer({ tools: customTools, toolCallSpanAttributes, }); + const instructions = buildServerInstructions( + new Set(registrations.map(({ name }) => name)), + ); const server = new McpServer( { ...MCP_SERVER_INFO, @@ -318,9 +322,7 @@ export function buildServer({ }, { maxToolInputElements: MAX_TOOL_INPUT_ELEMENTS, - instructions: buildServerInstructions( - new Set(registrations.map(({ name }) => name)), - ), + ...(instructions !== undefined && { instructions }), }, ); server.server.onerror = (error) => { @@ -365,7 +367,7 @@ function configureServer({ }: { context: ServerContext; experimentalMode?: boolean; - tools?: ToolRegistry; + tools?: ToolRegistry | undefined; toolCallSpanAttributes: Record; }) { const registrations = []; diff --git a/packages/mcp-core/src/telem/logging.test.ts b/packages/mcp-core/src/telem/logging.test.ts index ca2a3b2343..1f81f5d219 100644 --- a/packages/mcp-core/src/telem/logging.test.ts +++ b/packages/mcp-core/src/telem/logging.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, it, vi, afterEach } from "vitest"; +import { assert, describe, expect, it, vi, afterEach } from "vitest"; describe("logging", () => { afterEach(() => { @@ -23,7 +23,9 @@ describe("logging", () => { expect(info).not.toHaveBeenCalled(); expect(error).toHaveBeenCalledTimes(1); - const [payload] = error.mock.calls[0]!; + const [call] = error.mock.calls; + assert(call, "console.error was not called"); + const [payload] = call; expect(typeof payload).toBe("string"); expect(JSON.parse(payload as string)).toMatchObject({ level: "INFO", @@ -54,7 +56,9 @@ describe("logging", () => { }); expect(error).toHaveBeenCalledTimes(1); - const [payload] = error.mock.calls[0]!; + const [call] = error.mock.calls; + assert(call, "console.error was not called"); + const [payload] = call; expect(JSON.parse(payload as string)).toMatchObject({ level: "ERROR", message: "issue failed", diff --git a/packages/mcp-core/src/telem/logging.ts b/packages/mcp-core/src/telem/logging.ts index 271c99d49f..94904198d7 100644 --- a/packages/mcp-core/src/telem/logging.ts +++ b/packages/mcp-core/src/telem/logging.ts @@ -50,7 +50,7 @@ let loggingConfigured = false; function resolveLowestLevel(): LogLevel { const envLevel = - typeof process !== "undefined" ? process.env.LOG_LEVEL : undefined; + typeof process !== "undefined" ? process.env["LOG_LEVEL"] : undefined; if (envLevel) { try { @@ -61,7 +61,7 @@ function resolveLowestLevel(): LogLevel { } return typeof process !== "undefined" && - process.env.NODE_ENV === "development" + process.env["NODE_ENV"] === "development" ? "debug" : "info"; } @@ -182,7 +182,7 @@ export function getLogger( ): Logger { ensureLoggingConfigured(); - const category = Array.isArray(scope) ? scope : [scope]; + const category = typeof scope === "string" ? [scope] : scope; const logger = getLogTapeLogger([...ROOT_LOG_CATEGORY, ...category]); return defaults ? logger.with(defaults) : logger; @@ -281,7 +281,7 @@ function buildLogProperties( }; if (serializedError) { - properties.error = serializedError; + properties["error"] = serializedError; } if (options.extra) { @@ -299,7 +299,7 @@ function buildLogProperties( } if (options.contexts) { - properties.sentryContexts = options.contexts; + properties["sentryContexts"] = options.contexts; } return properties; @@ -392,11 +392,11 @@ export function logIssue( return typeof error === "string" ? captureMessage(error, { - contexts: options.contexts, + ...(options.contexts && { contexts: options.contexts }), level: captureLevel, }) : captureException(error, { - contexts: options.contexts, + ...(options.contexts && { contexts: options.contexts }), level: captureLevel, }); }); diff --git a/packages/mcp-core/src/telem/scope.ts b/packages/mcp-core/src/telem/scope.ts index 77bff4a649..a317fe2591 100644 --- a/packages/mcp-core/src/telem/scope.ts +++ b/packages/mcp-core/src/telem/scope.ts @@ -8,19 +8,19 @@ import { isNumericId } from "../utils/slug-validation"; */ export interface Target { organizationSlug: string; - projectSlug?: string | null; + projectSlug?: string | null | undefined; /** Numeric project ID. */ - projectId?: string | number | null; + projectId?: string | number | null | undefined; /** * Project reference as the user gave it: a numeric value is sent as * `project.id`, any other value as `project.slug`. */ - projectSlugOrId?: string | null; + projectSlugOrId?: string | null | undefined; teamSlug?: string | null; issueId?: string | null; traceId?: string | null; /** Span ID inside `traceId`. */ - spanId?: string | null; + spanId?: string | null | undefined; monitorSlug?: string | null; uptimeMonitorId?: string | null; releaseVersion?: string | null; diff --git a/packages/mcp-core/src/telem/sentry.test.ts b/packages/mcp-core/src/telem/sentry.test.ts index 7463163323..346a81fe36 100644 --- a/packages/mcp-core/src/telem/sentry.test.ts +++ b/packages/mcp-core/src/telem/sentry.test.ts @@ -10,7 +10,7 @@ describe("sentry", () => { "Error with key: sk-abc123def456ghi789jkl012mno345pqr678stu901vwx234", }; - const result = sentryBeforeSend(event, {}) as SentryEvent; + const result = sentryBeforeSend(event, {}); expect(result.message).toBe("Error with key: [REDACTED_OPENAI_KEY]"); }); @@ -20,7 +20,7 @@ describe("sentry", () => { "Keys: sk-abc123def456ghi789jkl012mno345pqr678stu901vwx234 and sk-xyz123def456ghi789jkl012mno345pqr678stu901vwx234", }; - const result = sentryBeforeSend(event, {}) as SentryEvent; + const result = sentryBeforeSend(event, {}); expect(result.message).toBe( "Keys: [REDACTED_OPENAI_KEY] and [REDACTED_OPENAI_KEY]", ); @@ -32,7 +32,7 @@ describe("sentry", () => { "Not a key: sk-abc or task-abc123def456ghi789jkl012mno345pqr678stu901vwx234", }; - const result = sentryBeforeSend(event, {}) as SentryEvent; + const result = sentryBeforeSend(event, {}); expect(result.message).toBe(event.message); }); }); @@ -44,7 +44,7 @@ describe("sentry", () => { "Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIn0.dozjgNryP4J3jVmNHl0w5N_XgL0n3I9PlFUP0THsR8U", }; - const result = sentryBeforeSend(event, {}) as SentryEvent; + const result = sentryBeforeSend(event, {}); expect(result.message).toBe("Authorization: Bearer [REDACTED_TOKEN]"); }); }); @@ -56,7 +56,7 @@ describe("sentry", () => { "Using token: sntrys_eyJpYXQiOjE2OTQwMzMxNTMuNzk0NjI4LCJ1cmwiOiJodHRwczovL3NlbnRyeS5pbyIsInJlZ2lvbl91cmwiOiJodHRwczovL3VzLnNlbnRyeS5pbyIsIm9yZyI6InNlbnRyeSJ9_abcdef123456", }; - const result = sentryBeforeSend(event, {}) as SentryEvent; + const result = sentryBeforeSend(event, {}); expect(result.message).toBe("Using token: [REDACTED_SENTRY_TOKEN]"); }); }); @@ -74,7 +74,7 @@ describe("sentry", () => { }, }; - const result = sentryBeforeSend(event, {}) as SentryEvent; + const result = sentryBeforeSend(event, {}); expect(result.extra).toEqual({ config: { apiKey: "[REDACTED_OPENAI_KEY]", @@ -99,11 +99,11 @@ describe("sentry", () => { ], }; - const result = sentryBeforeSend(event, {}) as SentryEvent; + const result = sentryBeforeSend(event, {}); expect(result.breadcrumbs?.[0]?.message).toBe( "API call with [REDACTED_OPENAI_KEY]", ); - expect(result.breadcrumbs?.[0]?.data?.tokens).toEqual([ + expect(result.breadcrumbs?.[0]?.data?.["tokens"]).toEqual([ "[REDACTED_SENTRY_TOKEN]", "[REDACTED_SENTRY_TOKEN]", ]); @@ -125,7 +125,7 @@ describe("sentry", () => { }, }; - const result = sentryBeforeSend(event, {}) as SentryEvent; + const result = sentryBeforeSend(event, {}); expect(result.exception?.values?.[0]?.value).toBe( "Failed to authenticate with [REDACTED_OPENAI_KEY]", ); @@ -141,7 +141,7 @@ describe("sentry", () => { }, }; - const result = sentryBeforeSend(event, {}) as SentryEvent; + const result = sentryBeforeSend(event, {}); expect(result).toEqual(event); }); }); @@ -164,8 +164,8 @@ describe("sentry", () => { const result2 = sentryBeforeSend(event2, {}); // Both should be properly scrubbed - expect(result1?.message).toBe("First error with [REDACTED_OPENAI_KEY]"); - expect(result2?.message).toBe("Second error with [REDACTED_OPENAI_KEY]"); + expect(result1.message).toBe("First error with [REDACTED_OPENAI_KEY]"); + expect(result2.message).toBe("Second error with [REDACTED_OPENAI_KEY]"); // Test multiple replacements in the same string const event3: SentryEvent = { @@ -174,7 +174,7 @@ describe("sentry", () => { }; const result3 = sentryBeforeSend(event3, {}); - expect(result3?.message).toBe( + expect(result3.message).toBe( "Multiple keys: [REDACTED_OPENAI_KEY] and [REDACTED_OPENAI_KEY]", ); }); @@ -195,7 +195,7 @@ describe("sentry", () => { extra: deep, }; - const result = sentryBeforeSend(event, {}) as SentryEvent; + const result = sentryBeforeSend(event, {}); // Should not throw, and should handle max depth gracefully expect(result).toBeDefined(); expect(result.message).toBe("Deep nesting test"); diff --git a/packages/mcp-core/src/telem/sentry.ts b/packages/mcp-core/src/telem/sentry.ts index dc2036b7ce..d0de3d0a08 100644 --- a/packages/mcp-core/src/telem/sentry.ts +++ b/packages/mcp-core/src/telem/sentry.ts @@ -1,3 +1,5 @@ +import { isPlainObject } from "../internal/type-guards"; + interface ScrubPattern { pattern: RegExp; replacement: string; @@ -92,14 +94,29 @@ function scrubValue(value: unknown, depth = 0): [unknown, boolean, string[]] { * Sentry beforeSend hook that scrubs sensitive data from events * and applies custom fingerprinting for specific error types. */ -export function sentryBeforeSend(event: any, _hint: any): any { +export function sentryBeforeSend( + event: TEvent, + _hint: unknown, +): TEvent { // Custom fingerprinting for AI SDK API call errors. // These errors share the same stack trace but have different messages // (e.g., "Country, region, or territory not supported", temperature issues). // Without custom fingerprinting, they all get grouped into a single issue. - const firstException = event?.exception?.values?.[0]; - if (firstException?.type === "AI_APICallError" && firstException.value) { - event.fingerprint = ["AI_APICallError", firstException.value]; + const exception: unknown = "exception" in event ? event.exception : undefined; + const exceptionValues = isPlainObject(exception) + ? exception["values"] + : undefined; + const firstException: unknown = Array.isArray(exceptionValues) + ? exceptionValues[0] + : undefined; + if ( + isPlainObject(firstException) && + firstException["type"] === "AI_APICallError" && + firstException["value"] + ) { + Object.assign(event, { + fingerprint: ["AI_APICallError", firstException["value"]], + }); } // Always scrub the entire event @@ -114,7 +131,9 @@ export function sentryBeforeSend(event: any, _hint: any): any { ); } - return scrubbedEvent as any; + // scrubValue copies objects and arrays key by key and only rewrites string + // leaves, so the scrubbed event keeps the event's shape. + return scrubbedEvent as TEvent; } // Emails in free-form text we log (search queries, error messages) are redacted diff --git a/packages/mcp-core/src/tools/catalog-runtime/availability.ts b/packages/mcp-core/src/tools/catalog-runtime/availability.ts index ebba91844b..995b84c027 100644 --- a/packages/mcp-core/src/tools/catalog-runtime/availability.ts +++ b/packages/mcp-core/src/tools/catalog-runtime/availability.ts @@ -24,11 +24,11 @@ import { resolveDescription, } from "../types"; -export type ToolRegistry = Record>; +export type ToolRegistry = Record; export interface ToolWithContext { key: string; - tool: ToolConfig; + tool: ToolConfig; isCatalogTool: boolean; isTopLevel: boolean; } @@ -46,7 +46,7 @@ function getToolPlacement({ useDefaultSurfacePolicy, }: { key: string; - tool: ToolConfig; + tool: ToolConfig; experimentalMode: boolean; useDefaultSurfacePolicy: boolean; }): { @@ -69,7 +69,7 @@ function hasRequiredCapabilities({ tool, context, }: { - tool: ToolConfig; + tool: ToolConfig; context: ServerContext; }): boolean { if ( @@ -90,7 +90,7 @@ function isAllowedBySkills({ tool, context, }: { - tool: ToolConfig; + tool: ToolConfig; context: ServerContext; }): boolean { const grantedSkills: Set | undefined = context.grantedSkills @@ -132,7 +132,7 @@ function isMissingFeedbackDsn(key: string): boolean { * {@link applyDefaultOrganization} fills it, or explains which one to pass. */ export function getFilteredInputSchema( - tool: ToolConfig, + tool: ToolConfig, context: ServerContext, ): Record { const constraintKeysToFilter = new Set( @@ -146,16 +146,16 @@ export function getFilteredInputSchema( ) as Record; if ( "organizationSlug" in schema && - isOrganizationSlugRequired(schema.organizationSlug) + isOrganizationSlugRequired(schema["organizationSlug"]) ) { - schema.organizationSlug = schema.organizationSlug.optional(); + schema["organizationSlug"] = schema["organizationSlug"].optional(); } return schema; } export function injectConstraintParams( params: Record, - tool: ToolConfig, + tool: ToolConfig, context: ServerContext, ): Record { return { @@ -263,7 +263,7 @@ export async function executeToolHandler({ params, context, }: { - tool: ToolConfig; + tool: ToolConfig; params: Record; context: ServerContext; }) { @@ -286,7 +286,7 @@ export function prepareToolParams({ params, context, }: { - tool: ToolConfig; + tool: ToolConfig; params: Record; context: ServerContext; }): Record { @@ -313,7 +313,7 @@ export async function prepareToolCallParams({ params, context, }: { - tool: ToolConfig; + tool: ToolConfig; params: Record; context: ServerContext; }): Promise> { @@ -326,7 +326,7 @@ export async function prepareToolCallParams({ } export function resolveToolDescription( - tool: ToolConfig, + tool: ToolConfig, context: DescriptionContext, ): string { return resolveDescription(tool.description, context); diff --git a/packages/mcp-core/src/tools/catalog-runtime/search.ts b/packages/mcp-core/src/tools/catalog-runtime/search.ts index 7098eee156..518b2ccfb3 100644 --- a/packages/mcp-core/src/tools/catalog-runtime/search.ts +++ b/packages/mcp-core/src/tools/catalog-runtime/search.ts @@ -17,7 +17,7 @@ export interface ToolSearchResult { name: string; description: string; inputSchema: Record; - annotations: ToolConfig["annotations"]; + annotations: ToolConfig["annotations"]; } function tokenize(value: string): string[] { diff --git a/packages/mcp-core/src/tools/catalog/analyze-issue-with-seer.test.ts b/packages/mcp-core/src/tools/catalog/analyze-issue-with-seer.test.ts index b93543fe98..91954344ba 100644 --- a/packages/mcp-core/src/tools/catalog/analyze-issue-with-seer.test.ts +++ b/packages/mcp-core/src/tools/catalog/analyze-issue-with-seer.test.ts @@ -18,7 +18,7 @@ describe("analyze_issue_with_seer", () => { ({ params }) => HttpResponse.json( createUnsupportedIssue({ - shortId: String(params.issueId), + shortId: String(params["issueId"]), }), ), ), @@ -43,9 +43,7 @@ describe("analyze_issue_with_seer", () => { issueUrl: undefined, }, { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -125,9 +123,7 @@ describe("analyze_issue_with_seer", () => { issueUrl: undefined, }, { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -190,9 +186,7 @@ describe("analyze_issue_with_seer", () => { issueId: "CLOUDFLARE-MCP-99", }, { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -236,9 +230,7 @@ describe("analyze_issue_with_seer", () => { issueId: "CLOUDFLARE-MCP-500", }, { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -292,9 +284,7 @@ describe("analyze_issue_with_seer", () => { issueId: "CLOUDFLARE-MCP-TIMEOUT", }, { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -345,9 +335,7 @@ describe("analyze_issue_with_seer", () => { issueId: "CLOUDFLARE-MCP-ERRORS", }, { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -405,9 +393,7 @@ describe("analyze_issue_with_seer", () => { instruction, }, { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -517,7 +503,7 @@ describe("analyze_issue_with_seer", () => { instruction: undefined, }, { - constraints: { organizationSlug: undefined }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -567,7 +553,7 @@ describe("analyze_issue_with_seer", () => { instruction: undefined, }, { - constraints: { organizationSlug: undefined }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -606,7 +592,7 @@ describe("analyze_issue_with_seer", () => { instruction: undefined, }, { - constraints: { organizationSlug: undefined }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -645,7 +631,7 @@ describe("analyze_issue_with_seer", () => { instruction: undefined, }, { - constraints: { organizationSlug: undefined }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -717,7 +703,7 @@ describe("analyze_issue_with_seer", () => { instruction: undefined, }, { - constraints: { organizationSlug: undefined }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -829,9 +815,7 @@ describe("analyze_issue_with_seer", () => { instruction: undefined, }, { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -854,7 +838,6 @@ describe("analyze_issue_with_seer", () => { }, { constraints: { - organizationSlug: undefined, projectSlug: "frontend", }, accessToken: "access-token", diff --git a/packages/mcp-core/src/tools/catalog/create-metric-monitor.test.ts b/packages/mcp-core/src/tools/catalog/create-metric-monitor.test.ts index 48ab9bb936..b179d9bf69 100644 --- a/packages/mcp-core/src/tools/catalog/create-metric-monitor.test.ts +++ b/packages/mcp-core/src/tools/catalog/create-metric-monitor.test.ts @@ -1,6 +1,6 @@ import { mswServer } from "@sentry/mcp-server-mocks"; import { HttpResponse, http } from "msw"; -import { describe, expect, it } from "vitest"; +import { assert, describe, expect, it } from "vitest"; import { z } from "zod"; import type { MetricMonitorCreate } from "../../api-client/types"; import { createTestContext } from "../../test-utils/context"; @@ -57,8 +57,11 @@ function create(changes: Record = {}) { } function savedMonitor(body: MetricMonitorCreate) { - const source = structuredClone(metricMonitor.dataSources[0]); - Object.assign(source!.queryObj.snubaQuery, body.dataSources[0]); + const [fixtureSource] = metricMonitor.dataSources; + const [bodySource] = body.dataSources; + assert(fixtureSource && bodySource, "Expected a data source"); + const source = structuredClone(fixtureSource); + Object.assign(source.queryObj.snubaQuery, bodySource); return { ...metricMonitor, ...body, diff --git a/packages/mcp-core/src/tools/catalog/create-monitor.ts b/packages/mcp-core/src/tools/catalog/create-monitor.ts index f95a82f5c2..f216dd382c 100644 --- a/packages/mcp-core/src/tools/catalog/create-monitor.ts +++ b/packages/mcp-core/src/tools/catalog/create-monitor.ts @@ -96,13 +96,16 @@ function toMonitorSummary( projectSlug: monitor.project?.slug ?? null, status: monitor.status ?? null, scheduleType: - typeof config.schedule_type === "string" ? config.schedule_type : null, - schedule: formatSchedule(config.schedule), - timezone: typeof config.timezone === "string" ? config.timezone : null, - checkInMargin: numberOrNull(config.checkin_margin), - maxRuntime: numberOrNull(config.max_runtime), - failureIssueThreshold: numberOrNull(config.failure_issue_threshold), - recoveryThreshold: numberOrNull(config.recovery_threshold), + typeof config["schedule_type"] === "string" + ? config["schedule_type"] + : null, + schedule: formatSchedule(config["schedule"]), + timezone: + typeof config["timezone"] === "string" ? config["timezone"] : null, + checkInMargin: numberOrNull(config["checkin_margin"]), + maxRuntime: numberOrNull(config["max_runtime"]), + failureIssueThreshold: numberOrNull(config["failure_issue_threshold"]), + recoveryThreshold: numberOrNull(config["recovery_threshold"]), workflowIds, webUrl, }; diff --git a/packages/mcp-core/src/tools/catalog/create-project.ts b/packages/mcp-core/src/tools/catalog/create-project.ts index e9cd4b0fb5..6421119c11 100644 --- a/packages/mcp-core/src/tools/catalog/create-project.ts +++ b/packages/mcp-core/src/tools/catalog/create-project.ts @@ -74,7 +74,8 @@ function findRepositoryMatch( candidate.name.endsWith(`/${repository}`), ); - if (matches.length === 0) { + const [match] = matches; + if (!match) { throw new UserInputError( `Could not find repository "${repository}" in the organization. Make sure it is connected through a VCS integration before creating the project.`, ); @@ -86,7 +87,7 @@ function findRepositoryMatch( ); } - return matches[0]!; + return match; } function getRepositoryProvider(repository: RepositoryMatch): string | null { diff --git a/packages/mcp-core/src/tools/catalog/create-uptime-monitor.ts b/packages/mcp-core/src/tools/catalog/create-uptime-monitor.ts index 62b8418d4b..cbd6525fbb 100644 --- a/packages/mcp-core/src/tools/catalog/create-uptime-monitor.ts +++ b/packages/mcp-core/src/tools/catalog/create-uptime-monitor.ts @@ -21,6 +21,7 @@ import { toUptimeMonitorSummary, uptimeMonitorSummarySchema, } from "./support/uptime-monitors"; +import { omitUndefined } from "../../internal/type-guards"; export const createUptimeMonitorOutputSchema = z.object({ monitor: uptimeMonitorSummarySchema, @@ -102,24 +103,26 @@ export default defineTool({ project: { slug: params.projectSlug }, }); - const monitor = await apiService.createUptimeMonitor({ - organizationSlug, - projectSlug: params.projectSlug, - name: params.name, - url: params.url, - intervalSeconds: params.intervalSeconds, - timeoutMs: params.timeoutMs, - method: params.method, - headers: params.headers && toUptimeHeaderPairs(params.headers), - body: params.body, - status: params.status, - owner: params.owner, - environment: params.environment, - traceSampling: params.traceSampling, - responseCaptureEnabled: params.responseCaptureEnabled, - recoveryThreshold: params.recoveryThreshold, - downtimeThreshold: params.downtimeThreshold, - }); + const monitor = await apiService.createUptimeMonitor( + omitUndefined({ + organizationSlug, + projectSlug: params.projectSlug, + name: params.name, + url: params.url, + intervalSeconds: params.intervalSeconds, + timeoutMs: params.timeoutMs, + method: params.method, + headers: params.headers && toUptimeHeaderPairs(params.headers), + body: params.body, + status: params.status, + owner: params.owner, + environment: params.environment, + traceSampling: params.traceSampling, + responseCaptureEnabled: params.responseCaptureEnabled, + recoveryThreshold: params.recoveryThreshold, + downtimeThreshold: params.downtimeThreshold, + }), + ); return structuredResult({ monitor: toUptimeMonitorSummary( diff --git a/packages/mcp-core/src/tools/catalog/find-alert-rules.test.ts b/packages/mcp-core/src/tools/catalog/find-alert-rules.test.ts index a81d49b687..332b144833 100644 --- a/packages/mcp-core/src/tools/catalog/find-alert-rules.test.ts +++ b/packages/mcp-core/src/tools/catalog/find-alert-rules.test.ts @@ -1,6 +1,6 @@ import { mswServer } from "@sentry/mcp-server-mocks"; import { HttpResponse, http } from "msw"; -import { describe, expect, it } from "vitest"; +import { assert, describe, expect, it } from "vitest"; import { metricMonitor } from "../../test-utils/metric-monitor"; import { assertStructuredOnlyResult, @@ -103,7 +103,9 @@ describe("find_alert_rules", () => { expect(issueParams.get("projectSlug")).toBe("cloudflare-mcp"); expect(issueParams.get("query")).toBe('name:"*backend*"'); expect(metricRequestUrls).toHaveLength(1); - const metricParams = new URL(metricRequestUrls[0]!).searchParams; + const [metricRequestUrl] = metricRequestUrls; + assert(metricRequestUrl, "Expected a metric monitor request"); + const metricParams = new URL(metricRequestUrl).searchParams; expect(metricParams.get("project")).toBe(project.id); expect(metricParams.get("query")).toBe('name:"*backend*"'); expect(metricParams.getAll("type")).toEqual(["metric_issue"]); @@ -207,7 +209,7 @@ describe("find_alert_rules", () => { context, ); - expect(getStructuredContent(result).pagination).toEqual({ + expect(getStructuredContent(result)["pagination"]).toEqual({ issue: { nextCursor: "issue-page-2" }, metric: null, }); @@ -235,7 +237,7 @@ describe("find_alert_rules", () => { ); expect(requests).toHaveLength(1); - expect(requests[0]!.searchParams.get("projectSlug")).toBeNull(); + expect(requests[0]?.searchParams.get("projectSlug")).toBeNull(); expect(requests[0]?.searchParams.get("cursor")).toBe("workflow-page-1"); expect(getStructuredContent(result)).toMatchObject({ issueRules: [{ id: "123" }], @@ -285,7 +287,7 @@ describe("find_alert_rules", () => { metricRules: [], pagination: { issue: { nextCursor: null }, metric: null }, }); - expect(getStructuredContent(result).issueRules).toHaveLength(1); + expect(getStructuredContent(result)["issueRules"]).toHaveLength(1); }); it("returns next cursors for detector query searches", async () => { diff --git a/packages/mcp-core/src/tools/catalog/find-alert-rules.ts b/packages/mcp-core/src/tools/catalog/find-alert-rules.ts index dbc5691f40..4360cd2b92 100644 --- a/packages/mcp-core/src/tools/catalog/find-alert-rules.ts +++ b/packages/mcp-core/src/tools/catalog/find-alert-rules.ts @@ -79,7 +79,7 @@ function getIssueAlertRuleFrequency(rule: IssueAlertRule): number | null { if (typeof rule.frequency === "number") { return rule.frequency; } - const frequency = rule.config.frequency; + const frequency = rule.config["frequency"]; return typeof frequency === "number" ? frequency : null; } diff --git a/packages/mcp-core/src/tools/catalog/find-dashboards.test.ts b/packages/mcp-core/src/tools/catalog/find-dashboards.test.ts index 8419876c61..67a0cd55c7 100644 --- a/packages/mcp-core/src/tools/catalog/find-dashboards.test.ts +++ b/packages/mcp-core/src/tools/catalog/find-dashboards.test.ts @@ -1,6 +1,6 @@ import { dashboardListFixture, mswServer } from "@sentry/mcp-server-mocks"; import { http, HttpResponse } from "msw"; -import { describe, expect, it } from "vitest"; +import { assert, describe, expect, it } from "vitest"; import { assertStructuredOnlyResult, getStructuredContent, @@ -245,9 +245,11 @@ describe("find_dashboards", () => { ); expect(requestUrls).toHaveLength(2); - expect(new URL(requestUrls[0]!).searchParams.get("per_page")).toBe("2"); - expect(new URL(requestUrls[1]!).searchParams.get("cursor")).toBe("2:1:0"); - expect(new URL(requestUrls[1]!).searchParams.get("per_page")).toBe("2"); + const [firstUrl, secondUrl] = requestUrls; + assert(firstUrl && secondUrl, "Expected two dashboard list requests"); + expect(new URL(firstUrl).searchParams.get("per_page")).toBe("2"); + expect(new URL(secondUrl).searchParams.get("cursor")).toBe("2:1:0"); + expect(new URL(secondUrl).searchParams.get("per_page")).toBe("2"); assertStructuredOnlyResult(result); const structuredContent = findDashboardsOutputSchema.parse( getStructuredContent(result), @@ -316,8 +318,10 @@ describe("find_dashboards", () => { const secondResult = await search(first.nextCursor, 1); - expect(new URL(requestUrls[2]!).searchParams.get("cursor")).toBe("2:1:0"); - expect(new URL(requestUrls[2]!).searchParams.get("per_page")).toBe("2"); + const thirdUrl = requestUrls[2]; + assert(thirdUrl, "Expected a third dashboard list request"); + expect(new URL(thirdUrl).searchParams.get("cursor")).toBe("2:1:0"); + expect(new URL(thirdUrl).searchParams.get("per_page")).toBe("2"); assertStructuredOnlyResult(secondResult); expect(getStructuredContent(secondResult)).toMatchObject({ dashboards: [{ id: "304", title: "Cloudflare Throughput" }], @@ -438,7 +442,7 @@ describe("find_dashboards", () => { expect(findDashboardsOutputSchema.parse(structuredContent)).toEqual( structuredContent, ); - expect(structuredContent.dashboards).toMatchObject([ + expect(structuredContent["dashboards"]).toMatchObject([ { widgetCount: 3, widgetTypes: ["line"] }, ]); }); diff --git a/packages/mcp-core/src/tools/catalog/find-dropped-events.ts b/packages/mcp-core/src/tools/catalog/find-dropped-events.ts index 8cf8ff524d..03db85eb07 100644 --- a/packages/mcp-core/src/tools/catalog/find-dropped-events.ts +++ b/packages/mcp-core/src/tools/catalog/find-dropped-events.ts @@ -39,7 +39,12 @@ function isSupportedInterval(value: string): boolean { if (!match) { return false; } - const seconds = Number(match[1]) * INTERVAL_UNIT_SECONDS[match[2]!]!; + const [, amount, unit = ""] = match; + const unitSeconds = INTERVAL_UNIT_SECONDS[unit]; + if (unitSeconds === undefined) { + return false; + } + const seconds = Number(amount) * unitSeconds; return seconds > 0 && seconds % 60 === 0 && ONE_DAY_SECONDS % seconds === 0; } diff --git a/packages/mcp-core/src/tools/catalog/find-monitors.test.ts b/packages/mcp-core/src/tools/catalog/find-monitors.test.ts index 735bb4c6bd..1a03a142ee 100644 --- a/packages/mcp-core/src/tools/catalog/find-monitors.test.ts +++ b/packages/mcp-core/src/tools/catalog/find-monitors.test.ts @@ -344,7 +344,7 @@ describe("find_monitors", () => { assertStructuredOnlyResult(result); const structuredContent = getStructuredContent(result); - expect(structuredContent.hasMore).toBe(true); - expect(structuredContent.monitors).toHaveLength(10); + expect(structuredContent["hasMore"]).toBe(true); + expect(structuredContent["monitors"]).toHaveLength(10); }); }); diff --git a/packages/mcp-core/src/tools/catalog/find-monitors.ts b/packages/mcp-core/src/tools/catalog/find-monitors.ts index 4ee903408a..f6f96f9fd3 100644 --- a/packages/mcp-core/src/tools/catalog/find-monitors.ts +++ b/packages/mcp-core/src/tools/catalog/find-monitors.ts @@ -71,7 +71,8 @@ function parseSchedule(value: unknown): { return { type: null, value: value.trim() || null }; } if (Array.isArray(value)) { - const [first, second, third] = value; + const entries: unknown[] = value; + const [first, second, third] = entries; if (first === "crontab" && typeof second === "string") { return { type: "crontab", value: second }; } @@ -94,17 +95,17 @@ function parseSchedule(value: unknown): { return { type: null, value: null }; } const schedule = value as Record; - const type = typeof schedule.type === "string" ? schedule.type : null; - if (type === "crontab" && typeof schedule.value === "string") { - return { type, value: schedule.value }; + const type = typeof schedule["type"] === "string" ? schedule["type"] : null; + if (type === "crontab" && typeof schedule["value"] === "string") { + return { type, value: schedule["value"] }; } if ( type === "interval" && - (typeof schedule.value === "number" || - typeof schedule.value === "string") && - typeof schedule.unit === "string" + (typeof schedule["value"] === "number" || + typeof schedule["value"] === "string") && + typeof schedule["unit"] === "string" ) { - return { type, value: `${schedule.value} ${schedule.unit}` }; + return { type, value: `${schedule["value"]} ${schedule["unit"]}` }; } return { type, value: null }; } @@ -114,16 +115,18 @@ function getSchedule(monitor: Monitor) { if (!config) { return null; } - const parsedSchedule = parseSchedule(config.schedule); + const parsedSchedule = parseSchedule(config["schedule"]); const type = - typeof config.schedule_type === "string" - ? config.schedule_type + typeof config["schedule_type"] === "string" + ? config["schedule_type"] : parsedSchedule.type; const value = parsedSchedule.value; const checkInMargin = - typeof config.checkin_margin === "number" ? config.checkin_margin : null; + typeof config["checkin_margin"] === "number" + ? config["checkin_margin"] + : null; const maxRuntime = - typeof config.max_runtime === "number" ? config.max_runtime : null; + typeof config["max_runtime"] === "number" ? config["max_runtime"] : null; if ( type === null && value === null && diff --git a/packages/mcp-core/src/tools/catalog/find-organizations.ts b/packages/mcp-core/src/tools/catalog/find-organizations.ts index 6fd5a83425..9df3f5f1c0 100644 --- a/packages/mcp-core/src/tools/catalog/find-organizations.ts +++ b/packages/mcp-core/src/tools/catalog/find-organizations.ts @@ -36,7 +36,9 @@ function normalizeUrl(url: string | undefined): string | null { function toResult(organization: { slug: string; - links?: { organizationUrl?: string; regionUrl?: string }; + links?: + | { organizationUrl?: string; regionUrl?: string | undefined } + | undefined; }): OrganizationResult { return { slug: organization.slug, diff --git a/packages/mcp-core/src/tools/catalog/get-agent-conversation-details.test.ts b/packages/mcp-core/src/tools/catalog/get-agent-conversation-details.test.ts index 67ef1dc2ce..defd014bb6 100644 --- a/packages/mcp-core/src/tools/catalog/get-agent-conversation-details.test.ts +++ b/packages/mcp-core/src/tools/catalog/get-agent-conversation-details.test.ts @@ -9,9 +9,7 @@ import { } from "../../test-utils/structured-content"; const baseContext = { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }; @@ -151,7 +149,7 @@ describe("get_agent_conversation_details", () => { expect(structuredContent).not.toHaveProperty("focusedSpanPresent"); expect(structuredContent).not.toHaveProperty("messages"); expect(structuredContent).not.toHaveProperty("spanIds"); - expect(structuredContent.title).toBe("Checkout worker timeouts"); + expect(structuredContent["title"]).toBe("Checkout worker timeouts"); expect(structuredContent.timeline[0]?.genAi).toMatchObject({ operationType: "ai_client", requestModel: "gpt-5-mini", @@ -163,11 +161,11 @@ describe("get_agent_conversation_details", () => { expect(structuredContent.timeline[2]?.genAi).toMatchObject({ operationType: "tool", }); - expect(structuredContent.timeline[2]!.genAi).not.toHaveProperty("toolName"); - expect(structuredContent.timeline[2]!.genAi).not.toHaveProperty( + expect(structuredContent.timeline[2]?.genAi).not.toHaveProperty("toolName"); + expect(structuredContent.timeline[2]?.genAi).not.toHaveProperty( "toolCallArguments", ); - expect(structuredContent.timeline[2]!.genAi).not.toHaveProperty( + expect(structuredContent.timeline[2]?.genAi).not.toHaveProperty( "toolInput", ); expect(structuredContent.spanSummaries[0]).toMatchObject({ @@ -525,8 +523,8 @@ describe("get_agent_conversation_details", () => { assertStructuredOnlyResult(result); const structuredContent = getStructuredContent(result); - expect(structuredContent.conversationId).toBe("conv-123"); - expect(structuredContent.timeline).toEqual( + expect(structuredContent["conversationId"]).toBe("conv-123"); + expect(structuredContent["timeline"]).toEqual( expect.arrayContaining([ expect.objectContaining({ type: "message", @@ -681,8 +679,8 @@ describe("get_agent_conversation_details", () => { ); const structuredContent = getStructuredContent(result); - expect(structuredContent.messageCount).toBe(4); - expect(structuredContent.timeline).toMatchObject([ + expect(structuredContent["messageCount"]).toBe(4); + expect(structuredContent["timeline"]).toMatchObject([ { type: "message", role: "user", spanId: "repeat-ai-1" }, { type: "message", role: "assistant", spanId: "repeat-ai-1" }, { type: "tool_call", name: "search_events", spanId: "repeat-tool-1" }, @@ -740,7 +738,7 @@ describe("get_agent_conversation_details", () => { ); const structuredContent = getStructuredContent(result); - expect(structuredContent.timeline).toMatchObject([ + expect(structuredContent["timeline"]).toMatchObject([ { type: "message", role: "user", @@ -814,8 +812,8 @@ describe("get_agent_conversation_details", () => { ); const structuredContent = getStructuredContent(result); - expect(structuredContent.toolCallCount).toBe(1); - expect(structuredContent.timeline).toMatchObject([ + expect(structuredContent["toolCallCount"]).toBe(1); + expect(structuredContent["timeline"]).toMatchObject([ { type: "message", role: "user", spanId: "final-ai-1" }, { type: "message", role: "assistant", spanId: "final-ai-1" }, { @@ -857,13 +855,13 @@ describe("get_agent_conversation_details", () => { ); const structuredContent = getStructuredContent(result); - expect(structuredContent.toolCallCount).toBe(0); - expect(structuredContent.timeline).toEqual( + expect(structuredContent["toolCallCount"]).toBe(0); + expect(structuredContent["timeline"]).toEqual( expect.arrayContaining([ expect.objectContaining({ type: "message", spanId: "unnamed-ai-1" }), ]), ); - expect(structuredContent.timeline).not.toEqual( + expect(structuredContent["timeline"]).not.toEqual( expect.arrayContaining([ expect.objectContaining({ type: "tool_call", diff --git a/packages/mcp-core/src/tools/catalog/get-agent-conversation-details.ts b/packages/mcp-core/src/tools/catalog/get-agent-conversation-details.ts index 618703e10e..c639089a77 100644 --- a/packages/mcp-core/src/tools/catalog/get-agent-conversation-details.ts +++ b/packages/mcp-core/src/tools/catalog/get-agent-conversation-details.ts @@ -4,6 +4,7 @@ import { z } from "zod"; import type { AIConversationSpan, SentryApiService } from "../../api-client"; import { UserInputError } from "../../errors"; +import { omitUndefined } from "../../internal/type-guards"; import { apiServiceFromContext } from "../../internal/tool-helpers/api"; import { defineTool } from "../../internal/tool-helpers/define"; import { structuredResult } from "../../internal/tool-helpers/results"; @@ -88,12 +89,6 @@ type SpanSummary = { genAi?: GenAIAttributes; }; -function withoutUndefined>(value: T): T { - return Object.fromEntries( - Object.entries(value).filter(([, item]) => item !== undefined), - ) as T; -} - const genAiAttributesSchema = z.object({ operationType: z.string().optional(), agentName: z.string().optional(), @@ -299,11 +294,11 @@ function stringifyContent(value: unknown): string | null { } if (part && typeof part === "object") { const record = part as Record; - if (typeof record.text === "string") { - return record.text; + if (typeof record["text"] === "string") { + return record["text"]; } - if (typeof record.content === "string") { - return record.content; + if (typeof record["content"] === "string") { + return record["content"]; } } return null; @@ -313,14 +308,14 @@ function stringifyContent(value: unknown): string | null { } if (value && typeof value === "object") { const record = value as Record; - if (typeof record.text === "string") { - return record.text; + if (typeof record["text"] === "string") { + return record["text"]; } - if (typeof record.content === "string") { - return record.content; + if (typeof record["content"] === "string") { + return record["content"]; } - if (typeof record.message === "string") { - return record.message; + if (typeof record["message"] === "string") { + return record["message"]; } } return value == null ? null : JSON.stringify(value); @@ -331,8 +326,8 @@ function collectMessages(value: unknown): { role?: string; content: string }[] { value && typeof value === "object" && !Array.isArray(value) && - Array.isArray((value as Record).messages) - ? (value as Record).messages + Array.isArray((value as Record)["messages"]) + ? (value as Record)["messages"] : value; if (!Array.isArray(source)) { @@ -349,12 +344,14 @@ function collectMessages(value: unknown): { role?: string; content: string }[] { return null; } const record = message as Record; - const content = stringifyContent(record.content ?? record.text ?? record); + const content = stringifyContent( + record["content"] ?? record["text"] ?? record, + ); if (!content) { return null; } return { - role: typeof record.role === "string" ? record.role : undefined, + role: typeof record["role"] === "string" ? record["role"] : undefined, content, }; }) @@ -402,7 +399,7 @@ function buildGenAIAttributes( ): GenAIAttributes | undefined { const truncatedFields: string[] = []; - const attributes = withoutUndefined({ + const attributes = omitUndefined({ operationType: getOperationType(span), agentName: span["gen_ai.agent.name"], requestModel: span["gen_ai.request.model"], @@ -463,7 +460,7 @@ function buildGenAIAttributes( /** Builds the MCP-facing span summary with IDs for raw span follow-up. */ function buildSpanSummary(span: AIConversationSpan): SpanSummary { - return withoutUndefined({ + return omitUndefined({ spanId: span.span_id, traceId: span.trace, parentSpanId: span.parent_span, @@ -507,7 +504,7 @@ function buildToolCall(span: AIConversationSpan): ToolCall | null { } const genAi = buildGenAIAttributes(span); - return withoutUndefined({ + return omitUndefined({ type: "tool_call" as const, name, spanId: span.span_id, @@ -524,7 +521,7 @@ function buildToolCall(span: AIConversationSpan): ToolCall | null { function buildMessageEvents(span: AIConversationSpan): ConversationMessage[] { const spanDurationMs = durationMs(span); const genAi = buildGenAIAttributes(span); - const metadata = withoutUndefined({ + const metadata = omitUndefined({ agentName: span["gen_ai.agent.name"], model: span["gen_ai.response.model"] ?? span["gen_ai.request.model"], totalTokens: numeric(span["gen_ai.usage.total_tokens"]), @@ -535,7 +532,7 @@ function buildMessageEvents(span: AIConversationSpan): ConversationMessage[] { const userContent = extractUserContent(span); if (userContent) { events.push( - withoutUndefined({ + omitUndefined({ type: "message" as const, role: "user" as const, content: userContent, @@ -551,22 +548,31 @@ function buildMessageEvents(span: AIConversationSpan): ConversationMessage[] { const assistantContent = extractAssistantContent(span); if (assistantContent) { - events.push({ - type: "message", - role: "assistant", - content: assistantContent, - timestamp: timestampMs(span["precise.finish_ts"]), - spanId: span.span_id, - traceId: span.trace, - metadata, - genAi, - }); - } else if (events.length > 0) { - events[events.length - 1] = { - ...events[events.length - 1]!, - metadata, - genAi, - }; + events.push( + omitUndefined({ + type: "message" as const, + role: "assistant" as const, + content: assistantContent, + timestamp: timestampMs(span["precise.finish_ts"]), + spanId: span.span_id, + traceId: span.trace, + metadata, + genAi, + }), + ); + } else { + const lastEvent = events.at(-1); + if (lastEvent) { + // Replace, not merge: this span's metadata and genAi supersede the + // previous span's values even when they are absent. + const updated = { ...lastEvent }; + delete updated.metadata; + delete updated.genAi; + events[events.length - 1] = { + ...updated, + ...omitUndefined({ metadata, genAi }), + }; + } } return events; @@ -633,7 +639,7 @@ function buildConversationArtifact( ? Math.max(...spans.map((span) => span["precise.finish_ts"])) : null; - return withoutUndefined({ + return omitUndefined({ conversationId, title, organizationSlug, diff --git a/packages/mcp-core/src/tools/catalog/get-alert-rule.test.ts b/packages/mcp-core/src/tools/catalog/get-alert-rule.test.ts index 09b24b5e0b..dba71ffcc2 100644 --- a/packages/mcp-core/src/tools/catalog/get-alert-rule.test.ts +++ b/packages/mcp-core/src/tools/catalog/get-alert-rule.test.ts @@ -1,6 +1,6 @@ import { mswServer } from "@sentry/mcp-server-mocks"; import { HttpResponse, http } from "msw"; -import { beforeEach, describe, expect, it } from "vitest"; +import { assert, beforeEach, describe, expect, it } from "vitest"; import { getStructuredContent } from "../../test-utils/structured-content"; import { prepareToolParams } from "../catalog-runtime/availability"; import getAlertRule, { getAlertRuleOutputSchema } from "./get-alert-rule.js"; @@ -273,7 +273,7 @@ describe("get_alert_rule", () => { return HttpResponse.json({ detectorId: "789" }); }), http.get(`${organizationApi}/detectors/:id/`, ({ params }) => { - reads.push(`detector:${String(params.id)}`); + reads.push(`detector:${String(params["id"])}`); return HttpResponse.json(detector); }), ); @@ -527,8 +527,10 @@ describe("get_alert_rule", () => { ...issueAlertRule.triggers.conditions[0], id: `condition-${i}`, })); + const [actionFilter] = issueAlertRule.actionFilters; + assert(actionFilter, "Fixture has no action filter"); const actions = Array.from({ length: 6 }, (_, i) => ({ - ...issueAlertRule.actionFilters[0]!.actions[0], + ...actionFilter.actions[0], id: `action-${i}`, })); const groups = Array.from({ length: 6 }, (_, i) => ({ diff --git a/packages/mcp-core/src/tools/catalog/get-alert-rule.ts b/packages/mcp-core/src/tools/catalog/get-alert-rule.ts index ec62cac197..6c0a1877f4 100644 --- a/packages/mcp-core/src/tools/catalog/get-alert-rule.ts +++ b/packages/mcp-core/src/tools/catalog/get-alert-rule.ts @@ -40,12 +40,12 @@ type AlertRuleMatch = | { kind: "issue"; rule: IssueAlertRule; - projectSlug?: string; + projectSlug?: string | undefined; } | { kind: "metric"; rule: Detector; - projectSlug?: string; + projectSlug?: string | undefined; }; function describeMatch(match: AlertRuleMatch): string { @@ -158,7 +158,8 @@ export default defineTool({ })), ); - if (matches.length === 0) { + const [found] = matches; + if (!found) { throw new UserInputError( `Alert rule "${params.ruleIdOrName}" was not found. ${LIST_HINT}`, ); @@ -168,7 +169,6 @@ export default defineTool({ `Multiple alert rules named "${params.ruleIdOrName}" were found: ${matches.map(describeMatch).join(", ")}. Retry with the Alert ID and kind=issue, or use get_metric_monitor_details with the monitor ID. ${LIST_HINT}`, ); } - const found = matches[0]!; match = found.kind === "issue" ? { diff --git a/packages/mcp-core/src/tools/catalog/get-dashboard-details.test.ts b/packages/mcp-core/src/tools/catalog/get-dashboard-details.test.ts index 6f708e35b5..ec873088fe 100644 --- a/packages/mcp-core/src/tools/catalog/get-dashboard-details.test.ts +++ b/packages/mcp-core/src/tools/catalog/get-dashboard-details.test.ts @@ -4,7 +4,7 @@ import { mswServer, } from "@sentry/mcp-server-mocks"; import { http, HttpResponse } from "msw"; -import { describe, expect, it } from "vitest"; +import { assert, describe, expect, it } from "vitest"; import { assertStructuredOnlyResult, getStructuredContent, @@ -254,15 +254,20 @@ describe("get_dashboard_details", () => { }); it("returns candidates for ambiguous dashboard titles", async () => { + const [firstDashboard, secondDashboard] = dashboardListFixture; + assert( + firstDashboard && secondDashboard, + "Expected two fixture dashboards", + ); mswServer.use( http.get( "https://sentry.io/api/0/organizations/sentry-mcp-evals/dashboards/", () => HttpResponse.json([ - dashboardListFixture[0], + firstDashboard, { - ...dashboardListFixture[1], - title: dashboardListFixture[0].title, + ...secondDashboard, + title: firstDashboard.title, }, ]), ), @@ -273,7 +278,7 @@ describe("get_dashboard_details", () => { { organizationSlug: "sentry-mcp-evals", regionUrl: null, - dashboardIdOrTitle: dashboardListFixture[0].title, + dashboardIdOrTitle: firstDashboard.title, }, context, ), @@ -362,6 +367,7 @@ describe("get_dashboard_details", () => { function mockQuery(query: Record) { const [widget] = dashboardDetailsFixture.widgets; + assert(widget, "Expected a fixture widget"); mswServer.use( http.get( "https://sentry.io/api/0/organizations/sentry-mcp-evals/dashboards/101/", @@ -391,7 +397,11 @@ describe("get_dashboard_details", () => { context, ), ); - return dashboard.widgets[0]!.queries[0]; + const [widget] = dashboard.widgets; + assert(widget, "Expected a widget"); + const [query] = widget.queries; + assert(query, "Expected a widget query"); + return query; } it("describes saved transformations by aggregate position", async () => { @@ -405,7 +415,7 @@ describe("get_dashboard_details", () => { }, }); - expect((await getFirstQuery())?.transformations).toMatchInlineSnapshot(` + expect((await getFirstQuery()).transformations).toMatchInlineSnapshot(` [ { "aggregate": "count()", @@ -441,7 +451,7 @@ describe("get_dashboard_details", () => { transformations: { "3": ["fill(linear)"] }, }); - expect((await getFirstQuery())?.transformations).toEqual([ + expect((await getFirstQuery()).transformations).toEqual([ { aggregateIndex: 3, aggregate: null, @@ -472,7 +482,7 @@ describe("get_dashboard_details", () => { ), ); - expect((await getFirstQuery())!.transformations).toBeNull(); + expect((await getFirstQuery()).transformations).toBeNull(); }); it("accepts widgets whose display type is null", async () => { diff --git a/packages/mcp-core/src/tools/catalog/get-issue-activity.test.ts b/packages/mcp-core/src/tools/catalog/get-issue-activity.test.ts index d27991d783..c9ee784ade 100644 --- a/packages/mcp-core/src/tools/catalog/get-issue-activity.test.ts +++ b/packages/mcp-core/src/tools/catalog/get-issue-activity.test.ts @@ -1,5 +1,5 @@ import { mswServer } from "@sentry/mcp-server-mocks"; -import { afterEach, describe, expect, it } from "vitest"; +import { assert, afterEach, describe, expect, it } from "vitest"; import { http, HttpResponse } from "msw"; import type { IssueActivity } from "../../api-client/types"; import { @@ -454,12 +454,23 @@ describe("get_issue_activity", () => { deletedPr, blankCommit, ] = activity; - expect(unmerge?.unmerge).toEqual({ + assert( + unmerge && + resolved && + rca && + seerPr && + createIssue && + resolvedByAge && + deletedPr && + blankCommit, + "Expected eight activity entries", + ); + expect(unmerge["unmerge"]).toEqual({ fingerprintCount: 2, source: { shortId: "CLOUDFLARE-MCP-42" }, destination: null, }); - expect(Object.keys(resolved!).sort()).toEqual([ + expect(Object.keys(resolved).sort()).toEqual([ "author", "commentId", "dateCreated", @@ -467,18 +478,21 @@ describe("get_issue_activity", () => { "text", "type", ]); - expect(rca?.text).toBe("Null org slug reaches the API client."); - expect(seerPr?.pullRequestUrls).toEqual([ + expect(rca["text"]).toBe("Null org slug reaches the API client."); + expect(seerPr["pullRequestUrls"]).toEqual([ "https://github.com/getsentry/sentry-mcp/pull/7", ]); - expect(createIssue?.externalIssue).toEqual({ + expect(createIssue["externalIssue"]).toEqual({ title: "Fix null org", provider: "Jira", location: "https://example.atlassian.net/browse/ENG-1", }); - expect(resolvedByAge?.age).toBe(720); - expect(deletedPr!.pullRequest).toBeNull(); - expect(blankCommit?.commit).toMatchObject({ id: "abc123", message: null }); + expect(resolvedByAge["age"]).toBe(720); + expect(deletedPr["pullRequest"]).toBeNull(); + expect(blankCommit["commit"]).toMatchObject({ + id: "abc123", + message: null, + }); const serialized = JSON.stringify(structuredContent); for (const leaked of [ diff --git a/packages/mcp-core/src/tools/catalog/get-issue-activity.ts b/packages/mcp-core/src/tools/catalog/get-issue-activity.ts index eac7802010..a353cb9329 100644 --- a/packages/mcp-core/src/tools/catalog/get-issue-activity.ts +++ b/packages/mcp-core/src/tools/catalog/get-issue-activity.ts @@ -150,12 +150,12 @@ function readNumber( } function readRepositoryName(value: Record): string | null { - const repository = value.repository; + const repository = value["repository"]; return isPlainObject(repository) ? readString(repository, "name") : null; } function mapAssignee(data: Record) { - const id = data.assignee; + const id = data["assignee"]; if (typeof id !== "string" && typeof id !== "number") { return undefined; } @@ -176,8 +176,8 @@ function mapIgnore(data: Record) { userWindow: readNumber(data, "ignoreUserWindow"), until: readString(data, "ignoreUntil") ?? undefined, untilEscalating: - typeof data.ignoreUntilEscalating === "boolean" - ? data.ignoreUntilEscalating + typeof data["ignoreUntilEscalating"] === "boolean" + ? data["ignoreUntilEscalating"] : undefined, }; return Object.values(ignore).some((value) => value !== undefined) @@ -186,7 +186,7 @@ function mapIgnore(data: Record) { } function readGitAuthor(value: Record) { - const author = value.author; + const author = value["author"]; if (!isPlainObject(author)) { return null; } @@ -196,15 +196,15 @@ function readGitAuthor(value: Record) { } function mapCommit(data: Record) { - const commit = data.commit; + const commit = data["commit"]; if (commit === null) { return null; } - if (!isPlainObject(commit) || commit.id == null) { + if (!isPlainObject(commit) || commit["id"] == null) { return undefined; } return { - id: formatId(commit.id as string | number), + id: formatId(commit["id"] as string | number), message: readString(commit, "message")?.split("\n")[0]?.trim() || null, repository: readRepositoryName(commit), author: readGitAuthor(commit), @@ -212,15 +212,15 @@ function mapCommit(data: Record) { } function mapPullRequest(data: Record) { - const pullRequest = data.pullRequest; + const pullRequest = data["pullRequest"]; if (pullRequest === null) { return null; } - if (!isPlainObject(pullRequest) || pullRequest.id == null) { + if (!isPlainObject(pullRequest) || pullRequest["id"] == null) { return undefined; } return { - id: formatId(pullRequest.id as string | number), + id: formatId(pullRequest["id"] as string | number), title: readString(pullRequest, "title"), repository: readRepositoryName(pullRequest), author: readGitAuthor(pullRequest), @@ -228,12 +228,12 @@ function mapPullRequest(data: Record) { } function mapSeerPullRequestUrls(data: Record) { - const pullRequests = data.pull_requests; + const pullRequests = data["pull_requests"]; if (!Array.isArray(pullRequests)) { return undefined; } const urls = pullRequests.flatMap((item) => { - const pullRequest = isPlainObject(item) ? item.pull_request : null; + const pullRequest = isPlainObject(item) ? item["pull_request"] : null; const url = isPlainObject(pullRequest) ? readString(pullRequest, "pr_url") : null; @@ -252,11 +252,11 @@ function mapUnmerge(type: string, data: Record) { return undefined; } return { - fingerprintCount: Array.isArray(data.fingerprints) - ? data.fingerprints.length + fingerprintCount: Array.isArray(data["fingerprints"]) + ? data["fingerprints"].length : 0, - source: readShortId(data.source), - destination: readShortId(data.destination), + source: readShortId(data["source"]), + destination: readShortId(data["destination"]), }; } diff --git a/packages/mcp-core/src/tools/catalog/get-issue-breadcrumbs.test.ts b/packages/mcp-core/src/tools/catalog/get-issue-breadcrumbs.test.ts index 6ae2477cf6..1aaf476914 100644 --- a/packages/mcp-core/src/tools/catalog/get-issue-breadcrumbs.test.ts +++ b/packages/mcp-core/src/tools/catalog/get-issue-breadcrumbs.test.ts @@ -1,6 +1,6 @@ import { eventFixture, mswServer } from "@sentry/mcp-server-mocks"; import { HttpResponse, http } from "msw"; -import { afterEach, describe, expect, it } from "vitest"; +import { assert, afterEach, describe, expect, it } from "vitest"; import { issueBreadcrumbsOutputSchema } from "../../internal/tool-helpers/breadcrumbs.js"; import { assertStructuredOnlyResult, @@ -15,7 +15,7 @@ type BreadcrumbsOutput = { }; const context = { - constraints: { organizationSlug: undefined }, + constraints: {}, accessToken: "access-token", userId: "1", }; @@ -223,7 +223,8 @@ describe("get_issue_breadcrumbs", () => { ); const [crumb] = getStructuredContent(result).breadcrumbs; - expect(Object.keys(crumb!).sort()).toEqual([ + assert(crumb, "Expected a breadcrumb"); + expect(Object.keys(crumb).sort()).toEqual([ "category", "data", "level", @@ -237,9 +238,9 @@ describe("get_issue_breadcrumbs", () => { category: null, type: "default", }); - expect(crumb?.message).toMatch(/^line one line two x+\.\.\.$/); - expect((crumb!.message as string).length).toBe(123); - expect((crumb!.data as string).length).toBe(203); + expect(crumb["message"]).toMatch(/^line one line two x+\.\.\.$/); + expect((crumb["message"] as string).length).toBe(123); + expect((crumb["data"] as string).length).toBe(203); expect(JSON.stringify(crumb)).not.toContain("must-not-leak"); }); }); diff --git a/packages/mcp-core/src/tools/catalog/get-issue-details.numeric-id.test.ts b/packages/mcp-core/src/tools/catalog/get-issue-details.numeric-id.test.ts index 45a5cb1ee9..156411165a 100644 --- a/packages/mcp-core/src/tools/catalog/get-issue-details.numeric-id.test.ts +++ b/packages/mcp-core/src/tools/catalog/get-issue-details.numeric-id.test.ts @@ -17,7 +17,7 @@ const issueId = String(issueFixture.id); const eventId = eventsFixture.id; const issueUrl = `https://${organizationSlug}.sentry.io/issues/${issueId}/`; const context = { - constraints: { organizationSlug: undefined }, + constraints: {}, accessToken: "access-token", userId: "1", }; diff --git a/packages/mcp-core/src/tools/catalog/get-issue-details.structured.test.ts b/packages/mcp-core/src/tools/catalog/get-issue-details.structured.test.ts index 37a438d0e2..4ad8a43171 100644 --- a/packages/mcp-core/src/tools/catalog/get-issue-details.structured.test.ts +++ b/packages/mcp-core/src/tools/catalog/get-issue-details.structured.test.ts @@ -387,7 +387,7 @@ const params = { }; const experimentalContext = { - constraints: { organizationSlug: undefined }, + constraints: {}, accessToken: "access-token", userId: "1", experimentalMode: true, @@ -714,7 +714,7 @@ describe("get_issue_details structuredContent for a realistic error", () => { const result = await getIssueDetails.handler(params, experimentalContext); const payload = getStructuredContent>(result); - expect(payload.event.user).toEqual({ + expect(payload["event"].user).toEqual({ id: "1182", email: "jane@example.com", username: "jane", @@ -730,7 +730,7 @@ describe("get_issue_details structuredContent for a realistic error", () => { const result = await getIssueDetails.handler(params, experimentalContext); const payload = getStructuredContent>(result); - const [raised, cause] = payload.event.exceptions; + const [raised, cause] = payload["event"].exceptions; expect(raised.type).toBe("IntegrityError"); expect(cause.type).toBe("UniqueViolation"); @@ -792,9 +792,9 @@ describe("get_issue_details structuredContent for a realistic error", () => { const result = await getIssueDetails.handler(params, experimentalContext); const payload = getStructuredContent>(result); - expect(payload.event.threadCount).toBe(25); - expect(payload.event.threads).toHaveLength(20); - expect(payload.event.threads.at(-1).name).toBe("worker-20"); + expect(payload["event"].threadCount).toBe(25); + expect(payload["event"].threads).toHaveLength(20); + expect(payload["event"].threads.at(-1).name).toBe("worker-20"); }); it("falls back to the ip and display_name user aliases", async () => { @@ -811,7 +811,7 @@ describe("get_issue_details structuredContent for a realistic error", () => { const result = await getIssueDetails.handler(params, experimentalContext); const payload = getStructuredContent>(result); - expect(payload.event.user).toMatchObject({ + expect(payload["event"].user).toMatchObject({ ipAddress: "203.0.113.24", name: "Jane Doe", }); @@ -831,10 +831,13 @@ describe("get_issue_details structuredContent for a realistic error", () => { const payload = getStructuredContent>(result); // the top level message is an empty string on an error event - expect(payload.event.message).toBeNull(); - expect(payload.event.tags).toContainEqual({ key: "device", value: null }); + expect(payload["event"].message).toBeNull(); + expect(payload["event"].tags).toContainEqual({ + key: "device", + value: null, + }); // a context with nothing left is dropped - expect(payload.event.contexts).not.toHaveProperty("os"); + expect(payload["event"].contexts).not.toHaveProperty("os"); }); it("lists the threads and maps the crashed one when there is no exception", async () => { diff --git a/packages/mcp-core/src/tools/catalog/get-issue-details.test.ts b/packages/mcp-core/src/tools/catalog/get-issue-details.test.ts index a01a1ad7a7..4cf777aba3 100644 --- a/packages/mcp-core/src/tools/catalog/get-issue-details.test.ts +++ b/packages/mcp-core/src/tools/catalog/get-issue-details.test.ts @@ -26,9 +26,7 @@ import getIssueDetails, { } from "./get-issue-details.js"; const baseContext = { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }; @@ -212,9 +210,7 @@ describe("get_issue_details", () => { regionUrl: null, }, { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -981,9 +977,7 @@ describe("get_issue_details", () => { regionUrl: null, }, { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -1206,9 +1200,7 @@ describe("get_issue_details", () => { regionUrl: null, }, { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -1230,9 +1222,7 @@ describe("get_issue_details", () => { regionUrl: "https", }, { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -1269,9 +1259,7 @@ describe("get_issue_details", () => { regionUrl: null, }, { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -1300,9 +1288,7 @@ describe("get_issue_details", () => { regionUrl: null, }, { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -1500,9 +1486,7 @@ describe("get_issue_details", () => { regionUrl: null, }, { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -1714,9 +1698,7 @@ describe("get_issue_details", () => { regionUrl: null, }, { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }, @@ -2015,10 +1997,10 @@ describe("structuredContent", () => { .structuredContent; // the issue level fields the markdown used to assemble - expect(payload.issue.shortId).toBe("CLOUDFLARE-MCP-41"); - expect(payload.issue.url).toContain("CLOUDFLARE-MCP-41"); - expect(typeof payload.issue.occurrences).toBe("number"); - expect(typeof payload.issue.usersImpacted).toBe("number"); + expect(payload["issue"].shortId).toBe("CLOUDFLARE-MCP-41"); + expect(payload["issue"].url).toContain("CLOUDFLARE-MCP-41"); + expect(typeof payload["issue"].occurrences).toBe("number"); + expect(typeof payload["issue"].usersImpacted).toBe("number"); }); it("produces a payload that satisfies the schema", async () => { @@ -2268,9 +2250,9 @@ describe("structuredContent", () => { const payload = (result as { structuredContent: Record }) .structuredContent; - expect(payload.event).not.toHaveProperty("body"); - expect(payload.event.message).toBe("Something went wrong"); - expect(payload.event.tags).toEqual([ + expect(payload["event"]).not.toHaveProperty("body"); + expect(payload["event"].message).toBe("Something went wrong"); + expect(payload["event"].tags).toEqual([ { key: "level", value: "error" }, { key: "environment", value: "production" }, ]); @@ -2284,7 +2266,7 @@ describe("structuredContent", () => { .structuredContent; expect(payload).not.toHaveProperty("responseNotes"); - expect(payload.suggestedActions).toContainEqual( + expect(payload["suggestedActions"]).toContainEqual( expect.objectContaining({ toolName: "get_issue_breadcrumbs", arguments: { @@ -2301,7 +2283,7 @@ describe("structuredContent", () => { const payload = (result as { structuredContent: Record }) .structuredContent; - expect(payload.event.message).toBe("TOP-LEVEL-MESSAGE"); + expect(payload["event"].message).toBe("TOP-LEVEL-MESSAGE"); }); it("returns structured content for an unsupported event type", async () => { @@ -2324,10 +2306,10 @@ describe("structuredContent", () => { const payload = getStructuredContent>(result); expect(() => getIssueDetailsOutputSchema.parse(payload)).not.toThrow(); - expect(payload.issue.shortId).toBe("FUTURE-TYPE-001"); - expect(payload.event.type).toBe("future_ai_agent_trace"); - expect(payload.event.exceptions).toBeNull(); - expect(payload.event.tags).toEqual([{ key: "level", value: "error" }]); + expect(payload["issue"].shortId).toBe("FUTURE-TYPE-001"); + expect(payload["event"].type).toBe("future_ai_agent_trace"); + expect(payload["event"].exceptions).toBeNull(); + expect(payload["event"].tags).toEqual([{ key: "level", value: "error" }]); // still reported, so support for the type gets added expect(logIssueSpy).toHaveBeenCalledWith( "Unsupported event type encountered: future_ai_agent_trace", @@ -2366,8 +2348,8 @@ describe("structuredContent", () => { ); const payload = getStructuredContent>(result); - expect(payload.event.type).toBe("transaction"); - expect(payload.event.occurredAt).toBe("2025-08-06T18:00:01.250Z"); + expect(payload["event"].type).toBe("transaction"); + expect(payload["event"].occurredAt).toBe("2025-08-06T18:00:01.250Z"); }); it("takes occurredAt from dateReceived for a CSP event", async () => { @@ -2388,8 +2370,8 @@ describe("structuredContent", () => { ); const payload = getStructuredContent>(result); - expect(payload.event.type).toBe("csp"); - expect(payload.event.occurredAt).toBe("2025-11-19T19:24:12.491Z"); + expect(payload["event"].type).toBe("csp"); + expect(payload["event"].occurredAt).toBe("2025-11-19T19:24:12.491Z"); }); it("takes occurredAt from dateReceived for an unknown event type", async () => { @@ -2410,8 +2392,8 @@ describe("structuredContent", () => { ); const payload = getStructuredContent>(result); - expect(payload.event.type).toBe("future_ai_agent_trace"); - expect(payload.event.occurredAt).toBe("2025-01-01T01:00:00.000Z"); + expect(payload["event"].type).toBe("future_ai_agent_trace"); + expect(payload["event"].occurredAt).toBe("2025-01-01T01:00:00.000Z"); }); it("maps a transaction's N+1 evidence and its spans", async () => { @@ -2437,9 +2419,9 @@ describe("structuredContent", () => { const payload = (result as { structuredContent: Record }) .structuredContent; - expect(payload.event.type).toBe("transaction"); + expect(payload["event"].type).toBe("transaction"); expect(() => getIssueDetailsOutputSchema.parse(payload)).not.toThrow(); - expect(payload.event.performance).toMatchObject({ + expect(payload["event"].performance).toMatchObject({ issueType: "performance_n_plus_one_db_queries", transactionName: "/api/users", parentOperation: "GET /api/users", @@ -2449,7 +2431,7 @@ describe("structuredContent", () => { ]), }); // the span tree from the fetched trace, parents linked by id - expect(payload.event.performance.spans).toEqual([ + expect(payload["event"].performance.spans).toEqual([ { spanId: "parent123", parentSpanId: null, @@ -2507,12 +2489,14 @@ describe("structuredContent", () => { const payload = (result as { structuredContent: Record }) .structuredContent; - expect(payload.replays?.attached).toBe("1234567890abcdef1234567890abcdef"); + expect(payload["replays"]?.attached).toBe( + "1234567890abcdef1234567890abcdef", + ); // and the attached id is not repeated in the related list - expect(payload.replays?.related).not.toContain( + expect(payload["replays"]?.related).not.toContain( "1234567890abcdef1234567890abcdef", ); - expect(JSON.stringify(payload.event)).not.toContain( + expect(JSON.stringify(payload["event"])).not.toContain( "1234567890abcdef1234567890abcdef", ); }); @@ -2524,7 +2508,7 @@ describe("structuredContent", () => { const payload = (result as { structuredContent: Record }) .structuredContent; - expect(payload.replays).toBeNull(); + expect(payload["replays"]).toBeNull(); }); it("maps external issues field by field so upstream extras cannot leak", async () => { @@ -2594,12 +2578,12 @@ describe("structuredContent", () => { "project", "url", ]) { - expect(payload.issue).toHaveProperty(field); + expect(payload["issue"]).toHaveProperty(field); } // and the event identity markdown prints alongside it - expect(payload.event.occurredAt).toBe("2026-09-03T12:00:00.000Z"); - expect(payload.event).toHaveProperty("id"); - expect(payload.event).toHaveProperty("type"); + expect(payload["event"].occurredAt).toBe("2026-09-03T12:00:00.000Z"); + expect(payload["event"]).toHaveProperty("id"); + expect(payload["event"]).toHaveProperty("type"); }); it("does not label an error's exception message as a query pattern", async () => { @@ -2636,10 +2620,10 @@ describe("structuredContent", () => { const payload = (result as { structuredContent: Record }) .structuredContent; - expect(payload.issue.queryPattern).toBeNull(); - expect(payload.issue.location).toBeNull(); + expect(payload["issue"].queryPattern).toBeNull(); + expect(payload["issue"].location).toBeNull(); // and the top level title wins for an error, not the metadata one - expect(payload.issue.title).not.toBe("metadata title"); + expect(payload["issue"].title).not.toBe("metadata title"); }); it("uses the metadata fields for a performance issue", async () => { @@ -2673,9 +2657,11 @@ describe("structuredContent", () => { const payload = (result as { structuredContent: Record }) .structuredContent; - expect(payload.issue.title).toBe("N+1 Query"); - expect(payload.issue.queryPattern).toBe("SELECT * FROM users WHERE id = ?"); - expect(payload.issue.location).toBe("/api/checkout"); + expect(payload["issue"].title).toBe("N+1 Query"); + expect(payload["issue"].queryPattern).toBe( + "SELECT * FROM users WHERE id = ?", + ); + expect(payload["issue"].location).toBe("/api/checkout"); }); it("caps related replays and reports the full count", async () => { @@ -2707,9 +2693,9 @@ describe("structuredContent", () => { const payload = (result as { structuredContent: Record }) .structuredContent; - expect(payload.replays).not.toBeNull(); - expect(payload.replays.relatedCount).toBe(51); - expect(payload.replays.related).toHaveLength(5); + expect(payload["replays"]).not.toBeNull(); + expect(payload["replays"].relatedCount).toBe(51); + expect(payload["replays"].related).toHaveLength(5); }); }); diff --git a/packages/mcp-core/src/tools/catalog/get-issue-details.ts b/packages/mcp-core/src/tools/catalog/get-issue-details.ts index c44fd76056..e876435bd3 100644 --- a/packages/mcp-core/src/tools/catalog/get-issue-details.ts +++ b/packages/mcp-core/src/tools/catalog/get-issue-details.ts @@ -467,7 +467,7 @@ function buildIssueSuggestedActions({ issue: Issue; event: Event; apiService: SentryApiService; - aiConversations?: AIConversationReference[]; + aiConversations?: AIConversationReference[] | undefined; hasRelatedIssues: boolean; otherThread: number | string | null; session: ToolSession; @@ -1131,7 +1131,7 @@ async function findAIConversationsForTrace({ references.set(conversationId, { conversationId, - spanId: getString(record.span_id), + spanId: getString(record["span_id"]), }); if (references.size >= MAX_AI_CONVERSATION_MATCHES) { @@ -1163,7 +1163,7 @@ function buildConversationLookupTimeParams(event: Event): { } function getEventTraceId(event: Event): string | undefined { - const traceId = event.contexts?.trace?.trace_id; + const traceId = event.contexts?.["trace"]?.["trace_id"]; return getString(traceId); } @@ -1183,7 +1183,7 @@ function shouldFetchTraceForEvent(event: Event): { traceId: string } | null { } // Check if we have a trace ID - const traceId = event.contexts?.trace?.trace_id; + const traceId = event.contexts?.["trace"]?.["trace_id"]; if (typeof traceId !== "string" || traceId.length === 0) { return null; diff --git a/packages/mcp-core/src/tools/catalog/get-latest-base-snapshot.ts b/packages/mcp-core/src/tools/catalog/get-latest-base-snapshot.ts index ddb95f4cd8..65619d29ab 100644 --- a/packages/mcp-core/src/tools/catalog/get-latest-base-snapshot.ts +++ b/packages/mcp-core/src/tools/catalog/get-latest-base-snapshot.ts @@ -19,8 +19,8 @@ import { interface InstructionContext { experimentalMode: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; } function viewImageInstruction( @@ -116,9 +116,9 @@ export default defineTool({ compactMetadata: true, })) as Record; - const snapshotId = snapshotString(data.id) ?? null; - const images = snapshotImageEntries(data.images); - const appInfo = data.app_info as + const snapshotId = snapshotString(data["id"]) ?? null; + const images = snapshotImageEntries(data["images"]); + const appInfo = data["app_info"] as | { name?: unknown; platform?: unknown } | null | undefined; @@ -139,7 +139,7 @@ export default defineTool({ platform: snapshotString(appInfo.platform) ?? null, } : null, - vcs: toSnapshotVcs(data.vcs_info as SnapshotVcsInfo | undefined), + vcs: toSnapshotVcs(data["vcs_info"] as SnapshotVcsInfo | undefined), totalImages: images.length, groups: toSnapshotImageGroups(images), responseNotes: diff --git a/packages/mcp-core/src/tools/catalog/get-monitor-details.ts b/packages/mcp-core/src/tools/catalog/get-monitor-details.ts index 64998af781..4af6775720 100644 --- a/packages/mcp-core/src/tools/catalog/get-monitor-details.ts +++ b/packages/mcp-core/src/tools/catalog/get-monitor-details.ts @@ -133,7 +133,7 @@ function toConfig( } return { scheduleType: readString(config, "schedule_type"), - schedule: readSchedule(config.schedule), + schedule: readSchedule(config["schedule"]), timezone: readString(config, "timezone"), checkinMarginMinutes: readNumber(config, "checkin_margin"), maxRuntimeMinutes: readNumber(config, "max_runtime"), diff --git a/packages/mcp-core/src/tools/catalog/get-profile-details.test.ts b/packages/mcp-core/src/tools/catalog/get-profile-details.test.ts index 385779cbc8..9eff4deb71 100644 --- a/packages/mcp-core/src/tools/catalog/get-profile-details.test.ts +++ b/packages/mcp-core/src/tools/catalog/get-profile-details.test.ts @@ -547,16 +547,18 @@ describe("get_profile_details", () => { }); it("maps transaction profile fields without leaking raw API data", async () => { + const fixture = structuredClone(transactionProfileV1Fixture); const body = { - ...structuredClone(transactionProfileV1Fixture), + ...fixture, backendOnly: "must-not-leak-root", + profile: { + ...fixture.profile, + frames: fixture.profile.frames.map((frame) => ({ + ...frame, + instruction_addr: "0xmust-not-leak", + })), + }, }; - body.profile.frames = body.profile.frames.map( - (frame: Record) => ({ - ...frame, - instruction_addr: "0xmust-not-leak", - }), - ); for (const host of ["sentry.io", "us.sentry.io"]) { mswServer.use( http.get( diff --git a/packages/mcp-core/src/tools/catalog/get-profile-details.ts b/packages/mcp-core/src/tools/catalog/get-profile-details.ts index 2d78689bdf..4edf67d034 100644 --- a/packages/mcp-core/src/tools/catalog/get-profile-details.ts +++ b/packages/mcp-core/src/tools/catalog/get-profile-details.ts @@ -43,13 +43,13 @@ type ResolvedProfileDetailsParams = }; function resolveProfileDetailsParams(params: { - profileUrl?: string | null; - organizationSlug?: string | null; - projectSlugOrId?: string | number | null; - profileId?: string | null; - profilerId?: string | null; - start?: string | null; - end?: string | null; + profileUrl?: string | null | undefined; + organizationSlug?: string | null | undefined; + projectSlugOrId?: string | number | null | undefined; + profileId?: string | null | undefined; + profilerId?: string | null | undefined; + start?: string | null | undefined; + end?: string | null | undefined; }): ResolvedProfileDetailsParams { if (params.profileUrl) { if (!isProfileUrl(params.profileUrl)) { diff --git a/packages/mcp-core/src/tools/catalog/get-profile.ts b/packages/mcp-core/src/tools/catalog/get-profile.ts index d43be2ba9c..0d7ab271da 100644 --- a/packages/mcp-core/src/tools/catalog/get-profile.ts +++ b/packages/mcp-core/src/tools/catalog/get-profile.ts @@ -44,8 +44,8 @@ function emptyProfileGuidance(periods: { interface ResolvedProfileParams { organizationSlug: string; - projectSlugOrId?: string | number; - transactionName?: string; + projectSlugOrId?: string | number | undefined; + transactionName?: string | undefined; } /** @@ -53,10 +53,10 @@ interface ResolvedProfileParams { * URL takes precedence if provided and valid. */ function resolveProfileParams(params: { - profileUrl?: string | null; - organizationSlug?: string | null; - projectSlugOrId?: string | number | null; - transactionName?: string | null; + profileUrl?: string | null | undefined; + organizationSlug?: string | null | undefined; + projectSlugOrId?: string | number | null | undefined; + transactionName?: string | null | undefined; }): ResolvedProfileParams { // URL-based resolution if (params.profileUrl) { diff --git a/packages/mcp-core/src/tools/catalog/get-replay-details.ts b/packages/mcp-core/src/tools/catalog/get-replay-details.ts index 0976606c6e..c0655d01d3 100644 --- a/packages/mcp-core/src/tools/catalog/get-replay-details.ts +++ b/packages/mcp-core/src/tools/catalog/get-replay-details.ts @@ -344,9 +344,9 @@ export default defineTool({ }); export function resolveReplayParams(params: { - replayUrl?: string | null; - organizationSlug?: string | null; - replayId?: string | null; + replayUrl?: string | null | undefined; + organizationSlug?: string | null | undefined; + replayId?: string | null | undefined; }): ResolvedReplayParams { if (params.replayUrl) { const parsed = parseSentryUrl(params.replayUrl); @@ -386,7 +386,7 @@ async function assertReplayWithinProjectConstraint({ apiService: SentryApiService; organizationSlug: string; replay: ReplayDetails; - projectSlug?: string | null; + projectSlug?: string | null | undefined; }): Promise { if (!projectSlug) { return; @@ -578,10 +578,10 @@ function buildReplayUser( } const { id, username, email, ip, geo } = replay.user; const mappedGeo = { - city: geo?.city || null, - countryCode: geo?.country_code || null, - region: geo?.region || null, - subdivision: geo?.subdivision || null, + city: geo?.["city"] || null, + countryCode: geo?.["country_code"] || null, + region: geo?.["region"] || null, + subdivision: geo?.["subdivision"] || null, }; const user = { id: id || null, @@ -719,19 +719,20 @@ function buildSuggestedActions({ replayId, }; if (regionUrl) { - continueArguments.regionUrl = regionUrl; + continueArguments["regionUrl"] = regionUrl; } if (timelineRequest.categories) { - continueArguments.categories = timelineRequest.categories; + continueArguments["categories"] = timelineRequest.categories; } if (timelineRequest.startOffsetSeconds !== null) { - continueArguments.startOffsetSeconds = timelineRequest.startOffsetSeconds; + continueArguments["startOffsetSeconds"] = + timelineRequest.startOffsetSeconds; } if (timelineRequest.endOffsetSeconds !== null) { - continueArguments.endOffsetSeconds = timelineRequest.endOffsetSeconds; + continueArguments["endOffsetSeconds"] = timelineRequest.endOffsetSeconds; } - continueArguments.limit = timelineRequest.limit; - continueArguments.skip = timeline.nextSkip; + continueArguments["limit"] = timelineRequest.limit; + continueArguments["skip"] = timeline.nextSkip; candidates.push( buildSuggestedToolAction({ toolName: "get_replay_details", diff --git a/packages/mcp-core/src/tools/catalog/get-sentry-mcp-info.ts b/packages/mcp-core/src/tools/catalog/get-sentry-mcp-info.ts index 996e04f58d..39b9e75687 100644 --- a/packages/mcp-core/src/tools/catalog/get-sentry-mcp-info.ts +++ b/packages/mcp-core/src/tools/catalog/get-sentry-mcp-info.ts @@ -23,7 +23,7 @@ export default defineTool({ openWorldHint: false, }, async handler() { - return structuredResult({ + return structuredResult>({ version: getServerVersion(), }); }, diff --git a/packages/mcp-core/src/tools/catalog/get-sentry-resource.test.ts b/packages/mcp-core/src/tools/catalog/get-sentry-resource.test.ts index 13e361099b..6782734ab4 100644 --- a/packages/mcp-core/src/tools/catalog/get-sentry-resource.test.ts +++ b/packages/mcp-core/src/tools/catalog/get-sentry-resource.test.ts @@ -17,10 +17,10 @@ import { getReplayDetailsOutputSchema } from "./get-replay-details"; import getSentryResource from "./get-sentry-resource.js"; import { resolveDescription } from "../../tools/types.js"; -const originalOpenAIApiKey = process.env.OPENAI_API_KEY; -const originalAnthropicApiKey = process.env.ANTHROPIC_API_KEY; -const originalOpenRouterApiKey = process.env.OPENROUTER_API_KEY; -const originalEmbeddedAgentProvider = process.env.EMBEDDED_AGENT_PROVIDER; +const originalOpenAIApiKey = process.env["OPENAI_API_KEY"]; +const originalAnthropicApiKey = process.env["ANTHROPIC_API_KEY"]; +const originalOpenRouterApiKey = process.env["OPENROUTER_API_KEY"]; +const originalEmbeddedAgentProvider = process.env["EMBEDDED_AGENT_PROVIDER"]; function expectReplayWithDeadClick(result: unknown) { const payload = getReplayDetailsOutputSchema.parse( @@ -42,9 +42,7 @@ function expectReplayWithDeadClick(result: unknown) { } const baseContext = { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }; @@ -155,25 +153,25 @@ describe("get_sentry_resource", () => { if (originalOpenAIApiKey === undefined) { Reflect.deleteProperty(process.env, "OPENAI_API_KEY"); } else { - process.env.OPENAI_API_KEY = originalOpenAIApiKey; + process.env["OPENAI_API_KEY"] = originalOpenAIApiKey; } if (originalAnthropicApiKey === undefined) { Reflect.deleteProperty(process.env, "ANTHROPIC_API_KEY"); } else { - process.env.ANTHROPIC_API_KEY = originalAnthropicApiKey; + process.env["ANTHROPIC_API_KEY"] = originalAnthropicApiKey; } if (originalOpenRouterApiKey === undefined) { Reflect.deleteProperty(process.env, "OPENROUTER_API_KEY"); } else { - process.env.OPENROUTER_API_KEY = originalOpenRouterApiKey; + process.env["OPENROUTER_API_KEY"] = originalOpenRouterApiKey; } if (originalEmbeddedAgentProvider === undefined) { Reflect.deleteProperty(process.env, "EMBEDDED_AGENT_PROVIDER"); } else { - process.env.EMBEDDED_AGENT_PROVIDER = originalEmbeddedAgentProvider; + process.env["EMBEDDED_AGENT_PROVIDER"] = originalEmbeddedAgentProvider; } }); @@ -422,7 +420,7 @@ describe("get_sentry_resource", () => { const result = await callHandler({ url: "https://my-org.sentry.io/crons/daily-backup/", }); - expect(getStructuredContent(result).monitor).toMatchObject({ + expect(getStructuredContent(result)["monitor"]).toMatchObject({ slug: "daily-backup", url: "https://my-org.sentry.io/crons/backend/daily-backup/", }); @@ -440,7 +438,7 @@ describe("get_sentry_resource", () => { const result = await callHandler({ url: "https://my-org.sentry.io/crons/my-project/my-monitor/", }); - expect(getStructuredContent(result).monitor).toMatchObject({ + expect(getStructuredContent(result)["monitor"]).toMatchObject({ slug: "my-monitor", url: "https://my-org.sentry.io/crons/my-project/my-monitor/", }); @@ -469,7 +467,7 @@ describe("get_sentry_resource", () => { }, ); - expect(getStructuredContent(result).monitor).toMatchObject({ + expect(getStructuredContent(result)["monitor"]).toMatchObject({ slug: "my-monitor", url: "https://my-org.sentry.io/crons/backend/my-monitor/", }); @@ -549,7 +547,7 @@ describe("get_sentry_resource", () => { }, ); - expect(getStructuredContent(result).monitor).toMatchObject({ + expect(getStructuredContent(result)["monitor"]).toMatchObject({ slug: "my-monitor", url: "https://my-org.sentry.io/crons/backend/my-monitor/", }); @@ -613,7 +611,7 @@ describe("get_sentry_resource", () => { sentryProtocol: "http", }, ); - expect(getStructuredContent(result).monitor).toMatchObject({ + expect(getStructuredContent(result)["monitor"]).toMatchObject({ url: "http://sentry.internal:9000/organizations/my-org/crons/backend/daily-backup/", }); }); @@ -644,7 +642,7 @@ describe("get_sentry_resource", () => { const result = await callHandler({ url: "https://sentry-mcp-evals.sentry.io/dashboard/101/", }); - expect(getStructuredContent(result).dashboard).toMatchObject({ + expect(getStructuredContent(result)["dashboard"]).toMatchObject({ id: "101", title: "Errors Overview", }); @@ -656,7 +654,7 @@ describe("get_sentry_resource", () => { resourceId: "101", organizationSlug: "sentry-mcp-evals", }); - expect(getStructuredContent(result).dashboard).toMatchObject({ + expect(getStructuredContent(result)["dashboard"]).toMatchObject({ id: "101", title: "Errors Overview", }); @@ -668,7 +666,7 @@ describe("get_sentry_resource", () => { resourceId: "Errors Overview", organizationSlug: "sentry-mcp-evals", }); - expect(getStructuredContent(result).dashboard).toMatchObject({ + expect(getStructuredContent(result)["dashboard"]).toMatchObject({ id: "101", title: "Errors Overview", }); diff --git a/packages/mcp-core/src/tools/catalog/get-sentry-resource.ts b/packages/mcp-core/src/tools/catalog/get-sentry-resource.ts index 5f6d4d8707..ed79d8a741 100644 --- a/packages/mcp-core/src/tools/catalog/get-sentry-resource.ts +++ b/packages/mcp-core/src/tools/catalog/get-sentry-resource.ts @@ -59,7 +59,7 @@ export interface ResolvedResourceParams { type: ResolvedResourceType; organizationSlug: string; // Issue/Event params - issueId?: string; + issueId?: string | undefined; eventId?: string; // Trace/Span params traceId?: string; @@ -67,11 +67,11 @@ export interface ResolvedResourceParams { // agent conversation params conversationId?: string; // Profile params - projectSlugOrId?: string; - profileId?: string; - profilerId?: string; - start?: string; - end?: string; + projectSlugOrId?: string | undefined; + profileId?: string | undefined; + profilerId?: string | undefined; + start?: string | undefined; + end?: string | undefined; // Replay params replayId?: string; // Monitor params @@ -80,11 +80,26 @@ export interface ResolvedResourceParams { releaseVersion?: string; // Snapshot params snapshotId?: string; - selectedSnapshot?: string; + selectedSnapshot?: string | undefined; // Dashboard params dashboardIdOrTitle?: string; } +/** + * Returns a field the resolver sets for the resolved resource type. Every + * branch of `resolveResourceParams` sets the fields its type needs, so a + * missing one is a resolver bug. + */ +function requireResolved( + value: string | undefined, + field: keyof ResolvedResourceParams, +): string { + if (value === undefined) { + throw new Error(`Resolved resource is missing \`${field}\`.`); + } + return value; +} + // Issue short IDs (PROJECT-123) and numeric issue IDs. Only used to infer a // missing resourceType, so other resource IDs keep requiring an explicit type. const ISSUE_ID_PATTERN = /^(?:\d+|[A-Z0-9_.]+(?:-[A-Z0-9_.]+)*-[A-Z0-9]+)$/; @@ -126,11 +141,11 @@ function getUnsupportedUrlGuidance(url: string): string | undefined { } export function resolveResourceParams(params: { - url?: string | null; - resourceType?: string | null; - resourceId?: string | null; - organizationSlug?: string | null; - projectSlug?: string | null; + url?: string | null | undefined; + resourceType?: string | null | undefined; + resourceId?: string | null | undefined; + organizationSlug?: string | null | undefined; + projectSlug?: string | null | undefined; }): ResolvedResourceParams { if (params.url) { const parsed = parseSentryUrl(params.url); @@ -239,9 +254,9 @@ function resolveFromParsedUrl( parsed: ParsedSentryUrl, params: { url: string; - resourceType?: string | null; - organizationSlug?: string | null; - projectSlug?: string | null; + resourceType?: string | null | undefined; + organizationSlug?: string | null | undefined; + projectSlug?: string | null | undefined; }, ): ResolvedResourceParams { const detectedType: ResolvedResourceType | "unknown" = @@ -646,7 +661,7 @@ export default defineTool({ return await getTraceDetails.handler( { organizationSlug: resolved.organizationSlug, - traceId: resolved.traceId!, + traceId: requireResolved(resolved.traceId, "traceId"), regionUrl: context.constraints.regionUrl ?? null, }, context, @@ -656,8 +671,8 @@ export default defineTool({ return await getSpanDetails.handler( { organizationSlug: resolved.organizationSlug, - traceId: resolved.traceId!, - spanId: resolved.spanId!, + traceId: requireResolved(resolved.traceId, "traceId"), + spanId: requireResolved(resolved.spanId, "spanId"), regionUrl: context.constraints.regionUrl ?? null, }, context, @@ -667,7 +682,10 @@ export default defineTool({ return await getAIConversationDetails.handler( { organizationSlug: resolved.organizationSlug, - conversationId: resolved.conversationId!, + conversationId: requireResolved( + resolved.conversationId, + "conversationId", + ), project: resolved.projectSlugOrId, start: resolved.start, end: resolved.end, @@ -693,7 +711,7 @@ export default defineTool({ { organizationSlug: resolved.organizationSlug, projectSlugOrId: resolved.projectSlugOrId ?? null, - monitorSlug: resolved.monitorSlug!, + monitorSlug: requireResolved(resolved.monitorSlug, "monitorSlug"), regionUrl: context.constraints.regionUrl ?? null, environment: null, period: "24h", @@ -731,7 +749,10 @@ export default defineTool({ return await getDashboardDetails.handler( { organizationSlug: resolved.organizationSlug, - dashboardIdOrTitle: resolved.dashboardIdOrTitle!, + dashboardIdOrTitle: requireResolved( + resolved.dashboardIdOrTitle, + "dashboardIdOrTitle", + ), regionUrl: context.constraints.regionUrl ?? null, }, context, @@ -742,7 +763,7 @@ export default defineTool({ return await getSnapshotImage.handler( { organizationSlug: resolved.organizationSlug, - snapshotId: resolved.snapshotId!, + snapshotId: requireResolved(resolved.snapshotId, "snapshotId"), imageIdentifier: resolved.selectedSnapshot, imageResolution: "preview", regionUrl: context.constraints.regionUrl ?? null, @@ -754,7 +775,7 @@ export default defineTool({ return await getSnapshot.handler( { organizationSlug: resolved.organizationSlug, - snapshotId: resolved.snapshotId!, + snapshotId: requireResolved(resolved.snapshotId, "snapshotId"), showUnmodified: false, regionUrl: context.constraints.regionUrl ?? null, }, diff --git a/packages/mcp-core/src/tools/catalog/get-snapshot-image.test.ts b/packages/mcp-core/src/tools/catalog/get-snapshot-image.test.ts index ab45632caf..a761e62a56 100644 --- a/packages/mcp-core/src/tools/catalog/get-snapshot-image.test.ts +++ b/packages/mcp-core/src/tools/catalog/get-snapshot-image.test.ts @@ -2,7 +2,7 @@ import type { ImageContent, TextContent } from "@modelcontextprotocol/server"; import { mswServer } from "@sentry/mcp-server-mocks"; import { decode as decodePng, encode as encodePng } from "fast-png"; import { http, HttpResponse } from "msw"; -import { describe, expect, it } from "vitest"; +import { assert, describe, expect, it } from "vitest"; import { getServerContext } from "../../test-setup.js"; import getSnapshotImage from "./get-snapshot-image.js"; @@ -221,12 +221,14 @@ describe("get_snapshot_image", () => { expect(textParts[1]?.text).toBe("### Head (current) — preview"); expect(imageParts).toHaveLength(1); - expect(imageParts[0]?.mimeType).toBe("image/png"); - expect(imageParts[0]!.data).not.toBe( + const [imagePart] = imageParts; + assert(imagePart, "Expected one image part"); + expect(imagePart.mimeType).toBe("image/png"); + expect(imagePart.data).not.toBe( Buffer.from(largeSixteenBitPng).toString("base64"), ); - const decoded = decodePng(Buffer.from(imageParts[0]!.data, "base64")); + const decoded = decodePng(Buffer.from(imagePart.data, "base64")); expect(decoded.width).toBe(1024); expect(decoded.height).toBe(512); expect(decoded.depth).toBe(8); diff --git a/packages/mcp-core/src/tools/catalog/get-trace-details.test.ts b/packages/mcp-core/src/tools/catalog/get-trace-details.test.ts index a555a5fb54..bd0d1a8389 100644 --- a/packages/mcp-core/src/tools/catalog/get-trace-details.test.ts +++ b/packages/mcp-core/src/tools/catalog/get-trace-details.test.ts @@ -10,10 +10,10 @@ import { import { getTextContent } from "../../test-utils/structured-content"; import getTraceDetails from "./get-trace-details.js"; -const originalOpenAIApiKey = process.env.OPENAI_API_KEY; -const originalAnthropicApiKey = process.env.ANTHROPIC_API_KEY; -const originalOpenRouterApiKey = process.env.OPENROUTER_API_KEY; -const originalEmbeddedAgentProvider = process.env.EMBEDDED_AGENT_PROVIDER; +const originalOpenAIApiKey = process.env["OPENAI_API_KEY"]; +const originalAnthropicApiKey = process.env["ANTHROPIC_API_KEY"]; +const originalOpenRouterApiKey = process.env["OPENROUTER_API_KEY"]; +const originalEmbeddedAgentProvider = process.env["EMBEDDED_AGENT_PROVIDER"]; /** Register the same handler on sentry.io and us.sentry.io (org fixture resolves region). */ function httpGetRegional( @@ -106,7 +106,7 @@ function buildTraceSpanNode({ describe("get_trace_details", () => { beforeEach(() => { - process.env.OPENAI_API_KEY = "test-key"; + process.env["OPENAI_API_KEY"] = "test-key"; Reflect.deleteProperty(process.env, "ANTHROPIC_API_KEY"); Reflect.deleteProperty(process.env, "OPENROUTER_API_KEY"); Reflect.deleteProperty(process.env, "EMBEDDED_AGENT_PROVIDER"); @@ -116,25 +116,25 @@ describe("get_trace_details", () => { if (originalOpenAIApiKey === undefined) { Reflect.deleteProperty(process.env, "OPENAI_API_KEY"); } else { - process.env.OPENAI_API_KEY = originalOpenAIApiKey; + process.env["OPENAI_API_KEY"] = originalOpenAIApiKey; } if (originalAnthropicApiKey === undefined) { Reflect.deleteProperty(process.env, "ANTHROPIC_API_KEY"); } else { - process.env.ANTHROPIC_API_KEY = originalAnthropicApiKey; + process.env["ANTHROPIC_API_KEY"] = originalAnthropicApiKey; } if (originalOpenRouterApiKey === undefined) { Reflect.deleteProperty(process.env, "OPENROUTER_API_KEY"); } else { - process.env.OPENROUTER_API_KEY = originalOpenRouterApiKey; + process.env["OPENROUTER_API_KEY"] = originalOpenRouterApiKey; } if (originalEmbeddedAgentProvider === undefined) { Reflect.deleteProperty(process.env, "EMBEDDED_AGENT_PROVIDER"); } else { - process.env.EMBEDDED_AGENT_PROVIDER = originalEmbeddedAgentProvider; + process.env["EMBEDDED_AGENT_PROVIDER"] = originalEmbeddedAgentProvider; } }); diff --git a/packages/mcp-core/src/tools/catalog/get-trace-details.ts b/packages/mcp-core/src/tools/catalog/get-trace-details.ts index 2cd1b55eae..9e5ca65e52 100644 --- a/packages/mcp-core/src/tools/catalog/get-trace-details.ts +++ b/packages/mcp-core/src/tools/catalog/get-trace-details.ts @@ -337,7 +337,7 @@ function normalizeSpanId(value: unknown): string | undefined { function getTraceSpanId(span: TraceSpan): string { return ( normalizeSpanId(span.span_id) || - normalizeSpanId(span.additional_attributes?.span_id) || + normalizeSpanId(span.additional_attributes?.["span_id"]) || span.event_id ); } @@ -571,7 +571,8 @@ function calculateOperationStats(trace: Trace): Record< // Only consider leaf nodes - spans that have no children if (span.children.length === 0) { // Use span.op if available, otherwise extract from span.name, fallback to "unknown" - const op = span.op || (span.name ? span.name.split(" ")[0]! : "unknown"); + const op = + span.op || (span.name ? (span.name.split(" ")[0] ?? "") : "unknown"); const bucket = operationSpans.get(op); if (bucket) { bucket.push(span); @@ -661,14 +662,14 @@ function formatTraceOutput({ }: { organizationSlug: string; traceId: string; - spanId?: string; + spanId?: string | undefined; summary: TraceSummary; trace: Trace; traceFetchState: TraceFetchState; apiService: SentryApiService; - experimentalMode?: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + experimentalMode?: boolean | undefined; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; aiConversations: AIConversationReference[]; }): string { if (spanId) { @@ -716,9 +717,9 @@ function formatTraceOverviewOutput({ summary: TraceSummary; trace: Trace; apiService: SentryApiService; - experimentalMode?: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + experimentalMode?: boolean | undefined; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; aiConversations: AIConversationReference[]; }): string { const sections: string[] = []; @@ -830,9 +831,9 @@ function formatFocusedSpanOutput({ trace: Trace; traceFetchState: TraceFetchState; apiService: SentryApiService; - experimentalMode?: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + experimentalMode?: boolean | undefined; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; aiConversations: AIConversationReference[]; }): string { const focusedSpan = findTraceSpan(trace, spanId); @@ -1152,8 +1153,8 @@ function formatAIConversationSection({ aiConversations: AIConversationReference[]; organizationSlug: string; experimentalMode: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; }): string[] { if (aiConversations.length === 0) { return []; @@ -1168,8 +1169,8 @@ function formatAIConversationSection({ }); const lines = ["## Agent Conversations", ""]; - if (aiConversations.length === 1) { - const conversation = aiConversations[0]!; + const [conversation] = aiConversations; + if (aiConversations.length === 1 && conversation) { lines.push(`**Conversation ID**: \`${conversation.conversationId}\``); if (conversation.spanId) { lines.push(`**Matching Span**: \`${conversation.spanId}\``); @@ -1204,8 +1205,8 @@ function buildTraceNextSteps({ traceId: string; spanFocused?: boolean; experimentalMode: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; }): string[] { const formatSearchStep = ({ label, diff --git a/packages/mcp-core/src/tools/catalog/index.ts b/packages/mcp-core/src/tools/catalog/index.ts index dfc24fc8d8..d2a897479b 100644 --- a/packages/mcp-core/src/tools/catalog/index.ts +++ b/packages/mcp-core/src/tools/catalog/index.ts @@ -85,7 +85,7 @@ const legacyGetAIConversationDetails = { deprecated: { replacedBy: ["get_agent_conversation_details"] }, description: "Deprecated alias for get_agent_conversation_details; use that tool instead.", -} satisfies ToolConfig; +} satisfies ToolConfig; const legacySearchAIConversations = { ...searchAgentConversations, @@ -95,14 +95,14 @@ const legacySearchAIConversations = { deprecated: { replacedBy: ["search_agent_conversations"] }, description: "Deprecated alias for search_agent_conversations; use that tool instead.", -} satisfies ToolConfig; +} satisfies ToolConfig; // The docs tools read docs.sentry.io, not the Sentry API, so they have no // cached reads to bypass. const DOCS_TOOL_NAMES = new Set(["search_docs", "get_doc"]); /** Give every read tool that calls the Sentry API the shared `fresh` input. */ -function withFreshReadInputs>>( +function withFreshReadInputs>( tools: T, ): T { return Object.fromEntries( @@ -205,7 +205,7 @@ const catalogTools = withFreshReadInputs({ add_issue_note: addIssueNote, onboarding_status_update: onboardingStatusUpdate, submit_feedback_to_sentry_team: submitFeedbackToSentryTeam, -} as const satisfies Record>); +} as const satisfies Record); export default catalogTools; export type CatalogToolName = keyof typeof catalogTools; diff --git a/packages/mcp-core/src/tools/catalog/path-traversal.test.ts b/packages/mcp-core/src/tools/catalog/path-traversal.test.ts index 8c4c68e6bf..3e29aa0c15 100644 --- a/packages/mcp-core/src/tools/catalog/path-traversal.test.ts +++ b/packages/mcp-core/src/tools/catalog/path-traversal.test.ts @@ -64,9 +64,9 @@ afterEach(() => { * requested, which is captured either way. */ async function callToolAsClient( - // getFilteredInputSchema and injectConstraintParams take ToolConfig so they + // getFilteredInputSchema and injectConstraintParams take ToolConfig so they // can accept tools with heterogeneous schemas. - tool: ToolConfig, + tool: ToolConfig, clientParams: Record, context: ServerContext, ): Promise { @@ -111,7 +111,7 @@ describe("path traversal containment", () => { /** Every ID parameter named across the four reports. */ const sinks: [ string, - ToolConfig, + ToolConfig, (payload: string) => Record, ][] = [ [ diff --git a/packages/mcp-core/src/tools/catalog/search-agent-conversations.test.ts b/packages/mcp-core/src/tools/catalog/search-agent-conversations.test.ts index b46606e1d7..a6d72e2fd3 100644 --- a/packages/mcp-core/src/tools/catalog/search-agent-conversations.test.ts +++ b/packages/mcp-core/src/tools/catalog/search-agent-conversations.test.ts @@ -1,5 +1,5 @@ import { http, HttpResponse } from "msw"; -import { describe, expect, it } from "vitest"; +import { assert, describe, expect, it } from "vitest"; import { mswServer } from "@sentry/mcp-server-mocks"; import searchAIConversations from "./search-agent-conversations"; import { getServerContext } from "../../test-setup"; @@ -315,7 +315,9 @@ describe("search_agent_conversations", () => { getServerContext(), ); - const params = new URL(requestUrls[0]!).searchParams; + const [requestUrl] = requestUrls; + assert(requestUrl, "Expected one request"); + const params = new URL(requestUrl).searchParams; expect(params.get("query")).toBe("failed"); expect(params.get("sort")).toBe(null); expect(params.getAll("project")).toEqual(["4509109107622913"]); diff --git a/packages/mcp-core/src/tools/catalog/search-agent-conversations.ts b/packages/mcp-core/src/tools/catalog/search-agent-conversations.ts index a842e56fcb..9e28ca1680 100644 --- a/packages/mcp-core/src/tools/catalog/search-agent-conversations.ts +++ b/packages/mcp-core/src/tools/catalog/search-agent-conversations.ts @@ -80,8 +80,8 @@ async function resolveProjectIds({ }: { apiService: SentryApiService; organizationSlug: string; - project?: string | string[]; - constrainedProjectSlug?: string | null; + project?: string | string[] | undefined; + constrainedProjectSlug?: string | null | undefined; }): Promise { if (constrainedProjectSlug) { const constrainedProject = await apiService.getProject({ diff --git a/packages/mcp-core/src/tools/catalog/search-events.test.ts b/packages/mcp-core/src/tools/catalog/search-events.test.ts index 924869a9b2..7b5e3dbd41 100644 --- a/packages/mcp-core/src/tools/catalog/search-events.test.ts +++ b/packages/mcp-core/src/tools/catalog/search-events.test.ts @@ -131,8 +131,8 @@ describe("search_events", () => { beforeEach(() => { vi.clearAllMocks(); - process.env.OPENAI_API_KEY = "test-key"; - process.env.OPENROUTER_API_KEY = ""; + process.env["OPENAI_API_KEY"] = "test-key"; + process.env["OPENROUTER_API_KEY"] = ""; mockGenerateText.mockResolvedValue(mockAIResponse("errors")); mockValidEventsValidation(); }); @@ -3219,9 +3219,9 @@ describe("search_events", () => { }); it("should search events with direct query syntax (no agent)", async () => { - process.env.OPENAI_API_KEY = ""; - process.env.ANTHROPIC_API_KEY = ""; - process.env.OPENROUTER_API_KEY = ""; + process.env["OPENAI_API_KEY"] = ""; + process.env["ANTHROPIC_API_KEY"] = ""; + process.env["OPENROUTER_API_KEY"] = ""; mswServer.use( http.get( @@ -4059,9 +4059,9 @@ describe("search_events", () => { }); it("rejects search immediately when validation fails without an agent provider", async () => { - process.env.OPENAI_API_KEY = ""; - process.env.ANTHROPIC_API_KEY = ""; - process.env.OPENROUTER_API_KEY = ""; + process.env["OPENAI_API_KEY"] = ""; + process.env["ANTHROPIC_API_KEY"] = ""; + process.env["OPENROUTER_API_KEY"] = ""; mswServer.use( http.get( @@ -4149,7 +4149,7 @@ describe("search_events", () => { }; beforeEach(() => { - process.env.OPENAI_API_KEY = ""; + process.env["OPENAI_API_KEY"] = ""; }); it("explains a rejected log timestamp aggregate", async () => { @@ -5022,9 +5022,9 @@ describe("search_events", () => { "**Note:** `query` was not translated from natural language because no embedded agent or Seer translation was available, so Sentry searched for it as literal text and found nothing. Retry with Sentry search syntax, such as `environment:production`, and use `period` for the time range."; beforeEach(() => { - process.env.OPENAI_API_KEY = ""; - process.env.ANTHROPIC_API_KEY = ""; - process.env.OPENROUTER_API_KEY = ""; + process.env["OPENAI_API_KEY"] = ""; + process.env["ANTHROPIC_API_KEY"] = ""; + process.env["OPENROUTER_API_KEY"] = ""; mswServer.use( mockOrganization(["mcp-search-events-seer-translate"]), http.get( diff --git a/packages/mcp-core/src/tools/catalog/search-issue-events.test.ts b/packages/mcp-core/src/tools/catalog/search-issue-events.test.ts index f503a5f30d..a02814b81c 100644 --- a/packages/mcp-core/src/tools/catalog/search-issue-events.test.ts +++ b/packages/mcp-core/src/tools/catalog/search-issue-events.test.ts @@ -130,8 +130,8 @@ describe("search_issue_events", () => { beforeEach(() => { vi.clearAllMocks(); - process.env.OPENAI_API_KEY = "test-key"; - process.env.OPENROUTER_API_KEY = ""; + process.env["OPENAI_API_KEY"] = "test-key"; + process.env["OPENROUTER_API_KEY"] = ""; mockGenerateText.mockResolvedValue(mockAIResponse()); }); @@ -515,7 +515,7 @@ describe("search_issue_events", () => { ); const [emptyUser, emptyGeo] = sc(result).events; - expect(emptyUser!.user).toBeNull(); + expect(emptyUser?.user).toBeNull(); expect(emptyGeo?.user).toEqual({ id: "user-1", email: null, @@ -1118,9 +1118,9 @@ describe("search_issue_events", () => { }); it("should search events with direct query syntax (no agent)", async () => { - process.env.OPENAI_API_KEY = ""; - process.env.ANTHROPIC_API_KEY = ""; - process.env.OPENROUTER_API_KEY = ""; + process.env["OPENAI_API_KEY"] = ""; + process.env["ANTHROPIC_API_KEY"] = ""; + process.env["OPENROUTER_API_KEY"] = ""; mswServer.use( http.get( diff --git a/packages/mcp-core/src/tools/catalog/search-issue-events.ts b/packages/mcp-core/src/tools/catalog/search-issue-events.ts index ef922aa1a0..98a4719f3f 100644 --- a/packages/mcp-core/src/tools/catalog/search-issue-events.ts +++ b/packages/mcp-core/src/tools/catalog/search-issue-events.ts @@ -23,9 +23,9 @@ import { import { parseIssueParams } from "../support/search-issue-events/utils"; function buildIssueEventSearchRepairPrompt(params: { - query?: string; - sort?: string; - statsPeriod?: string; + query?: string | undefined; + sort?: string | undefined; + statsPeriod?: string | undefined; }): string { return [ "Fix this Sentry issue event search request.", diff --git a/packages/mcp-core/src/tools/catalog/search-issues.test.ts b/packages/mcp-core/src/tools/catalog/search-issues.test.ts index 87c94264fd..5fe5a8bea3 100644 --- a/packages/mcp-core/src/tools/catalog/search-issues.test.ts +++ b/packages/mcp-core/src/tools/catalog/search-issues.test.ts @@ -48,7 +48,7 @@ const mockOrganization = ( ({ request, params }) => HttpResponse.json({ id: "1", - slug: params.org, + slug: params["org"], name: "Test Org", ...(new URL(request.url).searchParams.get("include_feature_flags") === "1" @@ -114,8 +114,8 @@ describe("search_issues", () => { beforeEach(() => { vi.clearAllMocks(); - process.env.OPENAI_API_KEY = "test-key"; - process.env.OPENROUTER_API_KEY = ""; + process.env["OPENAI_API_KEY"] = "test-key"; + process.env["OPENROUTER_API_KEY"] = ""; mockGenerateText.mockResolvedValue(mockAIResponse()); // Seer translation stays off unless a test enables it. mswServer.use(mockOrganization([])); @@ -353,9 +353,9 @@ describe("search_issues", () => { }); it("should search issues with direct query syntax (no agent)", async () => { - process.env.OPENAI_API_KEY = ""; - process.env.ANTHROPIC_API_KEY = ""; - process.env.OPENROUTER_API_KEY = ""; + process.env["OPENAI_API_KEY"] = ""; + process.env["ANTHROPIC_API_KEY"] = ""; + process.env["OPENROUTER_API_KEY"] = ""; mswServer.use( http.get( @@ -411,9 +411,9 @@ describe("search_issues", () => { }); it("suggests only follow-ups the session can call", async () => { - process.env.OPENAI_API_KEY = ""; - process.env.ANTHROPIC_API_KEY = ""; - process.env.OPENROUTER_API_KEY = ""; + process.env["OPENAI_API_KEY"] = ""; + process.env["ANTHROPIC_API_KEY"] = ""; + process.env["OPENROUTER_API_KEY"] = ""; mswServer.use( http.get( @@ -541,9 +541,9 @@ describe("search_issues", () => { }); it("should handle project slug parameter", async () => { - process.env.OPENAI_API_KEY = ""; - process.env.ANTHROPIC_API_KEY = ""; - process.env.OPENROUTER_API_KEY = ""; + process.env["OPENAI_API_KEY"] = ""; + process.env["ANTHROPIC_API_KEY"] = ""; + process.env["OPENROUTER_API_KEY"] = ""; mswServer.use( http.get("https://sentry.io/api/0/projects/*/*/", ({ request }) => { @@ -784,9 +784,9 @@ describe("search_issues", () => { ])( "notes an untranslated natural-language query that finds nothing (no agent): %s", async (query, notes) => { - process.env.OPENAI_API_KEY = ""; - process.env.ANTHROPIC_API_KEY = ""; - process.env.OPENROUTER_API_KEY = ""; + process.env["OPENAI_API_KEY"] = ""; + process.env["ANTHROPIC_API_KEY"] = ""; + process.env["OPENROUTER_API_KEY"] = ""; mswServer.use( http.get("https://sentry.io/api/0/organizations/*/issues/", () => HttpResponse.json([]), @@ -934,9 +934,9 @@ describe("search_issues", () => { }); it("rewrites unsupported OR and parentheses before calling the API (no agent)", async () => { - process.env.OPENAI_API_KEY = ""; - process.env.ANTHROPIC_API_KEY = ""; - process.env.OPENROUTER_API_KEY = ""; + process.env["OPENAI_API_KEY"] = ""; + process.env["ANTHROPIC_API_KEY"] = ""; + process.env["OPENROUTER_API_KEY"] = ""; let sentQuery: string | null = null; mswServer.use( diff --git a/packages/mcp-core/src/tools/catalog/search-replays.structured.test.ts b/packages/mcp-core/src/tools/catalog/search-replays.structured.test.ts index 4c55fd7de5..9e4b9e11fe 100644 --- a/packages/mcp-core/src/tools/catalog/search-replays.structured.test.ts +++ b/packages/mcp-core/src/tools/catalog/search-replays.structured.test.ts @@ -205,7 +205,7 @@ describe("search_replays structured output", () => { const [replay] = structuredContent.replays; expect(replay?.isArchived).toBe(true); - expect(replay!.user).toBeNull(); + expect(replay?.user).toBeNull(); }); it("keeps the unknown-environment warning in notes", async () => { diff --git a/packages/mcp-core/src/tools/catalog/support/alerts.ts b/packages/mcp-core/src/tools/catalog/support/alerts.ts index 0d6b179fa8..7d0df35b37 100644 --- a/packages/mcp-core/src/tools/catalog/support/alerts.ts +++ b/packages/mcp-core/src/tools/catalog/support/alerts.ts @@ -16,7 +16,7 @@ export async function findExactIssueAlertRuleMatches( apiService: SentryApiService, params: { organizationSlug: string; - projectSlug?: string; + projectSlug?: string | undefined; ruleName: string; }, ): Promise { @@ -40,7 +40,7 @@ export async function resolveIssueAlertRule( apiService: SentryApiService, params: { organizationSlug: string; - projectSlug?: string; + projectSlug?: string | undefined; ruleIdOrName: string; }, ): Promise { @@ -64,11 +64,12 @@ export async function resolveIssueAlertRule( ruleName: params.ruleIdOrName, }); - if (matches.length === 1) { + const [match] = matches; + if (matches.length === 1 && match) { return await apiService.getIssueAlertRule({ organizationSlug: params.organizationSlug, projectSlug: params.projectSlug, - ruleId: matches[0]!.id, + ruleId: match.id, }); } if (matches.length > 1) { @@ -86,7 +87,7 @@ export async function resolveMetricAlertRule( apiService: SentryApiService, params: { organizationSlug: string; - projectSlug?: string; + projectSlug?: string | undefined; ruleIdOrName: string; }, ): Promise { @@ -117,14 +118,15 @@ export async function resolveMetricAlertRule( projectSlug, name: ruleIdOrName, }); - if (matches.length !== 1) { + const [match] = matches; + if (matches.length !== 1 || !match) { throw new UserInputError( matches.length > 1 ? `Multiple metric monitors named "${ruleIdOrName}" were found. Use find_metric_monitors and get_metric_monitor_details with a monitor ID.` : `Metric monitor "${ruleIdOrName}" was not found. Use find_metric_monitors to find its monitor ID.`, ); } - monitorId = matches[0]!.id; + monitorId = match.id; } return await getMetricMonitor(apiService, { organizationSlug, diff --git a/packages/mcp-core/src/tools/catalog/support/api-formatting.ts b/packages/mcp-core/src/tools/catalog/support/api-formatting.ts index 11fbca288b..810c36a8f0 100644 --- a/packages/mcp-core/src/tools/catalog/support/api-formatting.ts +++ b/packages/mcp-core/src/tools/catalog/support/api-formatting.ts @@ -28,24 +28,24 @@ export function formatActor(value: unknown): string { return "unknown"; } - const name = value.name; + const name = value["name"]; if (typeof name === "string" && name.trim()) { return name; } - const email = value.email; + const email = value["email"]; if (typeof email === "string" && email.trim()) { return email; } - const username = value.username; + const username = value["username"]; if (typeof username === "string" && username.trim()) { return username; } return formatId( - typeof value.id === "string" || typeof value.id === "number" - ? value.id + typeof value["id"] === "string" || typeof value["id"] === "number" + ? value["id"] : undefined, ); } diff --git a/packages/mcp-core/src/tools/catalog/support/project-constraints.ts b/packages/mcp-core/src/tools/catalog/support/project-constraints.ts index b533f63ea6..ff8e9b0a3d 100644 --- a/packages/mcp-core/src/tools/catalog/support/project-constraints.ts +++ b/packages/mcp-core/src/tools/catalog/support/project-constraints.ts @@ -1,7 +1,7 @@ import { UserInputError } from "../../../errors"; type ProjectRef = { - slug?: string | null; + slug?: string | null | undefined; }; function projectConstraintError(resourceLabel: string, projectSlug: string) { @@ -20,8 +20,8 @@ export function assertProjectRefWithinConstraint({ project, }: { resourceLabel: string; - scopedProjectSlug?: string | null; - project?: ProjectRef | null; + scopedProjectSlug?: string | null | undefined; + project?: ProjectRef | null | undefined; }): void { if (!scopedProjectSlug) { return; @@ -38,7 +38,7 @@ export function assertProjectListContainsConstraint({ projects, }: { resourceLabel: string; - scopedProjectSlug?: string | null; + scopedProjectSlug?: string | null | undefined; projects?: ProjectRef[] | null; }): void { if (!scopedProjectSlug) { @@ -60,7 +60,7 @@ export function assertProjectConstraintEvidence({ hasEvidence, }: { resourceLabel: string; - scopedProjectSlug?: string | null; + scopedProjectSlug?: string | null | undefined; hasEvidence: boolean; }): void { if (!scopedProjectSlug || hasEvidence) { diff --git a/packages/mcp-core/src/tools/catalog/support/uptime-monitors.ts b/packages/mcp-core/src/tools/catalog/support/uptime-monitors.ts index 6e99984360..458f07bd71 100644 --- a/packages/mcp-core/src/tools/catalog/support/uptime-monitors.ts +++ b/packages/mcp-core/src/tools/catalog/support/uptime-monitors.ts @@ -65,7 +65,9 @@ export const ParamUptimeHeaders = z export function toUptimeHeaderPairs( headers: string[][], ): Array<[string, string]> { - return headers.map(([name, value]) => [name!, value!]); + return headers.flatMap(([name, value]) => + name === undefined || value === undefined ? [] : [[name, value]], + ); } /** Owner actor for create/update. Empty/whitespace rejected. */ @@ -126,7 +128,8 @@ export function toUptimeHeadersForOutput( if (!Array.isArray(header) || header.length < 2) { continue; } - const [name, value] = header; + const entry: unknown[] = header; + const [name, value] = entry; if (typeof name !== "string" || typeof value !== "string") { continue; } @@ -204,6 +207,8 @@ export function toUptimeMonitorListItem( monitor: UptimeMonitor, webUrl: string, ): UptimeMonitorListItem { + const environment = optionalString(monitor.environment); + const owner = getUptimeOwnerName(monitor); return { id: String(monitor.id), name: monitor.name, @@ -213,12 +218,8 @@ export function toUptimeMonitorListItem( url: monitor.url, ...(monitor.method ? { method: monitor.method } : {}), intervalSeconds: monitor.intervalSeconds, - ...(optionalString(monitor.environment) - ? { environment: optionalString(monitor.environment) } - : {}), - ...(getUptimeOwnerName(monitor) - ? { owner: getUptimeOwnerName(monitor)! } - : {}), + ...(environment ? { environment } : {}), + ...(owner ? { owner } : {}), webUrl, }; } diff --git a/packages/mcp-core/src/tools/catalog/update-alert-rule.test.ts b/packages/mcp-core/src/tools/catalog/update-alert-rule.test.ts index d56079669e..026419b0db 100644 --- a/packages/mcp-core/src/tools/catalog/update-alert-rule.test.ts +++ b/packages/mcp-core/src/tools/catalog/update-alert-rule.test.ts @@ -1,6 +1,6 @@ import { mswServer } from "@sentry/mcp-server-mocks"; import { HttpResponse, http } from "msw"; -import { describe, expect, it } from "vitest"; +import { assert, describe, expect, it } from "vitest"; import { assertStructuredOnlyResult, getStructuredContent, @@ -115,8 +115,9 @@ describe("update_alert_rule", () => { it("reports when Sentry saves a Slack destination without resolving its channel ID", async () => { const { writes } = useAlertRuleHandlers(); const actionFilters = structuredClone(alertRule.actionFilters); - actionFilters[0]!.actions[0]!.config.targetDisplay = "#new-channel"; - actionFilters[0]!.actions[0]!.config.targetIdentifier = ""; + const slackConfig = first(first(actionFilters).actions).config; + slackConfig.targetDisplay = "#new-channel"; + slackConfig.targetIdentifier = ""; await expect(updateRule({ actionFilters })).rejects.toThrow( "The alert was saved, but Sentry did not resolve a Slack destination.", @@ -208,7 +209,8 @@ describe("update_alert_rule", () => { const actionFilters: Parameters< typeof updateAlertRule.handler >[0]["actionFilters"] = structuredClone(alertRule.actionFilters); - actionFilters[0]!.actions.push({ + const primaryGroup = first(actionFilters); + primaryGroup.actions.push({ id: "22", type: "email", integrationId: null, @@ -220,18 +222,19 @@ describe("update_alert_rule", () => { }, }); actionFilters.push({ - ...actionFilters[0]!, + ...primaryGroup, id: "30", actions: [{ ...slackAction, id: "31" }], }); - actionFilters[0]!.actions[0]!.config = { + const primaryAction = first(primaryGroup.actions); + primaryAction.config = { ...slackAction.config, targetDisplay, targetIdentifier: inputId, }; - actionFilters[0]!.actions[0]!.integrationId = integrationId; + primaryAction.integrationId = integrationId; const savedFilters = structuredClone(actionFilters); - savedFilters[0]!.actions[0]!.config.targetIdentifier = "CNEW"; + first(first(savedFilters).actions).config["targetIdentifier"] = "CNEW"; mswServer.use( http.put(endpoint, async ({ request }) => { writes.push((await request.json()) as Record); @@ -244,10 +247,11 @@ describe("update_alert_rule", () => { const result = await updateRule({ actionFilters }); const expectedFilters = structuredClone(actionFilters); - const expectedConfig: Record = - expectedFilters[0]!.actions[0]!.config; - if (expectedId === undefined) delete expectedConfig.targetIdentifier; - else expectedConfig.targetIdentifier = expectedId; + const expectedConfig: Record = first( + first(expectedFilters).actions, + ).config; + if (expectedId === undefined) delete expectedConfig["targetIdentifier"]; + else expectedConfig["targetIdentifier"] = expectedId; expect(writes).toEqual([ { name: alertRule.name, @@ -313,7 +317,7 @@ describe("update_alert_rule", () => { alertRule: { actionFilters: (typeof group)[] }; }>(await getAlertRule.handler({ ...params, kind: "issue" }, context)); const actionFilters = inspected.actionFilters; - actionFilters[0]!.actions[0]!.config = action.config; + first(first(actionFilters).actions).config = action.config; // Teams always resolves the supplied name, replacing even an old channel ID. const savedAction = type === "msteams" @@ -389,9 +393,12 @@ describe("update_alert_rule", () => { triggers: { ...changes.triggers, logicType: "all" }, actionFilters: [ { - ...changes.actionFilters[0], + ...first(changes.actionFilters), conditions: [ - { ...changes.actionFilters[0]!.conditions[0], comparison: 25 }, + { + ...first(first(changes.actionFilters).conditions), + comparison: 25, + }, ], }, ], @@ -443,7 +450,11 @@ describe("update_alert_rule", () => { ); }), http.get(`${detectorsEndpoint}:id/`, ({ params: path }) => - HttpResponse.json({ ...detector, id: path.id, type: "metric_issue" }), + HttpResponse.json({ + ...detector, + id: path["id"], + type: "metric_issue", + }), ), ); @@ -592,7 +603,7 @@ describe("update_alert_rule", () => { useProjectScope(["100"]); mswServer.use( http.get(`${detectorsEndpoint}:id/`, ({ params: path }) => - HttpResponse.json({ ...detector, id: path.id, projectId }), + HttpResponse.json({ ...detector, id: path["id"], projectId }), ), ); @@ -729,3 +740,9 @@ describe("update_alert_rule", () => { expect(writes).toEqual([]); }); }); + +function first(items: readonly T[]): T { + const [item] = items; + assert(item !== undefined, "Expected a non-empty fixture array"); + return item; +} diff --git a/packages/mcp-core/src/tools/catalog/update-alert-rule.ts b/packages/mcp-core/src/tools/catalog/update-alert-rule.ts index a4f84021ce..7e7b403ccf 100644 --- a/packages/mcp-core/src/tools/catalog/update-alert-rule.ts +++ b/packages/mcp-core/src/tools/catalog/update-alert-rule.ts @@ -43,30 +43,35 @@ function resolveChangedSlackDestinations( current: IssueAlertRule, ): z.infer { const previousActions = (current.actionFilters ?? []).flatMap((group) => - Array.isArray(group.actions) ? group.actions.filter(isPlainObject) : [], + Array.isArray(group["actions"]) + ? group["actions"].filter(isPlainObject) + : [], ); return groups.map((group) => ({ ...group, actions: group.actions.map((action) => { const previous = previousActions.find( (candidate) => - action.id !== undefined && String(candidate.id) === String(action.id), + action.id !== undefined && + String(candidate["id"]) === String(action.id), ); if ( action.type !== "slack" || !previous || - !isPlainObject(previous.config) || - typeof action.config.targetDisplay !== "string" || - action.config.targetDisplay.length === 0 || - (action.config.targetDisplay === previous.config.targetDisplay && - String(action.integrationId) === String(previous.integrationId)) || - action.config.targetIdentifier !== previous.config.targetIdentifier + !isPlainObject(previous["config"]) || + typeof action.config["targetDisplay"] !== "string" || + action.config["targetDisplay"].length === 0 || + (action.config["targetDisplay"] === + previous["config"]["targetDisplay"] && + String(action.integrationId) === String(previous["integrationId"])) || + action.config["targetIdentifier"] !== + previous["config"]["targetIdentifier"] ) { return action; } // Slack validates a supplied ID against the name and workspace; discard a copied stale ID. const config = { ...action.config }; - delete config.targetIdentifier; + delete config["targetIdentifier"]; return { ...action, config }; }), })); @@ -174,12 +179,13 @@ export default defineTool({ "The alert name cannot be resolved unambiguously. Retry with the numeric workflow ID from get_alert_rule.", ); } - if (matches.length === 0) { + const [match] = matches; + if (!match) { throw new UserInputError( `Alert rule "${ruleId}" was not found${projectSlug ? ` in project ${projectSlug}` : ""}.`, ); } - ruleId = String(matches[0]!.id); + ruleId = String(match.id); } const current = await apiService.getIssueAlertRule({ organizationSlug, diff --git a/packages/mcp-core/src/tools/catalog/update-dsn.test.ts b/packages/mcp-core/src/tools/catalog/update-dsn.test.ts index 935d62720d..def0887311 100644 --- a/packages/mcp-core/src/tools/catalog/update-dsn.test.ts +++ b/packages/mcp-core/src/tools/catalog/update-dsn.test.ts @@ -113,7 +113,7 @@ describe("update_dsn", () => { ({ params }) => HttpResponse.json( { - id: String(params.keyId), + id: String(params["keyId"]), name: "Default", dsn: { public: diff --git a/packages/mcp-core/src/tools/catalog/update-dsn.ts b/packages/mcp-core/src/tools/catalog/update-dsn.ts index 11a41defdb..bed3e7b603 100644 --- a/packages/mcp-core/src/tools/catalog/update-dsn.ts +++ b/packages/mcp-core/src/tools/catalog/update-dsn.ts @@ -11,6 +11,7 @@ import { import { setTargetTagsAndAttributes } from "../../telem/scope"; import type { ServerContext } from "../../types"; import { validateResourceId } from "../../utils/slug-validation"; +import { omitUndefined } from "../../internal/type-guards"; export const updateDsnOutputSchema = z.object({ dsn: z.object({ @@ -213,16 +214,18 @@ export default defineTool({ params.loaderHasLogsAndMetrics; } - const clientKey = await apiService.updateClientKey({ - organizationSlug, - projectSlug: params.projectSlug, - keyId: params.keyId, - name: params.name, - isActive: params.isActive, - rateLimit, - browserSdkVersion: params.browserSdkVersion, - dynamicSdkLoaderOptions, - }); + const clientKey = await apiService.updateClientKey( + omitUndefined({ + organizationSlug, + projectSlug: params.projectSlug, + keyId: params.keyId, + name: params.name, + isActive: params.isActive, + rateLimit, + browserSdkVersion: params.browserSdkVersion, + dynamicSdkLoaderOptions, + }), + ); const { rateLimit: appliedRateLimit, dynamicSdkLoaderOptions: loader } = clientKey; diff --git a/packages/mcp-core/src/tools/catalog/update-issue.test.ts b/packages/mcp-core/src/tools/catalog/update-issue.test.ts index b412463860..b5a63c5ce8 100644 --- a/packages/mcp-core/src/tools/catalog/update-issue.test.ts +++ b/packages/mcp-core/src/tools/catalog/update-issue.test.ts @@ -20,7 +20,13 @@ vi.mock("../../telem/logging", () => ({ logWarn: vi.fn(), })); -type MockIssue = typeof issueFixture; +/** + * The issue fixture. Tests swap `assignedTo` for any shape the API accepts or + * returns, including request-body echoes. + */ +type MockIssue = Omit & { + assignedTo: unknown; +}; function structured(result: unknown) { assertStructuredOnlyResult(result); @@ -28,9 +34,7 @@ function structured(result: unknown) { } const serverContext = { - constraints: { - organizationSlug: undefined, - }, + constraints: {}, accessToken: "access-token", userId: "1", }; @@ -1248,7 +1252,8 @@ describe("update_issue", () => { lastRequestBody = (await request.json()) as Record; currentIssue = { ...currentIssue, - assignedTo: lastRequestBody.assignedTo ?? currentIssue.assignedTo, + assignedTo: + lastRequestBody["assignedTo"] ?? currentIssue.assignedTo, }; return HttpResponse.json(currentIssue); }, @@ -1302,8 +1307,8 @@ describe("update_issue", () => { ...currentIssue, status: "ignored", statusDetails: { - ignoreCount: lastRequestBody.ignoreCount, - ignoreWindow: lastRequestBody.ignoreWindow, + ignoreCount: lastRequestBody["ignoreCount"], + ignoreWindow: lastRequestBody["ignoreWindow"], }, }; return HttpResponse.json(currentIssue); @@ -1935,7 +1940,7 @@ describe("update_issue", () => { }, context: serverContext, }); - expect(prepared.reason).toBe("Resolvedbecausefix deployed"); + expect(prepared["reason"]).toBe("Resolvedbecausefix deployed"); }); it.each(["\0", " \0 \0 "])( diff --git a/packages/mcp-core/src/tools/catalog/update-issue.ts b/packages/mcp-core/src/tools/catalog/update-issue.ts index a60b916824..4b5945fbb3 100644 --- a/packages/mcp-core/src/tools/catalog/update-issue.ts +++ b/packages/mcp-core/src/tools/catalog/update-issue.ts @@ -61,9 +61,9 @@ type IgnoreUpdate = { | "archived_until_condition_met"; ignoreDuration?: number; ignoreCount?: number; - ignoreWindow?: number; + ignoreWindow?: number | undefined; ignoreUserCount?: number; - ignoreUserWindow?: number; + ignoreUserWindow?: number | undefined; behavior: string; message: string; }; @@ -86,13 +86,13 @@ type IssueStatusDisplay = | (string & {}); type IgnoreParams = { - status?: string; - ignoreMode?: IgnoreMode; - ignoreDurationMinutes?: number; - ignoreCount?: number; - ignoreWindowMinutes?: number; - ignoreUserCount?: number; - ignoreUserWindowMinutes?: number; + status?: string | undefined; + ignoreMode?: IgnoreMode | undefined; + ignoreDurationMinutes?: number | undefined; + ignoreCount?: number | undefined; + ignoreWindowMinutes?: number | undefined; + ignoreUserCount?: number | undefined; + ignoreUserWindowMinutes?: number | undefined; }; function pluralize(value: number, noun: string): string { @@ -137,7 +137,7 @@ function inferIgnoreMode(params: IgnoreParams): IgnoreMode { } function getIssueStatusDetails(issue: Issue): Record { - const statusDetails = issue.statusDetails; + const statusDetails = issue["statusDetails"]; if ( statusDetails && @@ -183,7 +183,7 @@ function getResolvedCommitId( ): string | undefined { const commit = statusDetails[key]; if (commit && typeof commit === "object" && !Array.isArray(commit)) { - const id = (commit as Record).id; + const id = (commit as Record)["id"]; if (typeof id === "string" && id.length > 0) { return id; } @@ -205,7 +205,7 @@ function getIssueStatusDisplay(issue: Issue): IssueStatusDisplay { const statusDetails = getIssueStatusDetails(issue); if (issue.status === "resolved") { - if (statusDetails.inNextRelease === true) { + if (statusDetails["inNextRelease"] === true) { return "resolvedInNextRelease"; } if (getStatusDetailString(statusDetails, "inRelease")) { @@ -220,10 +220,10 @@ function getIssueStatusDisplay(issue: Issue): IssueStatusDisplay { } type ResolutionParams = { - status?: string; - inRelease?: string; - inCommit?: string; - inCommitRepository?: string; + status?: string | undefined; + inRelease?: string | undefined; + inCommit?: string | undefined; + inCommitRepository?: string | undefined; }; function buildResolution( @@ -260,13 +260,17 @@ function buildResolution( return { inRelease: params.inRelease }; } - if (params.inCommitRepository === undefined) { + // With `inRelease` unset, the checks above guarantee `inCommit` is set. + if ( + params.inCommit === undefined || + params.inCommitRepository === undefined + ) { throw new UserInputError("`inCommit` requires `inCommitRepository`"); } return { inCommit: { - commit: params.inCommit!, + commit: params.inCommit, repository: params.inCommitRepository, }, }; @@ -447,7 +451,7 @@ function getIgnoreState( if ( issue.substatus === "archived_until_escalating" || - statusDetails.ignoreUntilEscalating === true + statusDetails["ignoreUntilEscalating"] === true ) { return { family: "untilEscalating", @@ -815,9 +819,9 @@ function buildIgnoreUpdate( ? `The issue is now ignored until it affects ${pluralize(params.ignoreUserCount, "more user")}` : `The issue is now ignored until it affects ${pluralize(params.ignoreUserCount, "user")} in ${pluralize(params.ignoreUserWindowMinutes, "minute")}`, }; + default: + throw new UserInputError("Unsupported ignore mode"); } - - throw new UserInputError("Unsupported ignore mode"); } type ReasonCommentResult = diff --git a/packages/mcp-core/src/tools/catalog/update-metric-monitor.test.ts b/packages/mcp-core/src/tools/catalog/update-metric-monitor.test.ts index f07df357c8..3d820fb556 100644 --- a/packages/mcp-core/src/tools/catalog/update-metric-monitor.test.ts +++ b/packages/mcp-core/src/tools/catalog/update-metric-monitor.test.ts @@ -1,6 +1,6 @@ import { mswServer } from "@sentry/mcp-server-mocks"; import { HttpResponse, http } from "msw"; -import { describe, expect, it } from "vitest"; +import { assert, describe, expect, it } from "vitest"; import { UserInputError } from "../../errors"; import { createTestContext } from "../../test-utils/context"; import { metricMonitor } from "../../test-utils/metric-monitor"; @@ -188,8 +188,10 @@ describe("update_metric_monitor", () => { query: "", environment: null, }; - const source = structuredClone(metricMonitor.dataSources[0]); - Object.assign(source!.queryObj.snubaQuery, { + const [fixtureSource] = metricMonitor.dataSources; + assert(fixtureSource, "Expected a fixture data source"); + const source = structuredClone(fixtureSource); + Object.assign(source.queryObj.snubaQuery, { ...query, timeWindow: 7200, query: "release:previous", diff --git a/packages/mcp-core/src/tools/catalog/update-uptime-monitor.ts b/packages/mcp-core/src/tools/catalog/update-uptime-monitor.ts index 93f8070439..5bcc8649f7 100644 --- a/packages/mcp-core/src/tools/catalog/update-uptime-monitor.ts +++ b/packages/mcp-core/src/tools/catalog/update-uptime-monitor.ts @@ -23,6 +23,7 @@ import { toUptimeMonitorSummary, uptimeMonitorSummarySchema, } from "./support/uptime-monitors"; +import { omitUndefined } from "../../internal/type-guards"; export const updateUptimeMonitorOutputSchema = z.object({ monitor: uptimeMonitorSummarySchema, @@ -139,25 +140,27 @@ export default defineTool({ } const monitor = await apiService - .updateUptimeMonitor({ - organizationSlug, - projectSlug: params.projectSlug, - uptimeMonitorId: params.uptimeMonitorId, - name: params.name, - url: params.url, - intervalSeconds: params.intervalSeconds, - timeoutMs: params.timeoutMs, - method: params.method, - headers: params.headers && toUptimeHeaderPairs(params.headers), - body: params.body, - status: params.status, - owner: params.owner, - environment: params.environment, - traceSampling: params.traceSampling, - responseCaptureEnabled: params.responseCaptureEnabled, - recoveryThreshold: params.recoveryThreshold, - downtimeThreshold: params.downtimeThreshold, - }) + .updateUptimeMonitor( + omitUndefined({ + organizationSlug, + projectSlug: params.projectSlug, + uptimeMonitorId: params.uptimeMonitorId, + name: params.name, + url: params.url, + intervalSeconds: params.intervalSeconds, + timeoutMs: params.timeoutMs, + method: params.method, + headers: params.headers && toUptimeHeaderPairs(params.headers), + body: params.body, + status: params.status, + owner: params.owner, + environment: params.environment, + traceSampling: params.traceSampling, + responseCaptureEnabled: params.responseCaptureEnabled, + recoveryThreshold: params.recoveryThreshold, + downtimeThreshold: params.downtimeThreshold, + }), + ) .catch((error: unknown) => { const reason = params.status === "active" && getSeatErrorReason(error); if (reason) { diff --git a/packages/mcp-core/src/tools/catalog/whoami.ts b/packages/mcp-core/src/tools/catalog/whoami.ts index f32303aa51..1fe9857bea 100644 --- a/packages/mcp-core/src/tools/catalog/whoami.ts +++ b/packages/mcp-core/src/tools/catalog/whoami.ts @@ -53,7 +53,7 @@ export default defineTool({ destructiveHint: false, openWorldHint: true, }, - async handler(params, context: ServerContext) { + async handler(_params, context: ServerContext) { // User data endpoints (like /auth/) should never use regionUrl // as they must always query the main API server, not region-specific servers // API client will throw ApiClientError/ApiServerError which the MCP server wrapper handles @@ -68,7 +68,10 @@ export default defineTool({ ) ).map(({ value }) => value) : [toUser(await apiServiceFromContext(context).getAuthenticatedUser())]; - const user = users[0]!; + const [user] = users; + if (!user) { + throw new Error("Expected at least one authenticated user."); + } const constraints = context.constraints; const sessionConstraints = diff --git a/packages/mcp-core/src/tools/index.ts b/packages/mcp-core/src/tools/index.ts index 1c897d26af..b7bbe05389 100644 --- a/packages/mcp-core/src/tools/index.ts +++ b/packages/mcp-core/src/tools/index.ts @@ -3,7 +3,7 @@ import { createSearchToolsTool } from "./special/search-tools"; import { createExecuteTool } from "./special/execute-tool"; import type { ToolConfig } from "./types"; -type ToolRegistry = Record>; +type ToolRegistry = Record; function getAllTools(): ToolRegistry { return allTools; diff --git a/packages/mcp-core/src/tools/special/execute-tool.ts b/packages/mcp-core/src/tools/special/execute-tool.ts index bd21ac79ce..b2af2aadd2 100644 --- a/packages/mcp-core/src/tools/special/execute-tool.ts +++ b/packages/mcp-core/src/tools/special/execute-tool.ts @@ -45,7 +45,7 @@ async function executeCatalogToolWithSpan({ params, context, }: { - tool: ToolConfig; + tool: ToolConfig; params: Record; context: ServerContext; }) { diff --git a/packages/mcp-core/src/tools/support/alert-rule-config.ts b/packages/mcp-core/src/tools/support/alert-rule-config.ts index ff5cc3b183..c987efc37c 100644 --- a/packages/mcp-core/src/tools/support/alert-rule-config.ts +++ b/packages/mcp-core/src/tools/support/alert-rule-config.ts @@ -144,8 +144,8 @@ export function assertResolvedAlertDestinations( group.actions.some( (action) => action.type === "slack" && - (typeof action.config.targetIdentifier !== "string" || - action.config.targetIdentifier.length === 0), + (typeof action.config["targetIdentifier"] !== "string" || + action.config["targetIdentifier"].length === 0), ), ) ) { diff --git a/packages/mcp-core/src/tools/support/alert-rule-connections.ts b/packages/mcp-core/src/tools/support/alert-rule-connections.ts index f318f9f53f..5b9cc9b54a 100644 --- a/packages/mcp-core/src/tools/support/alert-rule-connections.ts +++ b/packages/mcp-core/src/tools/support/alert-rule-connections.ts @@ -13,8 +13,8 @@ export async function validateAlertRuleProjectScope( params: { organizationSlug: string; ruleId: string; - projectSlug?: string | null; - scopedProjectSlug?: string | null; + projectSlug?: string | null | undefined; + scopedProjectSlug?: string | null | undefined; }, ): Promise<{ id: string; slug: string } | undefined> { if (params.projectSlug) { @@ -61,11 +61,11 @@ export async function resolveAlertRuleConnections( params: { organizationSlug: string; currentDetectorIds: readonly (string | number)[]; - addProjectSlugs?: readonly string[]; - removeProjectSlugs?: readonly string[]; - addDetectorIds?: readonly string[]; - removeDetectorIds?: readonly string[]; - scopedProject?: { id: string; slug: string }; + addProjectSlugs?: readonly string[] | undefined; + removeProjectSlugs?: readonly string[] | undefined; + addDetectorIds?: readonly string[] | undefined; + removeDetectorIds?: readonly string[] | undefined; + scopedProject?: { id: string; slug: string } | undefined; }, ): Promise { const additions = new Set(); diff --git a/packages/mcp-core/src/tools/support/alert-rule-details.ts b/packages/mcp-core/src/tools/support/alert-rule-details.ts index 7b9dd8c6d9..7622728454 100644 --- a/packages/mcp-core/src/tools/support/alert-rule-details.ts +++ b/packages/mcp-core/src/tools/support/alert-rule-details.ts @@ -171,8 +171,8 @@ function toDetectorConfig( function sourceDetails( source: Record, ): z.infer { - const type = typeof source.type === "string" ? source.type : "unknown"; - const query = source.queryObj; + const type = typeof source["type"] === "string" ? source["type"] : "unknown"; + const query = source["queryObj"]; const unavailable = { type, unavailableReason: "Source configuration is unavailable.", diff --git a/packages/mcp-core/src/tools/support/dashboards/index.ts b/packages/mcp-core/src/tools/support/dashboards/index.ts index def89bf5a8..dfecac0780 100644 --- a/packages/mcp-core/src/tools/support/dashboards/index.ts +++ b/packages/mcp-core/src/tools/support/dashboards/index.ts @@ -49,7 +49,7 @@ export async function resolveDashboardProjectConstraint({ }: { apiService: SentryApiService; organizationSlug: string; - scopedProjectSlug?: string | null; + scopedProjectSlug?: string | null | undefined; }): Promise { if (!scopedProjectSlug) { return null; @@ -67,7 +67,7 @@ export function filterDashboardsByProjectConstraint({ projectId, }: { dashboards: DashboardListItem[]; - projectId?: string | number | null; + projectId?: string | number | null | undefined; }): DashboardListItem[] { return dashboards.filter((dashboard) => dashboardIncludesProject(dashboard, projectId ?? null), @@ -81,8 +81,8 @@ export function assertDashboardWithinProjectConstraint({ projectId, }: { dashboard: Dashboard; - scopedProjectSlug?: string | null; - projectId?: string | number | null; + scopedProjectSlug?: string | null | undefined; + projectId?: string | number | null | undefined; }): void { if ( scopedProjectSlug && @@ -245,18 +245,18 @@ function toWidget( function toFilters( filters: Record, ): DashboardDetails["filters"] { - const globalFilters = Array.isArray(filters.globalFilter) - ? filters.globalFilter.filter(isPlainObject).map((filter) => ({ + const globalFilters = Array.isArray(filters["globalFilter"]) + ? filters["globalFilter"].filter(isPlainObject).map((filter) => ({ dataset: readString(filter, "dataset"), - tagKey: isPlainObject(filter.tag) - ? readString(filter.tag, "key") + tagKey: isPlainObject(filter["tag"]) + ? readString(filter["tag"], "key") : null, value: readString(filter, "value"), })) : []; return { - releases: readStringArray(filters.release), - releaseIds: readStringArray(filters.releaseId), + releases: readStringArray(filters["release"]), + releaseIds: readStringArray(filters["releaseId"]), globalFilters, }; } @@ -315,7 +315,7 @@ export async function resolveDashboardId({ apiService: SentryApiService; organizationSlug: string; dashboardIdOrTitle: string; - projectId?: string | number | null; + projectId?: string | number | null | undefined; }): Promise { const ref = dashboardIdOrTitle.trim(); if (isNumericId(ref)) { @@ -339,8 +339,9 @@ export async function resolveDashboardId({ (dashboard) => dashboard.title.toLowerCase() === ref.toLowerCase(), ); - if (exactMatches.length === 1) { - return String(exactMatches[0]!.id); + const [exactMatch] = exactMatches; + if (exactMatches.length === 1 && exactMatch) { + return String(exactMatch.id); } if (exactMatches.length > 1) { diff --git a/packages/mcp-core/src/tools/support/detector-details.ts b/packages/mcp-core/src/tools/support/detector-details.ts index ba01bd2112..a1007fbe4e 100644 --- a/packages/mcp-core/src/tools/support/detector-details.ts +++ b/packages/mcp-core/src/tools/support/detector-details.ts @@ -31,12 +31,12 @@ export const metricQueryDetailsSchema = metricQuerySchema /** Project the metric query without subscription or backend identifiers. */ export function getMetricQuery(source: Record) { if ( - source.type !== "snuba_query_subscription" || - !isPlainObject(source.queryObj) + source["type"] !== "snuba_query_subscription" || + !isPlainObject(source["queryObj"]) ) { return null; } - const parsed = metricQuerySchema.safeParse(source.queryObj.snubaQuery); + const parsed = metricQuerySchema.safeParse(source["queryObj"]["snubaQuery"]); if (!parsed.success) return null; const { timeWindow, ...query } = parsed.data; return { ...query, timeWindowSeconds: timeWindow }; diff --git a/packages/mcp-core/src/tools/support/event-stacktrace.ts b/packages/mcp-core/src/tools/support/event-stacktrace.ts index 6f7873e824..3e82438cbd 100644 --- a/packages/mcp-core/src/tools/support/event-stacktrace.ts +++ b/packages/mcp-core/src/tools/support/event-stacktrace.ts @@ -75,7 +75,7 @@ export async function fetchEventStacktrace({ organizationSlug: string; issueId: string; eventId: string; - thread?: string | number; + thread?: string | number | undefined; }): Promise { const event = await apiService.getEventForIssue({ organizationSlug, @@ -138,7 +138,9 @@ function selectThread( ): SelectedThread { if (selector === undefined) { const selected = selectSentryDefaultThread(threads); - return { kind: "selected", thread: selected }; + return selected + ? { kind: "selected", thread: selected } + : { kind: "not_found", message: "No threads were found." }; } if (typeof selector === "number") { @@ -177,14 +179,14 @@ function selectThread( // Mirrors Sentry's thread UI default: crashed first, otherwise a thread with a // stacktrace, otherwise the first available thread. -function selectSentryDefaultThread(threads: Thread[]): Thread { +function selectSentryDefaultThread(threads: Thread[]): Thread | undefined { const sortedThreads = [...threads].sort( (a, b) => Number(Boolean(b.crashed)) - Number(Boolean(a.crashed)), ); return ( sortedThreads.find((thread) => thread.crashed) ?? sortedThreads.find((thread) => hasFrames(thread)) ?? - sortedThreads[0]! + sortedThreads[0] ); } @@ -199,8 +201,9 @@ function selectUnique( ambiguousMessage: string, ): SelectedThread { const matches = threads.filter(predicate); + const [match] = matches; - if (matches.length === 0) { + if (!match) { return { kind: "not_found", message: notFoundMessage }; } @@ -208,5 +211,5 @@ function selectUnique( return { kind: "ambiguous", message: ambiguousMessage }; } - return { kind: "selected", thread: matches[0]! }; + return { kind: "selected", thread: match }; } diff --git a/packages/mcp-core/src/tools/support/issue-event-payload.ts b/packages/mcp-core/src/tools/support/issue-event-payload.ts index ac9b7851b3..72f5395faa 100644 --- a/packages/mcp-core/src/tools/support/issue-event-payload.ts +++ b/packages/mcp-core/src/tools/support/issue-event-payload.ts @@ -202,8 +202,8 @@ export function getEventTimestamp(event: Event): Date | null { function mapMessage(event: Event): string | null { const data = record(findEntry(event, "message")?.data); return ( - nonEmptyString(data?.formatted) ?? - nonEmptyString(data?.message) ?? + nonEmptyString(data?.["formatted"]) ?? + nonEmptyString(data?.["message"]) ?? nonEmptyString(event.message) ); } @@ -268,8 +268,8 @@ function mapThreads(event: Event, hasExceptions: boolean) { function mapRequest(event: Event): IssueEventPayload["request"] { const data = record(findEntry(event, "request")?.data); - const method = nonEmptyString(data?.method); - const url = nonEmptyString(data?.url); + const method = nonEmptyString(data?.["method"]); + const url = nonEmptyString(data?.["url"]); return method || url ? { method, url } : null; } @@ -279,14 +279,15 @@ function mapCsp(event: Event): IssueEventPayload["csp"] { return null; } return { - blockedUri: nonEmptyString(data.blocked_uri), - violatedDirective: nonEmptyString(data.violated_directive), - effectiveDirective: nonEmptyString(data.effective_directive), - documentUri: nonEmptyString(data.document_uri), - sourceFile: nonEmptyString(data.source_file), - lineNumber: typeof data.line_number === "number" ? data.line_number : null, - disposition: nonEmptyString(data.disposition), - originalPolicy: nonEmptyString(data.original_policy), + blockedUri: nonEmptyString(data["blocked_uri"]), + violatedDirective: nonEmptyString(data["violated_directive"]), + effectiveDirective: nonEmptyString(data["effective_directive"]), + documentUri: nonEmptyString(data["document_uri"]), + sourceFile: nonEmptyString(data["source_file"]), + lineNumber: + typeof data["line_number"] === "number" ? data["line_number"] : null, + disposition: nonEmptyString(data["disposition"]), + originalPolicy: nonEmptyString(data["original_policy"]), }; } @@ -300,17 +301,17 @@ function getOccurrence(event: Event): Record | undefined { function mapEvidence( occurrence: Record | undefined, ): IssueEventPayload["evidence"] { - const display = occurrence?.evidenceDisplay; + const display = occurrence?.["evidenceDisplay"]; if (!Array.isArray(display)) { return null; } // the markdown shows only the items Sentry marks important const items = display .map(record) - .filter((item) => item?.important === true) + .filter((item) => item?.["important"] === true) .flatMap((item) => { - const name = nonEmptyString(item?.name); - const value = nonEmptyString(item?.value); + const name = nonEmptyString(item?.["name"]); + const value = nonEmptyString(item?.["value"]); return name && value ? [{ name, value }] : []; }); return items.length > 0 ? items : null; @@ -351,12 +352,12 @@ function mapPerformance( return null; } const issueType = - typeof occurrence.type === "number" - ? (OCCURRENCE_TYPE_TO_ISSUE_TYPE[occurrence.type] ?? null) - : (nonEmptyString(occurrence.issueType) ?? - nonEmptyString(occurrence.type)); + typeof occurrence["type"] === "number" + ? (OCCURRENCE_TYPE_TO_ISSUE_TYPE[occurrence["type"]] ?? null) + : (nonEmptyString(occurrence["issueType"]) ?? + nonEmptyString(occurrence["type"])); const evidenceData: N1EvidenceData | undefined = record( - occurrence.evidenceData, + occurrence["evidenceData"], ); const isN1 = issueType != null && N1_ISSUE_TYPES.has(issueType); const repeatCount = @@ -429,27 +430,27 @@ function mapUser(event: Event): IssueEventPayload["user"] { if (!user) { return null; } - const geo = record(user.geo); + const geo = record(user["geo"]); const mappedGeo = geo ? { - countryCode: nonEmptyString(geo.country_code), - city: nonEmptyString(geo.city), - region: nonEmptyString(geo.region), + countryCode: nonEmptyString(geo["country_code"]), + city: nonEmptyString(geo["city"]), + region: nonEmptyString(geo["region"]), } : null; const mapped = { - id: nonEmptyString(user.id), - email: nonEmptyString(user.email), - username: nonEmptyString(user.username), + id: nonEmptyString(user["id"]), + email: nonEmptyString(user["email"]), + username: nonEmptyString(user["username"]), // Sentry's user interface serializes `ip_address` and `name`; some // payloads carry the `ip` / `display_name` aliases instead. - ipAddress: nonEmptyString(user.ip_address) ?? nonEmptyString(user.ip), - name: nonEmptyString(user.name) ?? nonEmptyString(user.display_name), + ipAddress: nonEmptyString(user["ip_address"]) ?? nonEmptyString(user["ip"]), + name: nonEmptyString(user["name"]) ?? nonEmptyString(user["display_name"]), geo: mappedGeo && Object.values(mappedGeo).some((value) => value !== null) ? mappedGeo : null, - data: compactMap(user.data), + data: compactMap(user["data"]), }; return Object.values(mapped).some((value) => value !== null) ? mapped : null; } @@ -474,8 +475,8 @@ export function buildIssueEventPayload({ packageNames, }: { event: Event; - performanceTrace?: Trace; - packageNames?: string[]; + performanceTrace?: Trace | undefined; + packageNames?: string[] | undefined; }): IssueEventPayload { // replays are reported beside the event, not inside its contexts and tags const stripped = stripReplayMetadata(event); diff --git a/packages/mcp-core/src/tools/support/issue-linking/app.ts b/packages/mcp-core/src/tools/support/issue-linking/app.ts index c4ab9724d6..bac222abc2 100644 --- a/packages/mcp-core/src/tools/support/issue-linking/app.ts +++ b/packages/mcp-core/src/tools/support/issue-linking/app.ts @@ -11,8 +11,8 @@ export type AppIssueLinkParams = { issueId: string; projectId?: string; externalIssueUrl: string; - appSlug?: string; - fields?: FormValues; + appSlug?: string | undefined; + fields?: FormValues | undefined; }; type AppIssueLinkApi = Pick< SentryApiService, @@ -59,9 +59,11 @@ function isIssueKey(value: string, key: string): boolean { } function choiceLabelKey(label: string | number): string { - return String(label) - .toUpperCase() - .split(/[^A-Z0-9-]+/)[0]!; + return ( + String(label) + .toUpperCase() + .split(/[^A-Z0-9-]+/)[0] ?? "" + ); } function parseTarget(raw: string) { @@ -185,7 +187,11 @@ async function resolveFields( while (pending.size > 0) { let progressed = false; for (const name of pending) { - const field = fields.get(name)!; + const field = fields.get(name); + if (!field) + throw new UserInputError( + `The App's link form references unknown field '${name}'.`, + ); const dependencies = field.depends_on ?? []; if (dependencies.some((dependency) => pending.has(dependency))) continue; if (field.multiple) @@ -215,10 +221,12 @@ async function resolveFields( projectId: params.projectId, dependentData: dependencies.length ? Object.fromEntries( - dependencies.map((dependency) => [ - dependency, - values[dependency], - ]), + dependencies.flatMap((dependency) => { + const dependencyValue = values[dependency]; + return dependencyValue === undefined + ? [] + : [[dependency, dependencyValue] as const]; + }), ) : undefined, }); @@ -235,13 +243,14 @@ async function resolveFields( choiceLabelKey(label) === key && (value === undefined || String(choiceValue) === String(value))), ); - if (matches.length !== 1) { + const [match] = matches; + if (matches.length !== 1 || !match) { throw new UserInputError( `Provide an unambiguous value for App link field '${name}' in fields.`, ); } if (targetKey) { - const [selectedValue, selectedLabel] = matches[0]!; + const [selectedValue, selectedLabel] = match; const valueKey = String(selectedValue).toUpperCase(); const labelKey = choiceLabelKey(selectedLabel); const identifiedChoices = choices.filter( @@ -263,7 +272,7 @@ async function resolveFields( ); } } - value = matches[0]![0]; + value = match[0]; } else { value ??= search; if ( @@ -317,9 +326,9 @@ export async function linkAppIssue( (installation) => installation.app.slug === appSlug && installation.status === "installed", ); - if (installed.length !== 1) + const [installation] = installed; + if (installed.length !== 1 || !installation) throw new UserInputError(`Expected one installed Sentry App '${appSlug}'.`); - const installation = installed[0]!; const matchingComponents = components.filter( (component) => component.type === "issue-link" && @@ -329,7 +338,7 @@ export async function linkAppIssue( ); const component = matchingComponents.length === 1 ? matchingComponents[0] : undefined; - const parsed = LinkFormSchema.safeParse(component?.schema.link); + const parsed = LinkFormSchema.safeParse(component?.schema["link"]); if (!component || component.error || !parsed.success) { throw new UserInputError( `Sentry App '${appSlug}' has no usable existing-issue link form.`, diff --git a/packages/mcp-core/src/tools/support/issue-linking/index.test.ts b/packages/mcp-core/src/tools/support/issue-linking/index.test.ts index abfd61ac64..03b1f8f7b0 100644 --- a/packages/mcp-core/src/tools/support/issue-linking/index.test.ts +++ b/packages/mcp-core/src/tools/support/issue-linking/index.test.ts @@ -113,7 +113,7 @@ function usePut(status = 201) { `${endpoint}:integrationId/`, async ({ request, params: route }) => { const body = await request.json(); - writes.push({ integrationId: String(route.integrationId), body }); + writes.push({ integrationId: String(route["integrationId"]), body }); return HttpResponse.json( { id: "900", diff --git a/packages/mcp-core/src/tools/support/issue-linking/index.ts b/packages/mcp-core/src/tools/support/issue-linking/index.ts index aea12ddf10..c6cad0a9ac 100644 --- a/packages/mcp-core/src/tools/support/issue-linking/index.ts +++ b/packages/mcp-core/src/tools/support/issue-linking/index.ts @@ -6,13 +6,13 @@ import type { AppIssueLinkParams } from "./app"; import { inferAppSlug, linkAppIssue, unlinkAppIssue } from "./app"; export type IssueLinkParams = AppIssueLinkParams & { - integrationId?: string; + integrationId?: string | undefined; }; export type IssueLinkResult = { url: string; displayName?: string; - provider?: string; + provider?: string | undefined; status: "linked" | "already_linked" | "not_linked"; }; @@ -85,8 +85,8 @@ function nativeIdentity( const match = path.match( /^\/([^/]+\/[^/]+)\/(issues|pull)\/(\d+)(?:\/(files|changes|commits|checks))?$/, ); - if (!match || (match[2] === "issues" && match[4])) return undefined; - return `${url.origin}/${match[1]!.toLowerCase()}#${match[3]}`; + if (!match?.[1] || (match[2] === "issues" && match[4])) return undefined; + return `${url.origin}/${match[1].toLowerCase()}#${match[3]}`; } case "gitlab": { const match = path.match(/^\/(.+?)(?:\/-)?\/issues\/(\d+)$/); @@ -252,7 +252,8 @@ export async function linkExternalIssue( const { params, url } = validatedParams(input); if (params.appSlug) return await linkAppIssue(apiService, params); const candidates = await nativeCandidates(apiService, params, url); - if (!candidates.length) { + const [integration] = candidates; + if (!integration) { throw new UserInputError( "No active issue integration matches this URL. Use a supported issue or pull request URL, or provide appSlug for a Sentry App.", ); @@ -262,7 +263,6 @@ export async function linkExternalIssue( `Multiple installed issue integrations match this URL. Provide integrationId to select one: ${describeIntegrations(candidates)}.`, ); } - const integration = candidates[0]!; const { issue, changed } = await apiService.linkNativeExternalIssue({ ...params, integrationId: String(integration.id), diff --git a/packages/mcp-core/src/tools/support/issue-linking/tool.ts b/packages/mcp-core/src/tools/support/issue-linking/tool.ts index b17746a2a3..ccd4e0e1a2 100644 --- a/packages/mcp-core/src/tools/support/issue-linking/tool.ts +++ b/packages/mcp-core/src/tools/support/issue-linking/tool.ts @@ -53,10 +53,10 @@ export const issueLinkOutputSchema = z.object({ /** Resolve the numeric issue ID and enforce project scope before any link mutation. */ export async function resolveIssueLinkContext( params: { - organizationSlug?: string; + organizationSlug?: string | undefined; regionUrl?: string | null; - issueId?: string; - issueUrl?: string; + issueId?: string | undefined; + issueUrl?: string | undefined; }, context: ServerContext, ) { diff --git a/packages/mcp-core/src/tools/support/metric-monitor-config.ts b/packages/mcp-core/src/tools/support/metric-monitor-config.ts index 724e1ff306..12463df246 100644 --- a/packages/mcp-core/src/tools/support/metric-monitor-config.ts +++ b/packages/mcp-core/src/tools/support/metric-monitor-config.ts @@ -6,6 +6,7 @@ import { import { z } from "zod"; import type { Detector, MetricMonitorUpdate } from "../../api-client/types"; import { UserInputError } from "../../errors"; +import { omitUndefined } from "../../internal/type-guards"; import { conditionGroupSchema, getMetricQuery, @@ -152,20 +153,25 @@ export function toMetricMonitorUpdate( if (status !== undefined) body.enabled = status === "active"; if (query !== undefined) { const sources = current.dataSources ?? []; - const existing = sources.length === 1 ? getMetricQuery(sources[0]!) : null; + const [source] = sources; + const existing = + sources.length === 1 && source ? getMetricQuery(source) : null; if (!existing) { throw new UserInputError( "This monitor's query is unavailable or has multiple sources; cannot safely update it.", ); } - const { timeWindowSeconds, ...merged } = { ...existing, ...query }; + const { timeWindowSeconds, ...merged } = { + ...existing, + ...omitUndefined(query), + }; // GET nests the query in queryObj.snubaQuery; PUT accepts only the flat query fields. body.dataSources = [{ ...merged, timeWindow: timeWindowSeconds }]; } if (config !== undefined || conditionGroup !== undefined) { if ( config?.detectionType !== undefined && - config.detectionType !== current.config.detectionType && + config.detectionType !== current.config["detectionType"] && !conditionGroup ) { throw new UserInputError( @@ -174,7 +180,7 @@ export function toMetricMonitorUpdate( } // Config replaces the stored object. Resending it also refreshes Seer for Dynamic condition changes. body.config = toMetricDetectionConfig( - config ?? {}, + omitUndefined(config ?? {}), conditionGroup?.conditions ?? conditionGroupSchema.parse(current.conditionGroup).conditions, current.config, @@ -198,17 +204,17 @@ export function toMetricDetectionConfig( const { comparisonDeltaSeconds, ...changes } = config; const result: Detector["config"] = { ...current, ...changes }; if (comparisonDeltaSeconds !== undefined) - result.comparisonDelta = comparisonDeltaSeconds; - if (result.detectionType !== "percent") { + result["comparisonDelta"] = comparisonDeltaSeconds; + if (result["detectionType"] !== "percent") { if (comparisonDeltaSeconds != null) { throw new UserInputError( "comparisonDeltaSeconds is only supported for Percent detection.", ); } // A retained delta still enables percentage evaluation in the backend, regardless of detectionType. - if (config.detectionType !== undefined) result.comparisonDelta = null; + if (config.detectionType !== undefined) result["comparisonDelta"] = null; } - const dynamic = result.detectionType === "dynamic"; + const dynamic = result["detectionType"] === "dynamic"; if (dynamic && conditions.length !== 1) { throw new UserInputError( "Dynamic detection requires exactly one anomaly_detection condition.", @@ -224,8 +230,11 @@ export function toMetricDetectionConfig( ); } if ( - result.detectionType === "percent" && - !(typeof result.comparisonDelta === "number" && result.comparisonDelta > 0) + result["detectionType"] === "percent" && + !( + typeof result["comparisonDelta"] === "number" && + result["comparisonDelta"] > 0 + ) ) { throw new UserInputError( "Percent detection requires comparisonDeltaSeconds.", diff --git a/packages/mcp-core/src/tools/support/metric-monitors.ts b/packages/mcp-core/src/tools/support/metric-monitors.ts index 4e063fc775..feb1ad8908 100644 --- a/packages/mcp-core/src/tools/support/metric-monitors.ts +++ b/packages/mcp-core/src/tools/support/metric-monitors.ts @@ -105,7 +105,7 @@ export function toMetricMonitorDetails( dataSources: (detector.dataSources ?? []).map((source) => { const query = getMetricQuery(source); return { - type: typeof source.type === "string" ? source.type : "unknown", + type: typeof source["type"] === "string" ? source["type"] : "unknown", ...(query ? { query } : { unavailableReason: "Source configuration is unavailable." }), @@ -126,9 +126,9 @@ export async function listMetricMonitors( api: SentryApiService, params: { organizationSlug: string; - projectSlug?: string; - query?: string; - cursor?: string; + projectSlug?: string | undefined; + query?: string | undefined; + cursor?: string | undefined; limit?: number; }, ) { @@ -161,8 +161,8 @@ export async function getMetricMonitor( params: { organizationSlug: string; monitorId: string; - projectSlug?: string; - scopedProjectSlug?: string | null; + projectSlug?: string | undefined; + scopedProjectSlug?: string | null | undefined; }, ): Promise { if (params.projectSlug) { @@ -198,7 +198,11 @@ export async function getMetricMonitor( export async function findExactMetricMonitorMatches( api: SentryApiService, - params: { organizationSlug: string; projectSlug?: string; name: string }, + params: { + organizationSlug: string; + projectSlug?: string | undefined; + name: string; + }, ) { const page = await listMetricMonitors(api, { ...params, diff --git a/packages/mcp-core/src/tools/support/profile/analyzer.test.ts b/packages/mcp-core/src/tools/support/profile/analyzer.test.ts index 875fbbe0ca..6392c03b13 100644 --- a/packages/mcp-core/src/tools/support/profile/analyzer.test.ts +++ b/packages/mcp-core/src/tools/support/profile/analyzer.test.ts @@ -1,4 +1,4 @@ -import { describe, it, expect } from "vitest"; +import { assert, describe, it, expect } from "vitest"; import type { Flamegraph } from "../../../api-client/types"; import { analyzeHotPathsFromFlamegraph, @@ -242,11 +242,8 @@ describe("analyzer", () => { expect(hotspots.length).toBeGreaterThan(0); // Should be sorted by weight (highest first) - for (let i = 1; i < hotspots.length; i++) { - expect(hotspots[i - 1]?.frameInfo.weight).toBeGreaterThanOrEqual( - hotspots[i]!.frameInfo.weight, - ); - } + const weights = hotspots.map((hotspot) => hotspot.frameInfo.weight); + expect(weights).toEqual([...weights].sort((a, b) => b - a)); }); it("filters to user code when requested", () => { @@ -338,7 +335,7 @@ describe("analyzer", () => { const current = createMockFlamegraph(); // Make current 30% slower (comparison uses sumDuration) - current.shared.frame_infos[0]!.sumDuration = 208000000; // 160ms * 1.3 = 208ms + frameInfoAt(current, 0).sumDuration = 208000000; // 160ms * 1.3 = 208ms const comparisons = compareFrameStats(baseline, current, { focusOnUserCode: false, @@ -356,7 +353,7 @@ describe("analyzer", () => { const current = createMockFlamegraph(); // Make current 15% slower (comparison uses sumDuration) - current.shared.frame_infos[1]!.sumDuration = 184000000; // 160ms * 1.15 = 184ms + frameInfoAt(current, 1).sumDuration = 184000000; // 160ms * 1.15 = 184ms const comparisons = compareFrameStats(baseline, current, { focusOnUserCode: false, @@ -373,7 +370,7 @@ describe("analyzer", () => { const current = createMockFlamegraph(); // Make current 20% faster (comparison uses sumDuration) - current.shared.frame_infos[0]!.sumDuration = 128000000; // 160ms * 0.8 = 128ms + frameInfoAt(current, 0).sumDuration = 128000000; // 160ms * 0.8 = 128ms const comparisons = compareFrameStats(baseline, current, { focusOnUserCode: false, @@ -390,7 +387,7 @@ describe("analyzer", () => { const current = createMockFlamegraph(); // Make current 5% slower (within no_change threshold, uses sumDuration) - current.shared.frame_infos[0]!.sumDuration = 168000000; // 160ms * 1.05 = 168ms + frameInfoAt(current, 0).sumDuration = 168000000; // 160ms * 1.05 = 168ms const comparisons = compareFrameStats(baseline, current, { focusOnUserCode: false, @@ -417,8 +414,8 @@ describe("analyzer", () => { const current = createMockFlamegraph(); // Create different severity changes - current.shared.frame_infos[0]!.weight = 240; // major regression (+50%) - current.shared.frame_infos[1]!.weight = 176; // minor regression (+10%) + frameInfoAt(current, 0).weight = 240; // major regression (+50%) + frameInfoAt(current, 1).weight = 176; // minor regression (+10%) const comparisons = compareFrameStats(baseline, current, { focusOnUserCode: true, @@ -472,3 +469,9 @@ describe("analyzer", () => { }); }); }); + +function frameInfoAt(flamegraph: Flamegraph, index: number) { + const frameInfo = flamegraph.shared.frame_infos[index]; + assert(frameInfo, `Mock flamegraph has no frame info at index ${index}`); + return frameInfo; +} diff --git a/packages/mcp-core/src/tools/support/profile/analyzer.ts b/packages/mcp-core/src/tools/support/profile/analyzer.ts index 9645bc470b..70c89eeacf 100644 --- a/packages/mcp-core/src/tools/support/profile/analyzer.ts +++ b/packages/mcp-core/src/tools/support/profile/analyzer.ts @@ -356,7 +356,10 @@ export function compareFrameStats( continue; // Frame only in one dataset } - const currentFrame = currentFrames[indices.currentIdx]!; + const currentFrame = currentFrames[indices.currentIdx]; + if (!currentFrame) { + continue; + } const baselineInfo = baselineInfos[indices.baselineIdx] || DEFAULT_FRAME_INFO; const currentInfo = currentInfos[indices.currentIdx] || DEFAULT_FRAME_INFO; diff --git a/packages/mcp-core/src/tools/support/profile/details-output.ts b/packages/mcp-core/src/tools/support/profile/details-output.ts index 05f80704af..ba35873f15 100644 --- a/packages/mcp-core/src/tools/support/profile/details-output.ts +++ b/packages/mcp-core/src/tools/support/profile/details-output.ts @@ -212,11 +212,13 @@ function getTransactionProfileDurationNs( .map((sample) => sample.elapsed_since_start_ns) .filter((value) => Number.isFinite(value)) .sort((a, b) => a - b); - if (elapsed.length < 2) { + const first = elapsed[0]; + const last = elapsed.at(-1); + if (elapsed.length < 2 || first === undefined || last === undefined) { return null; } - const duration = elapsed.at(-1)! - elapsed[0]!; + const duration = last - first; return duration > 0 ? Math.round(duration) : null; } diff --git a/packages/mcp-core/src/tools/support/profile/flamegraph-output.test.ts b/packages/mcp-core/src/tools/support/profile/flamegraph-output.test.ts index 47eaaa3514..10eafd5583 100644 --- a/packages/mcp-core/src/tools/support/profile/flamegraph-output.test.ts +++ b/packages/mcp-core/src/tools/support/profile/flamegraph-output.test.ts @@ -1,4 +1,4 @@ -import { describe, expect, it } from "vitest"; +import { assert, describe, expect, it } from "vitest"; import type { Flamegraph } from "../../../api-client/types"; import { buildFlamegraphAnalysis, @@ -137,7 +137,7 @@ describe("buildFlamegraphAnalysis", () => { it("maps placeholder file and line values to null", () => { const flamegraph = createMockFlamegraph(); flamegraph.shared.frames[0] = { - ...flamegraph.shared.frames[0]!, + ...frameAt(flamegraph, 0), file: "", line: 0, }; @@ -162,10 +162,13 @@ describe("buildFlamegraphAnalysis", () => { }); const [topPath] = analysis.hotPaths; - expect(topPath?.stack.map((index) => analysis.frames[index]?.file)).toEqual( - ["main.py", "utils.py", "psycopg2/pool.py"], - ); - expect(topPath?.stack.at(-1)).toBe(topPath!.leaf); + assert(topPath, "Expected a hot path"); + expect(topPath.stack.map((index) => analysis.frames[index]?.file)).toEqual([ + "main.py", + "utils.py", + "psycopg2/pool.py", + ]); + expect(topPath.stack.at(-1)).toBe(topPath.leaf); expect(analysis.topFunctions).toHaveLength(3); }); @@ -223,7 +226,7 @@ describe("buildFlamegraphComparison", () => { it("detects major regressions", () => { const current = createMockFlamegraph(); // Comparison uses sumDuration, not weight. - current.shared.frame_infos[0]!.sumDuration = 240_000_000; + frameInfoAt(current, 0).sumDuration = 240_000_000; const comparison = buildFlamegraphComparison( createMockFlamegraph(), @@ -248,7 +251,7 @@ describe("buildFlamegraphComparison", () => { const withPlaceholders = () => { const flamegraph = createMockFlamegraph(); flamegraph.shared.frames[0] = { - ...flamegraph.shared.frames[0]!, + ...frameAt(flamegraph, 0), file: "", line: 0, }; @@ -269,7 +272,7 @@ describe("buildFlamegraphComparison", () => { it("keeps improvements in changes when many frames are unchanged", () => { const withFrames = (improvedDurationNs: number) => { const flamegraph = createMockFlamegraph(); - const template = flamegraph.shared.frame_infos[0]!; + const template = frameInfoAt(flamegraph, 0); flamegraph.shared.frames = Array.from({ length: 13 }, (_, index) => ({ file: `module_${index}.py`, name: `fn_${index}`, @@ -303,9 +306,9 @@ describe("buildFlamegraphComparison", () => { it("detects improvements", () => { const current = createMockFlamegraph(); - current.shared.frame_infos[0]!.sumDuration = 128_000_000; - current.shared.frame_infos[1]!.sumDuration = 128_000_000; - current.shared.frame_infos[2]!.sumDuration = 80_000_000; + frameInfoAt(current, 0).sumDuration = 128_000_000; + frameInfoAt(current, 1).sumDuration = 128_000_000; + frameInfoAt(current, 2).sumDuration = 80_000_000; expect( buildFlamegraphComparison(createMockFlamegraph(), current, { @@ -314,3 +317,15 @@ describe("buildFlamegraphComparison", () => { ).toBe("improvement"); }); }); + +function frameInfoAt(flamegraph: Flamegraph, index: number) { + const frameInfo = flamegraph.shared.frame_infos[index]; + assert(frameInfo, `Mock flamegraph has no frame info at index ${index}`); + return frameInfo; +} + +function frameAt(flamegraph: Flamegraph, index: number) { + const frame = flamegraph.shared.frames[index]; + assert(frame, `Mock flamegraph has no frame at index ${index}`); + return frame; +} diff --git a/packages/mcp-core/src/tools/support/search-attributes/format.ts b/packages/mcp-core/src/tools/support/search-attributes/format.ts index 5e091dbf67..1702fa3ec3 100644 --- a/packages/mcp-core/src/tools/support/search-attributes/format.ts +++ b/packages/mcp-core/src/tools/support/search-attributes/format.ts @@ -45,8 +45,8 @@ export function formatListResult({ }: QuerySettings & { attributes: TraceItemAttribute[]; limit: number; - notes?: string[]; - importantInfo?: string[]; + notes?: string[] | undefined; + importantInfo?: string[] | undefined; }): string { const labels = DATASET_LABELS[dataset]; const lines: string[] = []; diff --git a/packages/mcp-core/src/tools/support/search-attributes/search.ts b/packages/mcp-core/src/tools/support/search-attributes/search.ts index 7f7875a616..e9a059fc7a 100644 --- a/packages/mcp-core/src/tools/support/search-attributes/search.ts +++ b/packages/mcp-core/src/tools/support/search-attributes/search.ts @@ -26,11 +26,11 @@ export type SearchAttributesDataset = export interface SearchAttributesParams { organizationSlug: string; projectSlug: string | null; - query?: string; - period?: string; + query?: string | undefined; + period?: string | undefined; regionUrl: string | null; - limit?: number; - dataset?: SearchAttributesDataset; + limit?: number | undefined; + dataset?: SearchAttributesDataset | undefined; } const DEFAULT_PERIOD = "14d"; diff --git a/packages/mcp-core/src/tools/support/search-events/agent.ts b/packages/mcp-core/src/tools/support/search-events/agent.ts index dc212ab53d..27276b7740 100644 --- a/packages/mcp-core/src/tools/support/search-events/agent.ts +++ b/packages/mcp-core/src/tools/support/search-events/agent.ts @@ -125,7 +125,7 @@ export interface SearchEventsAgentOptions { query: string; organizationSlug: string; apiService: SentryApiService; - projectId?: string; + projectId?: string | undefined; /** * The org's real environment names, used to ground the prompt. When omitted * the agent fetches them itself; the search_events tool passes a pre-fetched @@ -171,7 +171,7 @@ export function buildSystemPromptWithEnvironments( export async function fetchEnvironmentNames(options: { apiService: SentryApiService; organizationSlug: string; - projectId?: string; + projectId?: string | undefined; }): Promise { try { const environments = await options.apiService.listEnvironments({ diff --git a/packages/mcp-core/src/tools/support/search-events/dropped-events-note.ts b/packages/mcp-core/src/tools/support/search-events/dropped-events-note.ts index 121e480c1b..07db6e04cd 100644 --- a/packages/mcp-core/src/tools/support/search-events/dropped-events-note.ts +++ b/packages/mcp-core/src/tools/support/search-events/dropped-events-note.ts @@ -49,7 +49,7 @@ export async function buildDroppedEventsNote({ }: { apiService: SentryApiService; organizationSlug: string; - projectId?: string; + projectId?: string | undefined; dataset: PublicEventsDataset; interval: string | null; timeParams: { statsPeriod?: string; start?: string; end?: string }; diff --git a/packages/mcp-core/src/tools/support/search-events/formatters.ts b/packages/mcp-core/src/tools/support/search-events/formatters.ts index 2a5021796e..a36d05fe29 100644 --- a/packages/mcp-core/src/tools/support/search-events/formatters.ts +++ b/packages/mcp-core/src/tools/support/search-events/formatters.ts @@ -153,11 +153,11 @@ export interface FormatEventResultsParams { explorerUrl: string; sentryQuery: string; fields: string[]; - explanation?: string; + explanation?: string | undefined; executedSearch?: ExecutedSearch; experimentalMode?: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; } function formatUserFieldLines( @@ -165,7 +165,7 @@ function formatUserFieldLines( options: { prefix?: string } = {}, ): string[] { const prefix = options.prefix ?? ""; - const geoSummary = formatUserGeoSummary(value.geo); + const geoSummary = formatUserGeoSummary(value["geo"]); const userSummary = formatKnownUserValue(value, { includeGeo: false }); const lines: string[] = []; @@ -416,8 +416,8 @@ export function formatLogResults(params: FormatEventResultsParams): string { for (const [i, event] of eventData.entries()) { output += `### Log ${i + 1}\n`; - if (typeof event.id === "string" && event.id) { - output += `- **Log URL**: ${apiService.getLogUrl(organizationSlug, event.id)}\n`; + if (typeof event["id"] === "string" && event["id"]) { + output += `- **Log URL**: ${apiService.getLogUrl(organizationSlug, event["id"])}\n`; } // Display priority fields first @@ -1086,7 +1086,7 @@ export function formatTimeSeriesResults(params: { interval: string | null; inputQuery: string; includeExplanation?: boolean; - explanation?: string; + explanation?: string | undefined; timeRange?: SearchTimeRange; url?: string; }): string { diff --git a/packages/mcp-core/src/tools/support/search-events/replays.ts b/packages/mcp-core/src/tools/support/search-events/replays.ts index a88da787d9..9d3dc817b3 100644 --- a/packages/mcp-core/src/tools/support/search-events/replays.ts +++ b/packages/mcp-core/src/tools/support/search-events/replays.ts @@ -71,13 +71,13 @@ export interface FormatReplayResultsParams { searchUrl: string; replayQuery: string; sort: string; - environment?: string | string[] | null; - explanation?: string; + environment?: string | string[] | null | undefined; + explanation?: string | undefined; timeRange?: ReplayTimeRange; executedSearch?: ExecutedSearch; experimentalMode?: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; } const REPLAY_RESULTS_HINT = diff --git a/packages/mcp-core/src/tools/support/search-events/search.ts b/packages/mcp-core/src/tools/support/search-events/search.ts index 29643b5c8a..2d6a076636 100644 --- a/packages/mcp-core/src/tools/support/search-events/search.ts +++ b/packages/mcp-core/src/tools/support/search-events/search.ts @@ -111,7 +111,7 @@ function resolveEventFields({ trustExplicitFields, }: { dataset: PublicEventsDataset; - explicitFields?: string[] | null; + explicitFields?: string[] | null | undefined; agentFields?: string[]; trustExplicitFields: boolean; }): string[] { @@ -237,11 +237,12 @@ function formatEnvironmentFilter( } const environments = Array.isArray(environment) ? environment : [environment]; - if (environments.length === 0) { + const [first, ...rest] = environments; + if (first === undefined) { return undefined; } - if (environments.length === 1) { - return `environment:${formatSearchValue(environments[0]!)}`; + if (rest.length === 0) { + return `environment:${formatSearchValue(first)}`; } return `environment:[${environments.map(formatSearchValue).join(",")}]`; } @@ -278,11 +279,11 @@ export function collectRequestedEnvironments( // inside quoted text (e.g. a message value) aren't mistaken for a filter. const tokens = tokenizeSearchQuery(query); for (let i = 0; i < tokens.length; i++) { - const match = /^environment:(.*)$/is.exec(tokens[i]!); + const match = /^environment:(.*)$/is.exec(tokens[i] ?? ""); if (!match) { continue; } - let value = match[1]!; + let value = match[1] ?? ""; // An IN-list (`environment:[a, b]`) can be split across tokens on its // internal spaces; rejoin following tokens until the list is closed. while ( @@ -405,7 +406,7 @@ function preservesSearchTokens(originalQuery: string, repairedQuery: string) { function choosePreservingRepairedQuery(params: { originalQuery: string; repairedQuery?: string | null; - filter?: string; + filter?: string | undefined; dataset: PublicEventsDataset | "replays"; }): string { const originalQuery = params.originalQuery.trim(); @@ -426,13 +427,13 @@ function choosePreservingRepairedQuery(params: { } function buildAgentPrompt(params: { - query?: string; + query?: string | undefined; dataset: PublicEventsDataset | "replays"; lockDataset?: boolean; - fields?: string[] | null; - sort?: string | null; - statsPeriod?: string; - environment?: string | string[] | null; + fields?: string[] | null | undefined; + sort?: string | null | undefined; + statsPeriod?: string | undefined; + environment?: string | string[] | null | undefined; }): string { return [ "Translate this Sentry event search request.", @@ -467,13 +468,13 @@ export type SearchEventsDataset = (typeof SEARCH_EVENTS_DATASETS)[number]; export interface SearchEventsParams { organizationSlug: string; - dataset?: SearchEventsDataset; - query?: string; - fields?: string[] | null; - sort?: string | null; + dataset?: SearchEventsDataset | undefined; + query?: string | undefined; + fields?: string[] | null | undefined; + sort?: string | null | undefined; projectSlug: string | null; - environment?: string | string[]; - period?: string; + environment?: string | string[] | undefined; + period?: string | undefined; regionUrl: string | null; limit: number; includeExplanation: boolean; @@ -676,7 +677,7 @@ export function logSearchEventsError( params: Record, context: ServerContext, ): void { - const query = params.query; + const query = params["query"]; logWarn(`${toolName} query failed`, { loggerScope: ["tools", toolName], extra: { @@ -687,8 +688,8 @@ export function logSearchEventsError( error instanceof Error ? error.message : String(error), ), organizationSlug: - (typeof params.organizationSlug === "string" - ? params.organizationSlug + (typeof params["organizationSlug"] === "string" + ? params["organizationSlug"] : null) ?? context.constraints.organizationSlug, query: typeof query === "string" ? scrubSensitiveText(query) : null, }, @@ -822,7 +823,6 @@ async function executeSearchEvents( const hasExplicitDataset = params.dataset !== undefined; const hasExplicitFields = hasFields(params.fields); const hasExplicitSort = explicitSort !== undefined; - const hasExplicitPeriod = params.period !== undefined; const hasExplicitTraceItemDataset = hasExplicitDataset && isTraceItemDataset(inputDataset); const shouldTrustStructuredTraceSearch = @@ -899,9 +899,10 @@ async function executeSearchEvents( fields = seerTranslation.fields; sortParam = seerTranslation.sort; // Seer never sees `period`, so an explicit one wins over its time range. - timeParams = hasExplicitPeriod - ? { statsPeriod: params.period } - : seerTranslation.timeParams; + timeParams = + params.period !== undefined + ? { statsPeriod: params.period } + : seerTranslation.timeParams; explanation = seerTranslation.explanation; timeSeries = seerTranslation.timeSeries; } else if (willRunAgent) { diff --git a/packages/mcp-core/src/tools/support/search-events/seer.ts b/packages/mcp-core/src/tools/support/search-events/seer.ts index 581bb5e1f8..105559ac35 100644 --- a/packages/mcp-core/src/tools/support/search-events/seer.ts +++ b/packages/mcp-core/src/tools/support/search-events/seer.ts @@ -9,6 +9,7 @@ import { type SearchAgentQuerySchema, } from "../../../api-client/index"; import { sleep } from "../../../internal/fetch-utils"; +import { omitUndefined } from "../../../internal/type-guards"; import { logWarn } from "../../../telem/logging"; import { type EventsApiDataset, @@ -58,7 +59,7 @@ export interface SeerSearchTranslation { suggestedProjectIds: number[]; explanation: string; // Correctness warnings must be shown even when explanations are disabled. - warning?: string; + warning?: string | undefined; // Identifies the run in the assisted query outcome metric. runId: string; mode: ExploreMode; @@ -209,11 +210,11 @@ function toSearchTranslation( } // Filters on other events in the same trace, only returned for spans. - const crossEventQueries: CrossEventQueries = { + const crossEventQueries: CrossEventQueries = omitUndefined({ spanQuery: result.span_query || undefined, logQuery: result.log_query || undefined, metricQuery: result.metric_query || undefined, - }; + }); const crossEventFilters = [ ["spans", crossEventQueries.spanQuery], ["logs", crossEventQueries.logQuery], @@ -276,7 +277,7 @@ async function runSearchAgent({ }: { apiService: SentryApiService; organizationSlug: string; - projectId?: string; + projectId?: string | undefined; strategy: SearchAgentStrategy; query: string; // A strategy-specific flag that Sentry also checks before starting the run. @@ -359,7 +360,7 @@ export async function translateWithSeer({ }: { apiService: SentryApiService; organizationSlug: string; - projectId?: string; + projectId?: string | undefined; dataset: SeerSearchDataset; query: string; }): Promise { @@ -406,7 +407,7 @@ export async function translateIssuesWithSeer({ }: { apiService: SentryApiService; organizationSlug: string; - projectId?: string; + projectId?: string | undefined; query: string; }): Promise { const run = await runSearchAgent({ diff --git a/packages/mcp-core/src/tools/support/search-events/structured.ts b/packages/mcp-core/src/tools/support/search-events/structured.ts index ff1118f1b3..f9d62dddce 100644 --- a/packages/mcp-core/src/tools/support/search-events/structured.ts +++ b/packages/mcp-core/src/tools/support/search-events/structured.ts @@ -109,8 +109,8 @@ interface StructuredSearchSession { apiService: SentryApiService; organizationSlug: string; experimentalMode: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; } type RowLinkShape = Record>; @@ -161,7 +161,7 @@ function firstTraceAction( reason: string, ): SuggestedToolAction[] { const traceId = results - .map((row) => row.values.trace) + .map((row) => row.values["trace"]) .find((trace): trace is string => typeof trace === "string" && !!trace); const action = traceId ? buildSuggestedToolAction({ @@ -186,13 +186,13 @@ const STRUCTURED_DATASETS = { links: { issueUrl: z.string().nullable() }, rowLinks: (event, { apiService, organizationSlug }) => ({ issueUrl: - typeof event.issue === "string" && event.issue - ? apiService.getIssueUrl(organizationSlug, event.issue) + typeof event["issue"] === "string" && event["issue"] + ? apiService.getIssueUrl(organizationSlug, event["issue"]) : null, }), suggestedActions(results, session) { const issueId = results - .map((row) => row.values.issue) + .map((row) => row.values["issue"]) .find((issue): issue is string => typeof issue === "string" && !!issue); const action = issueId ? buildSuggestedToolAction({ @@ -277,8 +277,9 @@ const STRUCTURED_DATASETS = { traceUrl: traceUrlFor(event, session), }), suggestedActions(results, session) { - const profileUrl = results.find((row) => row.links.profileUrl)?.links - .profileUrl; + const profileUrl = results.find((row) => row.links["profileUrl"])?.links[ + "profileUrl" + ]; const reason = "Analyze the flamegraph for the first matching profile."; // Experimental sessions route profile URLs through get_sentry_resource. const profileAction = profileUrl @@ -388,7 +389,7 @@ export function buildStructuredEventsResult(params: { eventData: FlexibleEventData[]; inputQuery: string; includeExplanation: boolean; - explanation?: string; + explanation?: string | undefined; explorerUrl: string; sentryQuery: string; fields: string[]; @@ -449,7 +450,7 @@ export function buildStructuredTimeSeriesResult(params: { interval: string | null; inputQuery: string; includeExplanation: boolean; - explanation?: string; + explanation?: string | undefined; query: string; timeRange: { statsPeriod?: string; start?: string; end?: string }; url: string; diff --git a/packages/mcp-core/src/tools/support/search-events/utils.test.ts b/packages/mcp-core/src/tools/support/search-events/utils.test.ts index 95297d996a..75f4fa0ff3 100644 --- a/packages/mcp-core/src/tools/support/search-events/utils.test.ts +++ b/packages/mcp-core/src/tools/support/search-events/utils.test.ts @@ -252,7 +252,7 @@ describe("formatEventValue", () => { it("should handle circular references", () => { const obj: Record = { type: "test" }; - obj.self = obj; + obj["self"] = obj; const result = formatEventValue(obj); expect(result).toContain("[Circular]"); expect(result).not.toContain("[object Object]"); @@ -1162,7 +1162,7 @@ describe("fetchCustomAttributes", () => { ); expect(requests).toHaveLength(1); - expect(requests[0]!.get("attributeType")).toBeNull(); + expect(requests[0]?.get("attributeType")).toBeNull(); for (const params of requests) { expect(params.get("itemType")).toBe("spans"); expect(params.get("project")).toBe("123"); diff --git a/packages/mcp-core/src/tools/support/search-events/utils.ts b/packages/mcp-core/src/tools/support/search-events/utils.ts index 3de0bb56d0..e4939fc02e 100644 --- a/packages/mcp-core/src/tools/support/search-events/utils.ts +++ b/packages/mcp-core/src/tools/support/search-events/utils.ts @@ -402,7 +402,9 @@ function searchFilterOccurrences(query: string): SearchFilterOccurrence[] { // Read key://pattern// on every dataset: outside logs it is a literal match, // so a structured filter rewritten into one is still a downgrade. for (const match of masked.matchAll(SENTRY_SEARCH_TOKEN_WITH_REGEX_PATTERN)) { - const key = (match.groups?.regexKey ?? match.groups?.key)?.toLowerCase(); + const key = ( + match.groups?.["regexKey"] ?? match.groups?.["key"] + )?.toLowerCase(); if (!key) { continue; } @@ -607,7 +609,7 @@ function isPrimitive( function isTagPair(value: unknown): value is { key: string; value: unknown } { return ( - isPlainObject(value) && typeof value.key === "string" && "value" in value + isPlainObject(value) && typeof value["key"] === "string" && "value" in value ); } @@ -639,14 +641,14 @@ function hasUserSummaryFields( ): boolean { return ( hasUserIdentityFields(value) || - (options.allowId === true && value.id != null) + (options.allowId === true && value["id"] != null) ); } function formatUserSummary( value: Record, options: { - includeGeo?: boolean; + includeGeo?: boolean | undefined; allowIdOnly?: boolean; } = {}, ): string | null { @@ -661,7 +663,7 @@ function formatUserSummary( const parts = USER_FIELDS.filter((f) => value[f] != null).map( (f) => `${f}=${formatSimpleValue(value[f])}`, ); - const geoSummary = formatUserGeoSummary(value.geo); + const geoSummary = formatUserGeoSummary(value["geo"]); if (includeGeo && geoSummary) { parts.push(`geo=${geoSummary}`); } @@ -697,7 +699,7 @@ function truncateString(value: string, maxLength: number): string { function safeJsonStringify(value: unknown): string { const seen = new WeakSet(); - return JSON.stringify(value, (_key, currentValue) => { + return JSON.stringify(value, (_key, currentValue: unknown) => { if (typeof currentValue === "bigint") { return currentValue.toString(); } @@ -825,9 +827,9 @@ export async function fetchCustomAttributes( projectId?: string, timeParams?: { statsPeriod?: string; start?: string; end?: string }, options: { - attributeTypes?: TraceItemAttributeType[]; - substringMatch?: string; - query?: string; + attributeTypes?: TraceItemAttributeType[] | undefined; + substringMatch?: string | undefined; + query?: string | undefined; context?: boolean; } = {}, ): Promise<{ @@ -917,7 +919,7 @@ function formatValidationStatusLine({ valid: boolean; name?: string; type?: string; - error?: string; + error?: string | undefined; indent?: number; }): string { const status = valid ? "OK" : "INVALID"; @@ -1106,11 +1108,11 @@ export async function validateEventsSearch( fields: string[]; query: string; sort: string; - projectId?: string; - environment?: string | string[]; - statsPeriod?: string; - start?: string; - end?: string; + projectId?: string | undefined; + environment?: string | string[] | undefined; + statsPeriod?: string | undefined; + start?: string | undefined; + end?: string | undefined; }, ): Promise { return await apiService.validateEvents({ @@ -1225,7 +1227,10 @@ function resolveAvailableFields( const replacementAttribute = { ...field, key: replacementKey }; available.set(replacementKey, replacementAttribute); replaced.push(field); - fieldTypes[replacementKey] = fieldTypes[key]!; + const fieldType = fieldTypes[key]; + if (fieldType !== undefined) { + fieldTypes[replacementKey] = fieldType; + } delete fieldTypes[key]; } else if (!attributeDeprecated && !available.has(key)) { available.set(key, field); @@ -1257,7 +1262,7 @@ function describeField(field: AttributeDescriptor): string { export function createDatasetAttributesTool(options: { apiService: SentryApiService; organizationSlug: string; - projectId?: string; + projectId?: string | undefined; }) { const { apiService, organizationSlug, projectId } = options; const traceItemAttributeTypeSchema = z.enum([ @@ -1463,7 +1468,7 @@ Use these examples as patterns for constructing your query.`; export function createValidateEventsSearchTool(options: { apiService: SentryApiService; organizationSlug: string; - projectId?: string; + projectId?: string | undefined; }) { const { apiService, organizationSlug, projectId } = options; diff --git a/packages/mcp-core/src/tools/support/search-issue-events/agent.ts b/packages/mcp-core/src/tools/support/search-issue-events/agent.ts index 45667d1b33..6dffba4588 100644 --- a/packages/mcp-core/src/tools/support/search-issue-events/agent.ts +++ b/packages/mcp-core/src/tools/support/search-issue-events/agent.ts @@ -1,5 +1,8 @@ import { z } from "zod"; -import { callEmbeddedAgent } from "../../../internal/agents/callEmbeddedAgent"; +import { + callEmbeddedAgent, + type ToolCall, +} from "../../../internal/agents/callEmbeddedAgent"; import type { SentryApiService } from "../../../api-client"; import { createWhoamiTool } from "../../../internal/agents/tools/whoami"; import { createIssueEventFieldsTool } from "./utils"; @@ -71,7 +74,7 @@ export interface SearchIssueEventsAgentOptions { query: string; organizationSlug: string; apiService: SentryApiService; - projectId?: string; + projectId?: string | undefined; } /** @@ -82,7 +85,7 @@ export async function searchIssueEventsAgent( options: SearchIssueEventsAgentOptions, ): Promise<{ result: z.output; - toolCalls: any[]; + toolCalls: ToolCall[]; }> { // Provider check happens in callEmbeddedAgent via getAgentProvider() // Create tools pre-bound with the provided API service and organization diff --git a/packages/mcp-core/src/tools/support/search-issue-events/results.ts b/packages/mcp-core/src/tools/support/search-issue-events/results.ts index 97165da007..5d769f81f9 100644 --- a/packages/mcp-core/src/tools/support/search-issue-events/results.ts +++ b/packages/mcp-core/src/tools/support/search-issue-events/results.ts @@ -91,10 +91,10 @@ export interface BuildIssueEventResultsParams { query: string; timeRange: { statsPeriod?: string; start?: string; end?: string }; sort: string; - explanation?: string; + explanation?: string | undefined; experimentalMode?: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; } function readString(value: unknown): string | null { @@ -111,19 +111,19 @@ function mapUser(value: unknown): IssueEvent["user"] { if (!isPlainObject(value)) { return null; } - const geo = isPlainObject(value.geo) + const geo = isPlainObject(value["geo"]) ? { - countryCode: readString(value.geo.country_code), - city: readString(value.geo.city), - region: readString(value.geo.region), + countryCode: readString(value["geo"]["country_code"]), + city: readString(value["geo"]["city"]), + region: readString(value["geo"]["region"]), } : null; const user = { - id: readString(value.id), - email: readString(value.email), - username: readString(value.username), - name: readString(value.name), - ipAddress: readString(value.ip_address), + id: readString(value["id"]), + email: readString(value["email"]), + username: readString(value["username"]), + name: readString(value["name"]), + ipAddress: readString(value["ip_address"]), geo: geo && !allNull(geo) ? geo : null, }; return allNull(user) ? null : user; @@ -137,8 +137,8 @@ function mapTags(value: unknown): IssueEvent["tags"] { if (!isPlainObject(tag)) { return []; } - const key = readString(tag.key); - const tagValue = readString(tag.value); + const key = readString(tag["key"]); + const tagValue = readString(tag["value"]); // Tags with an empty value are dropped on purpose. return key && tagValue !== null ? [{ key, value: tagValue }] : []; }); @@ -148,22 +148,22 @@ function mapEvent( event: Record, issueUrl: string, ): IssueEvent | null { - const id = readString(event.eventID) ?? readString(event.id); + const id = readString(event["eventID"]) ?? readString(event["id"]); if (!id) { return null; } return { id, url: `${issueUrl}/events/${id}/`, - eventType: readString(event["event.type"]) ?? readString(event.type), - title: readString(event.title), - message: readString(event.message), - culprit: readString(event.culprit), - location: readString(event.location), - platform: readString(event.platform), - dateCreated: readString(event.dateCreated), - user: mapUser(event.user), - tags: mapTags(event.tags), + eventType: readString(event["event.type"]) ?? readString(event["type"]), + title: readString(event["title"]), + message: readString(event["message"]), + culprit: readString(event["culprit"]), + location: readString(event["location"]), + platform: readString(event["platform"]), + dateCreated: readString(event["dateCreated"]), + user: mapUser(event["user"]), + tags: mapTags(event["tags"]), }; } diff --git a/packages/mcp-core/src/tools/support/search-issue-events/utils.ts b/packages/mcp-core/src/tools/support/search-issue-events/utils.ts index cea7af2987..fb03ce2f8f 100644 --- a/packages/mcp-core/src/tools/support/search-issue-events/utils.ts +++ b/packages/mcp-core/src/tools/support/search-issue-events/utils.ts @@ -19,7 +19,7 @@ import { export function createIssueEventFieldsTool(options: { apiService: SentryApiService; organizationSlug: string; - projectId?: string; + projectId?: string | undefined; }) { const { apiService, organizationSlug, projectId } = options; return agentTool({ @@ -94,8 +94,8 @@ IMPORTANT: */ export function parseIssueParams(params: { organizationSlug?: string | null; - issueId?: string; - issueUrl?: string; + issueId?: string | undefined; + issueUrl?: string | undefined; }): { organizationSlug: string; issueId: string } { // If issueUrl is provided, parse it if (params.issueUrl) { @@ -106,7 +106,8 @@ export function parseIssueParams(params: { params.issueUrl.match(/\/organizations\/([^/]+)\/issues\/([^/?]+)/) || params.issueUrl.match(/https?:\/\/([^.]+)\.sentry\.io\/issues\/([^/?]+)/); - if (!orgMatch) { + const [, urlOrganizationSlug, issueId] = orgMatch ?? []; + if (!urlOrganizationSlug || !issueId) { throw new UserInputError( `Invalid issue URL format. Expected format like: - https://sentry.io/organizations/my-org/issues/123/ @@ -120,9 +121,9 @@ Received: ${params.issueUrl}`, organizationSlug: resolveScopedOrganizationSlug({ resourceLabel: "Issue", scopedOrganizationSlug: params.organizationSlug, - urlOrganizationSlug: orgMatch[1]!, + urlOrganizationSlug, }), - issueId: orgMatch[2]!, + issueId, }; } diff --git a/packages/mcp-core/src/tools/support/search-issues/agent.ts b/packages/mcp-core/src/tools/support/search-issues/agent.ts index 8ad72a7aab..98c0c461da 100644 --- a/packages/mcp-core/src/tools/support/search-issues/agent.ts +++ b/packages/mcp-core/src/tools/support/search-issues/agent.ts @@ -1,6 +1,9 @@ import { z } from "zod"; import type { SentryApiService } from "../../../api-client"; -import { callEmbeddedAgent } from "../../../internal/agents/callEmbeddedAgent"; +import { + callEmbeddedAgent, + type ToolCall, +} from "../../../internal/agents/callEmbeddedAgent"; import { createDatasetFieldsTool } from "../../../internal/agents/tools/dataset-fields"; import { createWhoamiTool } from "../../../internal/agents/tools/whoami"; import { systemPrompt } from "./config"; @@ -24,7 +27,7 @@ export interface SearchIssuesAgentOptions { query: string; organizationSlug: string; apiService: SentryApiService; - projectId?: string; + projectId?: string | undefined; } /** @@ -35,7 +38,7 @@ export async function searchIssuesAgent( options: SearchIssuesAgentOptions, ): Promise<{ result: z.output; - toolCalls: any[]; + toolCalls: ToolCall[]; }> { // Provider check happens in callEmbeddedAgent via getAgentProvider() // Create tools pre-bound with the provided API service and organization diff --git a/packages/mcp-core/src/tools/support/search-issues/results.test.ts b/packages/mcp-core/src/tools/support/search-issues/results.test.ts index 549bb38024..2a53ea903f 100644 --- a/packages/mcp-core/src/tools/support/search-issues/results.test.ts +++ b/packages/mcp-core/src/tools/support/search-issues/results.test.ts @@ -198,7 +198,7 @@ describe("buildIssueResults", () => { expect( structuredContent.suggestedActions.map((action) => [ - action.arguments.resourceId, + action.arguments["resourceId"], action.reason, ]), ).toEqual([ diff --git a/packages/mcp-core/src/tools/support/search-issues/results.ts b/packages/mcp-core/src/tools/support/search-issues/results.ts index e47fabc0f2..f797c905dd 100644 --- a/packages/mcp-core/src/tools/support/search-issues/results.ts +++ b/packages/mcp-core/src/tools/support/search-issues/results.ts @@ -86,15 +86,15 @@ export interface BuildIssueResultsParams { query: string; sort: IssueSort; period: string; - projectSlugOrId?: string; - explanation?: string; + projectSlugOrId?: string | undefined; + explanation?: string | undefined; notes: string[]; - regionUrl?: string; - host?: string; - protocol?: SentryProtocol; + regionUrl?: string | undefined; + host?: string | undefined; + protocol?: SentryProtocol | undefined; experimentalMode?: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; } function formatAssignee(assignee: Issue["assignedTo"]): string | null { diff --git a/packages/mcp-core/src/tools/support/snapshots/formatting.ts b/packages/mcp-core/src/tools/support/snapshots/formatting.ts index 321dea0009..67d3548d9f 100644 --- a/packages/mcp-core/src/tools/support/snapshots/formatting.ts +++ b/packages/mcp-core/src/tools/support/snapshots/formatting.ts @@ -69,6 +69,6 @@ function isPlainObject(value: unknown): value is Record { return false; } - const prototype = Object.getPrototypeOf(value); + const prototype: unknown = Object.getPrototypeOf(value); return prototype === Object.prototype || prototype === null; } diff --git a/packages/mcp-core/src/tools/support/snapshots/handlers.ts b/packages/mcp-core/src/tools/support/snapshots/handlers.ts index 3c357ca5e6..05278472ea 100644 --- a/packages/mcp-core/src/tools/support/snapshots/handlers.ts +++ b/packages/mcp-core/src/tools/support/snapshots/handlers.ts @@ -57,8 +57,8 @@ function fullResolutionHint({ snapshotId: string; imageIdentifier: string; experimentalMode: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; }): string { return `- **Full Resolution**: ${formatToolCallInstruction({ toolName: "get_snapshot_image", @@ -154,8 +154,8 @@ export async function fetchSnapshotImage( imageResolution: SnapshotImageResolution, options: { experimentalMode?: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; } = {}, ): Promise<(TextContent | ImageContent)[]> { const detail = (await apiService.getSnapshotImageDetail({ diff --git a/packages/mcp-core/src/tools/support/snapshots/structured.ts b/packages/mcp-core/src/tools/support/snapshots/structured.ts index 7ae87c5c08..10035b3422 100644 --- a/packages/mcp-core/src/tools/support/snapshots/structured.ts +++ b/packages/mcp-core/src/tools/support/snapshots/structured.ts @@ -1,4 +1,5 @@ import { z } from "zod"; +import { omitUndefined } from "../../../internal/type-guards"; import type { SnapshotImageEntry, SnapshotVcsInfo } from "./formatting"; // Field-by-field projections of preprod snapshot API objects. Snapshot API @@ -46,12 +47,6 @@ export function snapshotString(value: unknown): string | undefined { return typeof value === "string" && value.length > 0 ? value : undefined; } -function withoutUndefined>(value: T): T { - return Object.fromEntries( - Object.entries(value).filter(([, item]) => item !== undefined), - ) as T; -} - /** Keeps only object entries; snapshot API arrays are untyped. */ export function snapshotImageEntries(value: unknown): SnapshotImageEntry[] { return Array.isArray(value) @@ -63,10 +58,10 @@ export function snapshotImageEntries(value: unknown): SnapshotImageEntry[] { } export function toSnapshotImage(image: SnapshotImageEntry): SnapshotImage { - return withoutUndefined({ + return omitUndefined({ imageFileName: snapshotString(image.image_file_name), displayName: snapshotString(image.display_name), - description: snapshotString(image.description), + description: snapshotString(image["description"]), }); } @@ -102,7 +97,7 @@ export function toSnapshotVcs( if (!vcsInfo || typeof vcsInfo !== "object") { return null; } - return withoutUndefined({ + return omitUndefined({ repoName: snapshotString(vcsInfo.repo_name), headRef: snapshotString(vcsInfo.head_ref), headSha: snapshotString(vcsInfo.head_sha), diff --git a/packages/mcp-core/src/tools/support/snapshots/summary.ts b/packages/mcp-core/src/tools/support/snapshots/summary.ts index faec82437a..1430da10a2 100644 --- a/packages/mcp-core/src/tools/support/snapshots/summary.ts +++ b/packages/mcp-core/src/tools/support/snapshots/summary.ts @@ -111,8 +111,8 @@ export async function getSnapshotSummary( }: { showUnmodified: boolean; experimentalMode: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; }, ): Promise { const data = (await apiService.getSnapshotDetails({ @@ -121,17 +121,17 @@ export async function getSnapshotSummary( compactMetadata: true, })) as Record; - const allImages = asObjects(data.images); - const changed = asObjects(data.changed); - const renamed = asObjects(data.renamed); - const added = asObjects(data.added); - const removed = asObjects(data.removed); - const errored = asObjects(data.errored); + const allImages = asObjects(data["images"]); + const changed = asObjects(data["changed"]); + const renamed = asObjects(data["renamed"]); + const added = asObjects(data["added"]); + const removed = asObjects(data["removed"]); + const errored = asObjects(data["errored"]); const unchanged = asObjects( - data.unchanged, + data["unchanged"], ); const skipped = asObjects( - data.skipped, + data["skipped"], ); const counts = { @@ -146,8 +146,8 @@ export async function getSnapshotSummary( }; const url = apiService.getPreprodSnapshotUrl(organizationSlug, snapshotId); - const comparisonType = snapshotString(data.comparison_type) ?? null; - const approvalInfo = data.approval_info as + const comparisonType = snapshotString(data["comparison_type"]) ?? null; + const approvalInfo = data["approval_info"] as | { status?: unknown; is_auto_approved?: unknown } | null | undefined; @@ -202,10 +202,10 @@ export async function getSnapshotSummary( snapshotId, url, comparisonType, - state: snapshotString(data.state) ?? null, - projectId: snapshotString(data.project_id) ?? null, + state: snapshotString(data["state"]) ?? null, + projectId: snapshotString(data["project_id"]) ?? null, counts, - vcs: toSnapshotVcs(data.vcs_info as SnapshotVcsInfo | undefined), + vcs: toSnapshotVcs(data["vcs_info"] as SnapshotVcsInfo | undefined), approval: approvalInfo && typeof approvalInfo === "object" ? { diff --git a/packages/mcp-core/src/tools/support/structured-stacktrace.test.ts b/packages/mcp-core/src/tools/support/structured-stacktrace.test.ts index 26453bf4e0..f228f8bccb 100644 --- a/packages/mcp-core/src/tools/support/structured-stacktrace.test.ts +++ b/packages/mcp-core/src/tools/support/structured-stacktrace.test.ts @@ -194,9 +194,9 @@ describe("mapStructuredStacktrace", () => { }); const vars = stacktrace?.frames[0]?.vars; - expect(vars?.count).toBe(50); - expect(vars?.label).toBe("export"); - expect(vars?.rows).toBe(`${JSON.stringify(rows).slice(0, 200)}…`); + expect(vars?.["count"]).toBe(50); + expect(vars?.["label"]).toBe("export"); + expect(vars?.["rows"]).toBe(`${JSON.stringify(rows).slice(0, 200)}…`); }); it("keeps vars on a detail frame that has no line number", () => { diff --git a/packages/mcp-core/src/tools/support/structured-stacktrace.ts b/packages/mcp-core/src/tools/support/structured-stacktrace.ts index 562cbe7d61..59a93b146e 100644 --- a/packages/mcp-core/src/tools/support/structured-stacktrace.ts +++ b/packages/mcp-core/src/tools/support/structured-stacktrace.ts @@ -6,7 +6,7 @@ type Frame = z.infer; type Thread = z.infer; type Stacktrace = { frames: Frame[]; - framesOmitted?: unknown[] | null; + framesOmitted?: unknown[] | null | undefined; }; /** Lines kept on each side of the detail frame's line, as the markdown frame view shows. */ diff --git a/packages/mcp-core/src/tools/support/traces/semantic-display.ts b/packages/mcp-core/src/tools/support/traces/semantic-display.ts index 68f92bcb35..ed1c6f57ba 100644 --- a/packages/mcp-core/src/tools/support/traces/semantic-display.ts +++ b/packages/mcp-core/src/tools/support/traces/semantic-display.ts @@ -575,8 +575,8 @@ function formatHttpLabel({ target, fallbackLabel, }: { - method?: string; - target?: string; + method?: string | undefined; + target?: string | undefined; fallbackLabel: string; }): string { if (method && target) { @@ -624,8 +624,7 @@ function formatHttpTarget(value: string): string { const trimmed = value.trim(); if (!/^[a-z][a-z0-9+.-]*:\/\//i.test(trimmed)) { - const withoutFragment = trimmed.split("#", 1)[0]!; - return withoutFragment.split("?", 1)[0]!; + return stripQueryAndFragment(trimmed); } try { @@ -633,11 +632,16 @@ function formatHttpTarget(value: string): string { const path = url.pathname === "/" ? "" : url.pathname; return `${url.host}${path}`; } catch { - const withoutFragment = trimmed.split("#", 1)[0]!; - return withoutFragment.split("?", 1)[0]!; + return stripQueryAndFragment(trimmed); } } +function stripQueryAndFragment(value: string): string { + const [withoutFragment = ""] = value.split("#", 1); + const [path = ""] = withoutFragment.split("?", 1); + return path; +} + function formatOperationLabel( operation: string, subject: string | undefined, diff --git a/packages/mcp-core/src/tools/types.ts b/packages/mcp-core/src/tools/types.ts index d364bc0c15..e453e93325 100644 --- a/packages/mcp-core/src/tools/types.ts +++ b/packages/mcp-core/src/tools/types.ts @@ -44,7 +44,7 @@ export type ToolOutputSchema = z.ZodType>; * Markdown, strings, and raw MCP content are only allowed without a schema. * Tools without a schema may still pass through another tool's structured * result (`execute_sentry_tool`, `get_sentry_resource`). The type distributes - * over a union so `ToolConfig` registries accept every tool. + * over a union so `ToolConfig` registries accept every tool. */ export type ToolOutputFor = TOutputSchema extends ToolOutputSchema @@ -71,8 +71,8 @@ export type ToolHandler< */ export interface DescriptionContext { experimentalMode: boolean; - availableToolNames?: ReadonlySet; - directToolNames?: ReadonlySet; + availableToolNames?: ReadonlySet | undefined; + directToolNames?: ReadonlySet | undefined; } /** diff --git a/packages/mcp-core/src/transports/stdio.test.ts b/packages/mcp-core/src/transports/stdio.test.ts index 913efd028a..4ed1a3b39a 100644 --- a/packages/mcp-core/src/transports/stdio.test.ts +++ b/packages/mcp-core/src/transports/stdio.test.ts @@ -1,6 +1,14 @@ import type { McpServer } from "@modelcontextprotocol/server"; import { startSpan } from "@sentry/core"; -import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import { + assert, + afterEach, + beforeEach, + describe, + expect, + it, + vi, +} from "vitest"; import { LIB_VERSION, setServerVersion } from "../version"; import { startStdio } from "./stdio"; @@ -17,7 +25,9 @@ const server = { async function spanAttributes(context: Parameters[1]) { await startStdio(server, context); - const [options] = vi.mocked(startSpan).mock.calls[0]!; + const [call] = vi.mocked(startSpan).mock.calls; + assert(call, "startSpan was not called"); + const [options] = call; return options.attributes; } diff --git a/packages/mcp-core/src/utils/url-utils.ts b/packages/mcp-core/src/utils/url-utils.ts index 8a5bcdf9dc..3fb5c07031 100644 --- a/packages/mcp-core/src/utils/url-utils.ts +++ b/packages/mcp-core/src/utils/url-utils.ts @@ -18,35 +18,35 @@ export type ExploreMode = "aggregate" | "samples"; export interface TraceMetricIdentifier { name: string; type: string; - unit?: string; + unit?: string | undefined; } export interface TraceMetricsExplorerUrlOptions { query: string; - projectId?: string; - statsPeriod?: string; - start?: string; - end?: string; - sort?: string; - aggregateFunctions?: string[]; - groupByFields?: string[]; + projectId?: string | undefined; + statsPeriod?: string | undefined; + start?: string | undefined; + end?: string | undefined; + sort?: string | undefined; + aggregateFunctions?: string[] | undefined; + groupByFields?: string[] | undefined; traceMetrics?: TraceMetricIdentifier[]; } export interface ProfilesExplorerUrlOptions { query: string; - projectId?: string; - statsPeriod?: string; - start?: string; - end?: string; - sort?: string; - fields?: string[]; - aggregateFunctions?: string[]; - groupByFields?: string[]; + projectId?: string | undefined; + statsPeriod?: string | undefined; + start?: string | undefined; + end?: string | undefined; + sort?: string | undefined; + fields?: string[] | undefined; + aggregateFunctions?: string[] | undefined; + groupByFields?: string[] | undefined; } export interface DashboardUrlOptions { - projectId?: string | number | null; + projectId?: string | number | null | undefined; statsPeriod?: string | null; } @@ -99,20 +99,17 @@ function extractTraceMetricFromAggregate( return null; } - const args = match[1]! + const args = (match[1] ?? "") .split(",") .map((arg) => arg.trim()) .filter((arg) => arg.length > 0); - if (args.length < 4) { + const [, name, type, unit] = args; + if (name === undefined || type === undefined || unit === undefined) { return null; } - return normalizeTraceMetric({ - name: args[1]!, - type: args[2]!, - unit: args[3]!, - }); + return normalizeTraceMetric({ name, type, unit }); } function extractTraceMetricFromQuery( @@ -517,9 +514,9 @@ export function getReplaysSearchUrl( host: string, organizationSlug: string, options: { - query?: string | null; - projectSlugOrId?: string; - environment?: string | string[] | null; + query?: string | null | undefined; + projectSlugOrId?: string | undefined; + environment?: string | string[] | null | undefined; sort?: string | null; statsPeriod?: string | null; start?: string | null; @@ -669,13 +666,14 @@ export function extractConversationIdFromSearchQuery( } const pattern = /gen_ai\.conversation\.id:(?:"([^"]+)"|([^\s)]+))/g; - const [match, ...otherMatches] = query.matchAll(pattern); - if (match === undefined || otherMatches.length > 0) { + const matches = [...query.matchAll(pattern)]; + const [match] = matches; + if (matches.length !== 1 || !match) { return undefined; } - const conversationId = match[1] ?? match[2]!; - if (conversationId.startsWith("[")) { + const conversationId = match[1] ?? match[2]; + if (conversationId === undefined || conversationId.startsWith("[")) { return undefined; } @@ -689,12 +687,12 @@ export function getAIConversationsUrl( host: string, organizationSlug: string, options: { - query?: string; - project?: string[]; - environment?: string | string[]; - statsPeriod?: string; - start?: string; - end?: string; + query?: string | undefined; + project?: string[] | undefined; + environment?: string | string[] | undefined; + statsPeriod?: string | undefined; + start?: string | undefined; + end?: string | undefined; } = {}, protocol: SentryProtocol = "https", ): string { diff --git a/packages/mcp-core/src/version.ts b/packages/mcp-core/src/version.ts index eba47fe325..f20841f32e 100644 --- a/packages/mcp-core/src/version.ts +++ b/packages/mcp-core/src/version.ts @@ -1,5 +1,5 @@ export const LIB_VERSION = - (typeof process !== "undefined" && process.env.npm_package_version) || + (typeof process !== "undefined" && process.env["npm_package_version"]) || "0.0.0"; let hostVersion: string | undefined; diff --git a/packages/mcp-core/tsdown.config.ts b/packages/mcp-core/tsdown.config.ts index 20d8d1a2a6..ab6a96b13f 100644 --- a/packages/mcp-core/tsdown.config.ts +++ b/packages/mcp-core/tsdown.config.ts @@ -1,23 +1,41 @@ import { readFileSync } from "node:fs"; import { defineConfig } from "tsdown"; +function readPackageVersion(): string { + const packageJson: unknown = JSON.parse( + readFileSync("./package.json", "utf-8"), + ); + if ( + typeof packageJson !== "object" || + packageJson === null || + !("version" in packageJson) || + typeof packageJson.version !== "string" + ) { + throw new Error("package.json has no version"); + } + return packageJson.version; +} + const packageVersion = - process.env.npm_package_version ?? - JSON.parse(readFileSync("./package.json", "utf-8")).version; + process.env["npm_package_version"] ?? readPackageVersion(); export default defineConfig({ entry: ["src/**/*.ts", "!src/**/*.test.ts"], // ESM only: the package is private and every export points at .js. format: ["esm"], + // Package exports name `.js` and `.d.ts` files. + fixedExtension: false, dts: true, // Generate declaration file (.d.ts) sourcemap: true, clean: true, - external: [ - // Sentry 11 exposes MCP instrumentation only from this server subpath. - "@sentry/core/server", - // Keep workspace dependencies external (don't bundle them) - "@sentry/mcp-server-mocks", - ], + deps: { + neverBundle: [ + // Sentry 11 exposes MCP instrumentation only from this server subpath. + "@sentry/core/server", + // Keep workspace dependencies external (don't bundle them) + "@sentry/mcp-server-mocks", + ], + }, env: { SENTRY_ENVIRONMENT: "stdio", SENTRY_RELEASE: packageVersion, From fccb78fb14f294910dabe7370323ea88365884db Mon Sep 17 00:00:00 2001 From: "sentry-junior[bot]" <264270552+sentry-junior[bot]@users.noreply.github.com> Date: Sat, 14 Nov 2026 17:23:57 +0000 Subject: [PATCH 12/18] ref(mcp-cloudflare): Satisfy the strict policy and safety rules Co-Authored-By: Joshua Li <14209781+joshuarli@users.noreply.github.com> --- .../client/components/animation/DataWire.tsx | 12 ++- .../animation/TerminalAnimation.tsx | 37 ++++---- .../animation/browser-ui/IssueDetails.tsx | 8 +- .../animation/browser-ui/LoadingSquares.tsx | 3 +- .../animation/browser-ui/RootCause.tsx | 29 +++--- .../animation/browser-ui/WindowHeader.tsx | 2 +- .../animation/browser-ui/keys-copy.tsx | 8 +- .../animation/terminal-ui/SpeedDisplay.tsx | 2 +- .../animation/terminal-ui/keys-paste.tsx | 8 +- .../src/client/components/chat/chat-input.tsx | 7 +- .../client/components/chat/chat-message.tsx | 29 ++++-- .../client/components/chat/chat-messages.tsx | 38 ++++---- .../src/client/components/chat/chat-ui.tsx | 11 +-- .../src/client/components/chat/chat.tsx | 19 ++-- .../src/client/components/chat/types.ts | 90 +++++++++++++------ .../components/fragments/install-tabs.tsx | 4 +- .../components/home-layout/sidebars.tsx | 4 +- .../src/client/components/ui/code-snippet.tsx | 4 +- .../src/client/components/ui/icon.tsx | 2 +- .../components/ui/interactive-markdown.tsx | 4 +- .../components/ui/json-schema-params.tsx | 35 ++++---- .../src/client/components/ui/markdown.tsx | 2 +- .../components/ui/slash-command-text.tsx | 2 +- .../client/components/ui/template-vars.tsx | 2 +- .../src/client/components/ui/tool-actions.tsx | 2 +- .../client/components/usecases/fix-bugs.tsx | 2 +- .../src/client/contexts/auth-context.tsx | 24 ++--- .../src/client/hooks/use-mcp-metadata.ts | 46 +++++----- .../src/client/hooks/use-persisted-chat.ts | 12 +-- .../mcp-cloudflare/src/client/instrument.ts | 4 +- packages/mcp-cloudflare/src/client/main.tsx | 28 +++++- .../client/react-css-custom-properties.d.ts | 9 ++ .../src/client/utils/chat-error-handler.ts | 10 ++- .../mcp-cloudflare/src/client/vite-env.d.ts | 6 ++ .../mcp-cloudflare/src/homepage-content.ts | 1 + .../mcp-cloudflare/src/server/app.test.ts | 26 +++--- packages/mcp-cloudflare/src/server/app.ts | 2 +- .../server/authorization-server-metadata.ts | 3 +- .../mcp-cloudflare/src/server/index.test.ts | 48 +++++----- packages/mcp-cloudflare/src/server/index.ts | 5 +- .../src/server/lib/approval-dialog.test.ts | 48 +++++++--- .../src/server/lib/approval-dialog.ts | 84 +++++++++++------ .../src/server/lib/constraint-utils.test.ts | 32 ++++--- .../src/server/lib/constraint-utils.ts | 11 ++- .../src/server/lib/mcp-handler.test.ts | 62 +++++++------ .../src/server/lib/mcp-handler.ts | 37 ++++---- .../mcp-cloudflare/src/server/mcp.test.ts | 34 +++---- packages/mcp-cloudflare/src/server/metrics.ts | 10 +-- .../src/server/oauth/callback.test.ts | 51 ++++++----- .../oauth/client-metadata.integration.test.ts | 12 +-- .../src/server/oauth/helpers.test.ts | 12 ++- .../src/server/oauth/helpers.ts | 37 ++++---- .../src/server/oauth/resource-scope.test.ts | 29 ++++++ .../src/server/oauth/resource-scope.ts | 7 +- .../src/server/oauth/routes/authorize.ts | 11 +-- .../src/server/oauth/routes/callback.ts | 2 +- .../mcp-cloudflare/src/server/oauth/state.ts | 7 +- .../src/server/oauth/telemetry.ts | 24 ++--- .../server/routes/__tests__/api-auth.test.ts | 10 +-- .../api-metadata.integration.test.ts | 14 +-- .../routes/__tests__/api-metadata.test.ts | 2 +- .../routes/__tests__/api-search.test.ts | 4 +- .../routes/__tests__/mcp-discovery.test.ts | 16 ++-- .../src/server/routes/chat-oauth.ts | 4 +- .../src/server/routes/chat.env.test.ts | 54 +++++------ .../mcp-cloudflare/src/server/routes/chat.ts | 34 +++---- .../src/server/routes/metadata.ts | 5 +- .../src/server/routes/search.test.ts | 18 ++-- .../src/server/routes/search.ts | 49 +++++----- .../src/server/sentry.config.test.ts | 2 +- .../src/server/sentry.config.ts | 2 +- packages/mcp-cloudflare/src/server/types.ts | 3 +- .../src/server/utils/auth-errors.ts | 2 +- .../src/test-utils/fetch-mock-setup.ts | 46 +++++----- packages/mcp-cloudflare/vite.config.ts | 6 +- 75 files changed, 797 insertions(+), 574 deletions(-) create mode 100644 packages/mcp-cloudflare/src/client/react-css-custom-properties.d.ts create mode 100644 packages/mcp-cloudflare/src/server/oauth/resource-scope.test.ts diff --git a/packages/mcp-cloudflare/src/client/components/animation/DataWire.tsx b/packages/mcp-cloudflare/src/client/components/animation/DataWire.tsx index 1745ce7881..00370766c0 100644 --- a/packages/mcp-cloudflare/src/client/components/animation/DataWire.tsx +++ b/packages/mcp-cloudflare/src/client/components/animation/DataWire.tsx @@ -32,13 +32,11 @@ export default function DataWire({ direction === "rtl" ? "wire-rtl" : "", className, ].join(" ")} - style={ - { - "--period": `${periodSec}s`, - "--pulse-w": `${pulseWidthPct}%`, - "--delay": `${delaySec}s`, - } as React.CSSProperties - } + style={{ + "--period": `${periodSec}s`, + "--pulse-w": `${pulseWidthPct}%`, + "--delay": `${delaySec}s`, + }} /> ); } diff --git a/packages/mcp-cloudflare/src/client/components/animation/TerminalAnimation.tsx b/packages/mcp-cloudflare/src/client/components/animation/TerminalAnimation.tsx index c8308c7171..66d0bf56a1 100644 --- a/packages/mcp-cloudflare/src/client/components/animation/TerminalAnimation.tsx +++ b/packages/mcp-cloudflare/src/client/components/animation/TerminalAnimation.tsx @@ -2,7 +2,7 @@ import "asciinema-player/dist/bundle/asciinema-player.css"; import "./dracula.css"; -import type { Marker } from "asciinema-player"; +import type { Marker, Player } from "asciinema-player"; import { useCallback, useEffect, useRef, useState } from "react"; import BrowserAnimation from "./BrowserAnimation"; import KeysPaste from "./terminal-ui/keys-paste"; @@ -89,7 +89,7 @@ const steps: [Step, ...Step[]] = [ ]; export default function TerminalAnimation() { - const playerRef = useRef(null); + const playerRef = useRef(null); const cliDemoRef = useRef(null); const autoContinueTimerRef = useRef | null>( @@ -118,8 +118,10 @@ export default function TerminalAnimation() { clearAllTimers(); try { const p = playerRef.current; - p?.pause?.(); - p?.dispose?.(); + if (p) { + void p.pause(); + p.dispose(); + } } catch {} playerRef.current = null; try { @@ -143,8 +145,8 @@ export default function TerminalAnimation() { setSpeed(newSpeed); try { - p.pause?.(); - p.seek?.(step.startTime + (isFastStep ? 87 : OFFSET)); // skip 87 seconds fakes a 30x speedup + void p.pause(); + void p.seek(step.startTime + (isFastStep ? 87 : OFFSET)); // skip 87 seconds fakes a 30x speedup } catch (err) { console.error("[TerminalAnimation] gotoStep seek failed", { stepIndex: idx, @@ -164,12 +166,12 @@ export default function TerminalAnimation() { if (mobile) { try { - p.play?.(); + void p.play(); } catch {} } else if (step.pauseMs) { autoContinueTimerRef.current = setTimeout(() => { try { - p.play?.(); + void p.play(); } catch {} }, step.pauseMs); } @@ -188,9 +190,11 @@ export default function TerminalAnimation() { if (playerRef.current) return; try { + // Older browsers and test DOMs do not implement matchMedia. + const matchMedia: typeof window.matchMedia | undefined = + typeof window !== "undefined" ? window.matchMedia : undefined; isMobileRef.current = - (typeof window !== "undefined" && - window.matchMedia?.("(hover: none)")?.matches) || + matchMedia?.call(window, "(hover: none)").matches || (typeof window !== "undefined" && window.innerWidth < 768); } catch { isMobileRef.current = false; @@ -211,8 +215,7 @@ export default function TerminalAnimation() { rows: Math.max( 1, Math.floor( - ((cliDemoRef.current?.getBoundingClientRect().height ?? 0) - 18) / - 16.82, // line-height + (cliDemoRef.current.getBoundingClientRect().height - 18) / 16.82, // line-height ), ), // -18 for 9px border on
 for terminal output
         // NOTE: fits cols to container width (which is extended to 200% on mobile for optimal font-size result), or rows (specified above) to container height by decreasing the font size (note below)
@@ -236,7 +239,7 @@ export default function TerminalAnimation() {
     playerRef.current = player;
 
     // Listen to marker events from the player
-    player.addEventListener("marker", (event: any) => {
+    player.addEventListener("marker", (event) => {
       const { index } = event;
       if (!isManualSeekRef.current) {
         handleMarkerReached(index);
@@ -253,15 +256,15 @@ export default function TerminalAnimation() {
     setCurrentIndex(-1);
 
     try {
-      p.pause?.();
-      p.seek?.(steps[0].startTime - OFFSET);
+      void p.pause();
+      void p.seek(steps[0].startTime - OFFSET);
       setSpeed(3);
     } catch {}
 
     // Start from the first marker
     setTimeout(() => {
       try {
-        p.play?.();
+        void p.play();
       } catch {}
     }, 100);
   }, [clearAllTimers]);
@@ -276,7 +279,7 @@ export default function TerminalAnimation() {
       setTimeout(() => {
         const p = playerRef.current;
         try {
-          p?.play?.();
+          if (p) void p.play();
         } catch {}
       }, 100);
     })();
diff --git a/packages/mcp-cloudflare/src/client/components/animation/browser-ui/IssueDetails.tsx b/packages/mcp-cloudflare/src/client/components/animation/browser-ui/IssueDetails.tsx
index f964aa4853..b11ad387b8 100644
--- a/packages/mcp-cloudflare/src/client/components/animation/browser-ui/IssueDetails.tsx
+++ b/packages/mcp-cloudflare/src/client/components/animation/browser-ui/IssueDetails.tsx
@@ -24,7 +24,7 @@ export default function IssueDetails({ step }: { step: number }) {
                 ? "motion-reduce:opacity-0 motion-reduce:duration-1000 motion-reduce:delay-800 motion-reduce:!animate-none animate-issue-context opacity-30"
                 : "opacity-0"
             } pb-4 rounded-xl absolute inset-0 border border-white/20 bg-pink-900 text-pink100`}
-            style={{ ["--delay" as any]: "0.8s" }}
+            style={{ "--delay": "0.8s" }}
           >
             
@@ -34,7 +34,7 @@ export default function IssueDetails({ step }: { step: number }) { ? "motion-reduce:opacity-0 motion-reduce:duration-1000 motion-reduce:delay-1000 motion-reduce:!animate-none animate-issue-context opacity-30" : "opacity-0" } pb-4 rounded-xl absolute inset-0 border border-white/20 bg-pink-900 text-pink100`} - style={{ ["--delay" as any]: "1s" }} + style={{ "--delay": "1s" }} >
@@ -44,7 +44,7 @@ export default function IssueDetails({ step }: { step: number }) { ? "motion-reduce:opacity-0 motion-reduce:duration-1000 motion-reduce:delay-1200 motion-reduce:!animate-none animate-issue-context opacity-30" : "opacity-0" } pb-4 rounded-xl absolute inset-0 border border-white/20 bg-pink-900 text-pink100`} - style={{ ["--delay" as any]: "1.2s" }} + style={{ "--delay": "1.2s" }} >
@@ -56,7 +56,7 @@ export default function IssueDetails({ step }: { step: number }) { ? "opacity-0" : "opacity-100" } pb-4 rounded-xl border border-white/20 bg-pink-900 text-pink100`} - style={{ ["--delay" as any]: "0.675s" }} + style={{ "--delay": "0.675s" }} >
diff --git a/packages/mcp-cloudflare/src/client/components/animation/browser-ui/LoadingSquares.tsx b/packages/mcp-cloudflare/src/client/components/animation/browser-ui/LoadingSquares.tsx
index 57e42c4c23..28e9e76d8d 100644
--- a/packages/mcp-cloudflare/src/client/components/animation/browser-ui/LoadingSquares.tsx
+++ b/packages/mcp-cloudflare/src/client/components/animation/browser-ui/LoadingSquares.tsx
@@ -171,7 +171,8 @@ export default function LoadingSquares({
   }
 
   useEffect(() => {
-    const canvas = canvasRef.current!;
+    const canvas = canvasRef.current;
+    if (!canvas) return;
     const start = () => {
       if (runningRef.current) return;
       setupGrid(canvas);
diff --git a/packages/mcp-cloudflare/src/client/components/animation/browser-ui/RootCause.tsx b/packages/mcp-cloudflare/src/client/components/animation/browser-ui/RootCause.tsx
index c9ee1e33bd..bff5a69ab0 100644
--- a/packages/mcp-cloudflare/src/client/components/animation/browser-ui/RootCause.tsx
+++ b/packages/mcp-cloudflare/src/client/components/animation/browser-ui/RootCause.tsx
@@ -12,6 +12,7 @@ export default function RootCause({ step }: { step: number }) {
       const t = setTimeout(() => setStarted(true), 0);
       return () => clearTimeout(t);
     }
+    return undefined;
   }, [step]);
 
   const orange = "#ff8904";
@@ -171,21 +172,19 @@ export default function RootCause({ step }: { step: number }) {
             }}
           >
             
               {displayedChar}
             
diff --git a/packages/mcp-cloudflare/src/client/components/animation/browser-ui/WindowHeader.tsx b/packages/mcp-cloudflare/src/client/components/animation/browser-ui/WindowHeader.tsx
index 8881ae3d93..57acc8b3ac 100644
--- a/packages/mcp-cloudflare/src/client/components/animation/browser-ui/WindowHeader.tsx
+++ b/packages/mcp-cloudflare/src/client/components/animation/browser-ui/WindowHeader.tsx
@@ -48,7 +48,7 @@ export default function WindowHeader({
         className={`mx-auto flex items-center ${
           ide && "justify-center"
         } h-8 w-full max-w-1/2 cursor-pointer gap-2 rounded-xl border border-white/20 bg-white/5 p-3 duration-200 hover:bg-white/10 active:bg-white/50 active:duration-75`}
-        style={{ ["--delay" as any]: "0.45s" }}
+        style={{ "--delay": "0.45s" }}
       >
         {!ide && }
         {ide && }
diff --git a/packages/mcp-cloudflare/src/client/components/animation/browser-ui/keys-copy.tsx b/packages/mcp-cloudflare/src/client/components/animation/browser-ui/keys-copy.tsx
index 756e7bb2b9..ed5194ebd4 100644
--- a/packages/mcp-cloudflare/src/client/components/animation/browser-ui/keys-copy.tsx
+++ b/packages/mcp-cloudflare/src/client/components/animation/browser-ui/keys-copy.tsx
@@ -5,7 +5,7 @@ export default function KeysCopy({ step }: { step?: number }) {
         className={`${
           step === 0 && "animate-keycap"
         } relative size-fit opacity-0 translate-x-8 -translate-y-4`}
-        style={{ ["--delay" as any]: "1.00s" }}
+        style={{ "--delay": "1.00s" }}
       >
         {/* 
*/}
@@ -17,7 +17,7 @@ export default function KeysCopy({ step }: { step?: number }) { src="/keycap-⌘.png" draggable={false} alt="keycap-⌘" - style={{ ["--delay" as any]: "1.20s" }} + style={{ "--delay": "1.20s" }} />
@@ -26,7 +26,7 @@ export default function KeysCopy({ step }: { step?: number }) { className={`${ step === 0 && "animate-keycap" } relative size-fit opacity-0 -translate-x-8 translate-y-4`} - style={{ ["--delay" as any]: "1.15s" }} + style={{ "--delay": "1.15s" }} > {/*
*/}
@@ -38,7 +38,7 @@ export default function KeysCopy({ step }: { step?: number }) { src="/keycap-c.png" draggable={false} alt="keycap-c" - style={{ ["--delay" as any]: "1.35s" }} + style={{ "--delay": "1.35s" }} />
diff --git a/packages/mcp-cloudflare/src/client/components/animation/terminal-ui/SpeedDisplay.tsx b/packages/mcp-cloudflare/src/client/components/animation/terminal-ui/SpeedDisplay.tsx index 6679e440f0..9fb1ccd5d8 100644 --- a/packages/mcp-cloudflare/src/client/components/animation/terminal-ui/SpeedDisplay.tsx +++ b/packages/mcp-cloudflare/src/client/components/animation/terminal-ui/SpeedDisplay.tsx @@ -29,7 +29,7 @@ export default function SpeedDisplay({ className={`absolute top-6 right-4 sm:top-8 sm:right-10 z-20 flex items-center font-bold text-xl sm:text-3xl opacity-50 ${ animate ? "speed-animate" : "" } ${className}`} - style={{ ["--speed-pop-dur" as any]: `${durationMs}ms` }} + style={{ "--speed-pop-dur": `${durationMs}ms` }} >
sped up diff --git a/packages/mcp-cloudflare/src/client/components/animation/terminal-ui/keys-paste.tsx b/packages/mcp-cloudflare/src/client/components/animation/terminal-ui/keys-paste.tsx index e8f541fa20..6074885362 100644 --- a/packages/mcp-cloudflare/src/client/components/animation/terminal-ui/keys-paste.tsx +++ b/packages/mcp-cloudflare/src/client/components/animation/terminal-ui/keys-paste.tsx @@ -5,7 +5,7 @@ export default function KeysPaste({ step }: { step?: number }) { className={`${ step === 0 && "animate-keycap" } relative size-fit opacity-0 translate-x-8 -translate-y-4`} - style={{ ["--delay" as any]: "1.75s" }} + style={{ "--delay": "1.75s" }} > {/*
*/}
@@ -17,7 +17,7 @@ export default function KeysPaste({ step }: { step?: number }) { src="/keycap-⌘.png" draggable={false} alt="keycap-⌘" - style={{ ["--delay" as any]: "2.05s" }} + style={{ "--delay": "2.05s" }} />
@@ -26,7 +26,7 @@ export default function KeysPaste({ step }: { step?: number }) { className={`${ step === 0 && "animate-keycap" } relative size-fit opacity-0 -translate-x-8 translate-y-4`} - style={{ ["--delay" as any]: "2.00s" }} + style={{ "--delay": "2.00s" }} > {/*
*/}
@@ -38,7 +38,7 @@ export default function KeysPaste({ step }: { step?: number }) { src="/keycap-v.png" draggable={false} alt="keycap-v" - style={{ ["--delay" as any]: "2.30s" }} + style={{ "--delay": "2.30s" }} />
diff --git a/packages/mcp-cloudflare/src/client/components/chat/chat-input.tsx b/packages/mcp-cloudflare/src/client/components/chat/chat-input.tsx index 26db5c53ec..8b3c90cc0d 100644 --- a/packages/mcp-cloudflare/src/client/components/chat/chat-input.tsx +++ b/packages/mcp-cloudflare/src/client/components/chat/chat-input.tsx @@ -9,7 +9,7 @@ interface ChatInputProps { onInputChange: (e: React.ChangeEvent) => void; onSubmit: (e: React.FormEvent) => void; onStop: () => void; - onSlashCommand?: (command: string) => void; + onSlashCommand?: ((command: string) => void) | undefined; } export function ChatInput({ @@ -37,6 +37,7 @@ export function ChatInput({ }, 600); // Delay to account for 500ms animation return () => clearTimeout(timer); } + return undefined; }, [isOpen]); // Re-focus when loading finishes @@ -81,9 +82,7 @@ export function ChatInput({ // Move cursor after the inserted newline setTimeout(() => { - if (textarea) { - textarea.selectionStart = textarea.selectionEnd = start + 1; - } + textarea.selectionStart = textarea.selectionEnd = start + 1; }, 0); return; } diff --git a/packages/mcp-cloudflare/src/client/components/chat/chat-message.tsx b/packages/mcp-cloudflare/src/client/components/chat/chat-message.tsx index f0b79fa612..2aebf6a874 100644 --- a/packages/mcp-cloudflare/src/client/components/chat/chat-message.tsx +++ b/packages/mcp-cloudflare/src/client/components/chat/chat-message.tsx @@ -82,7 +82,7 @@ const TextPart = memo(function TextPart({ const shouldAnimate = (isAssistant && isStreaming) || (role === "system" && isStreaming && messageData?.simulateStreaming); - const hasSlashCommands = messageData?.hasSlashCommands; + const hasSlashCommands = messageData?.hasSlashCommands ?? false; return (
@@ -131,8 +131,17 @@ const isToolPart = (part: { type: string; }): part is { type: `tool-${string}`; -} & ChatToolInvocation => { - return part.type.startsWith("tool-") && part.type !== "tool-invocation"; + toolCallId: string; + state?: unknown; + input?: unknown; + output?: unknown; +} => { + return ( + part.type.startsWith("tool-") && + part.type !== "tool-invocation" && + "toolCallId" in part && + typeof part.toolCallId === "string" + ); }; // Helper to check if a part is a legacy tool-invocation part (AI SDK 4/5 format) @@ -146,10 +155,14 @@ const isLegacyToolInvocation = (part: { return ( part.type === "tool-invocation" && "toolInvocation" in part && - typeof (part as any).toolInvocation === "object" + typeof part.toolInvocation === "object" && + part.toolInvocation !== null ); }; +const isToolInput = (input: unknown): input is Record => + typeof input === "object" && input !== null && !Array.isArray(input); + // Helper to convert tool output to proper content format const convertToolOutput = ( output: unknown, @@ -215,7 +228,8 @@ const MessagePart = memo(function MessagePart({ // Handle tool parts (AI SDK 6 format: type is "tool-${toolName}") if (isToolPart(part)) { // Map AI SDK 6 state to our ChatToolInvocation state - const partState = (part as any).state; + // Persisted messages can carry states from older AI SDK versions. + const partState: unknown = part.state; const mappedState: "partial-call" | "call" | "result" = partState === "result" ? "result" @@ -224,12 +238,13 @@ const MessagePart = memo(function MessagePart({ : "call"; // Convert AI SDK 6 tool part to our ChatToolInvocation format + const result = convertToolOutput(part.output); const toolInvocation: ChatToolInvocation = { toolCallId: part.toolCallId, toolName: part.type.replace(/^tool-/, ""), - args: (part as any).input ?? {}, + args: isToolInput(part.input) ? part.input : {}, state: mappedState, - result: convertToolOutput((part as any).output), + ...(result && { result }), }; return ( boolean, ): ProcessedMessagePart[] { const allParts: ProcessedMessagePart[] = []; @@ -25,7 +28,7 @@ function processMessages( const isLastMessage = messageIndex === lastMessageIndex; // Handle messages with parts array - if (message.parts && message.parts.length > 0) { + if (message.parts.length > 0) { const lastPartIndex = message.parts.length - 1; message.parts.forEach( @@ -56,7 +59,6 @@ function processMessages( export function ChatMessages({ messages, isChatLoading, - isLocalStreaming, isMessageStreaming, error, onRetry, @@ -65,14 +67,8 @@ export function ChatMessages({ const { handleOAuthLogin } = useAuth(); const processedParts = useMemo( - () => - processMessages( - messages, - isChatLoading, - isLocalStreaming, - isMessageStreaming, - ), - [messages, isChatLoading, isLocalStreaming, isMessageStreaming], + () => processMessages(messages, isChatLoading, isMessageStreaming), + [messages, isChatLoading, isMessageStreaming], ); // Simple error handling - just check if it's auth or not @@ -115,11 +111,11 @@ export function ChatMessages({ const originalMessage = messages.find( (m) => m.id === item.messageId, ); - const messageData = originalMessage?.metadata as any; - const hasToolActions = - messageData?.type === "tools-list" && - messageData?.toolsDetailed && - Array.isArray(messageData.toolsDetailed); + const messageData = readChatMessageData(originalMessage?.metadata); + const toolActions = + messageData?.type === "tools-list" + ? messageData.toolsDetailed + : undefined; return (
@@ -129,15 +125,15 @@ export function ChatMessages({ messageRole={item.messageRole} partIndex={item.partIndex} isStreaming={item.isStreaming} - messageData={originalMessage?.metadata} + messageData={messageData} onSlashCommand={onSlashCommand} /> {/* Show tool actions list for tools-list messages */} - {hasToolActions && + {toolActions && item.partIndex === - (originalMessage?.parts?.length ?? 1) - 1 && ( + (originalMessage?.parts.length ?? 1) - 1 && (
- +
)}
diff --git a/packages/mcp-cloudflare/src/client/components/chat/chat-ui.tsx b/packages/mcp-cloudflare/src/client/components/chat/chat-ui.tsx index 8993a12ad6..8b676fc15b 100644 --- a/packages/mcp-cloudflare/src/client/components/chat/chat-ui.tsx +++ b/packages/mcp-cloudflare/src/client/components/chat/chat-ui.tsx @@ -30,16 +30,15 @@ const SAMPLE_PROMPTS = [ interface ChatUIProps { messages: UIMessage[]; input: string; - error?: Error | null; + error?: Error | undefined; isChatLoading: boolean; - isLocalStreaming?: boolean; - isMessageStreaming?: (messageId: string) => boolean; + isMessageStreaming?: ((messageId: string) => boolean) | undefined; isOpen?: boolean; onInputChange: (e: React.ChangeEvent) => void; onSubmit: (e: React.FormEvent) => void; onStop?: () => void; - onRetry?: () => void; - onSlashCommand?: (command: string) => void; + onRetry?: (() => void) | undefined; + onSlashCommand?: ((command: string) => void) | undefined; onSendPrompt?: (prompt: string) => void; } @@ -48,7 +47,6 @@ export const ChatUI = ({ input, error, isChatLoading, - isLocalStreaming, isMessageStreaming, isOpen = true, onInputChange, @@ -70,7 +68,6 @@ export const ChatUI = ({ Logout - {isAuthenticated && onLogout ? ( + {isAuthenticated ? (