Skip to content

Commit cb892f2

Browse files
test(core): narrow with assert helpers for linear test bodies
Co-authored-by: Cursor <[email protected]>
1 parent 60e29b3 commit cb892f2

3 files changed

Lines changed: 31 additions & 22 deletions

File tree

‎packages/core/test/lib/assert.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import { expect } from "bun:test"
2+
3+
/** Runtime expect + TypeScript narrow — keeps test bodies linear. */
4+
export function assertDefined<T>(value: T | null | undefined): asserts value is T {
5+
expect(value).toBeDefined()
6+
}
7+
8+
/** Narrow a `{ type }` discriminated union after asserting the tag. */
9+
export function assertTag<const T extends string, A extends { type: string }>(
10+
value: A,
11+
type: T,
12+
): asserts value is Extract<A, { type: T }> {
13+
expect(value.type).toBe(type)
14+
}

‎packages/core/test/session-pending-attachments.test.ts‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { SessionProjector } from "@opencode-ai/core/session/projector"
1515
import { SessionSchema } from "@opencode-ai/core/session/schema"
1616
import { SessionMessage } from "@opencode-ai/core/session/message"
1717
import { SessionTable } from "@opencode-ai/core/session/sql"
18+
import { assertDefined, assertTag } from "./lib/assert"
1819
import { testEffect } from "./lib/effect"
1920

2021
const it = testEffect(AppNodeBuilder.build(LayerNode.group([Database.node, EventV2.node, SessionProjector.node])))
@@ -77,16 +78,16 @@ describe("SessionPending attachment bounding", () => {
7778
.pipe(Effect.orDie)
7879
expect(rows).toHaveLength(1)
7980
const eventData = Schema.decodeUnknownSync(SessionEvent.InputAdmitted.data)(rows[0]!.data)
80-
expect(eventData.payloadHash).toBeDefined()
81-
expect(eventData.input.type).toBe("user")
82-
if (eventData.input.type !== "user") throw new Error("Expected user input on admitted event")
81+
assertDefined(eventData.payloadHash)
82+
assertTag(eventData.input, "user")
8383
expect(eventData.input.data.files?.[0]?.data).toBe("")
8484
expect(JSON.stringify(eventData).includes(mega)).toBe(false)
8585

8686
const pending = yield* SessionPending.list(db, sessionID)
8787
const row = pending.find((item) => item.id === inputID)
88-
expect(row?.type).toBe("user")
89-
if (row?.type === "user") expect(row.data.files?.[0]?.data).toBe(mega)
88+
assertDefined(row)
89+
assertTag(row, "user")
90+
expect(row.data.files?.[0]?.data).toBe(mega)
9091
}),
9192
)
9293

@@ -107,12 +108,10 @@ describe("SessionPending attachment bounding", () => {
107108
],
108109
},
109110
})
110-
expect(stripped.type).toBe("user")
111-
if (stripped.type === "user") {
112-
expect(stripped.data.text).toBe("hi")
113-
expect(stripped.data.files?.[0]?.data).toBe("")
114-
expect(stripped.data.files?.[0]?.name).toBe("a.txt")
115-
}
111+
assertTag(stripped, "user")
112+
expect(stripped.data.text).toBe("hi")
113+
expect(stripped.data.files?.[0]?.data).toBe("")
114+
expect(stripped.data.files?.[0]?.name).toBe("a.txt")
116115
}),
117116
)
118117

@@ -160,8 +159,7 @@ describe("SessionPending attachment bounding", () => {
160159
expect(rows).toHaveLength(1)
161160
const eventData = Schema.decodeUnknownSync(SessionEvent.InputAdmitted.data)(rows[0]!.data)
162161
expect(eventData.payloadHash).toBeUndefined()
163-
expect(eventData.input.type).toBe("user")
164-
if (eventData.input.type !== "user") throw new Error("Expected user input on admitted event")
162+
assertTag(eventData.input, "user")
165163
expect(eventData.input.data.text).toBe("hello")
166164
}),
167165
)

‎packages/core/test/session-runner-tool-events.test.ts‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { ModelV2 } from "@opencode-ai/core/model"
1111
import { ProviderV2 } from "@opencode-ai/core/provider"
1212
import { createLLMEventPublisher } from "@opencode-ai/core/session/runner/publish-llm-event"
1313
import { ToolPayload } from "@opencode-ai/core/session/tool-payload"
14+
import { assertDefined } from "./lib/assert"
1415

1516
const sessionID = SessionV2.ID.make("ses_tool_event_test")
1617
const base64 = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAAB"
@@ -78,15 +79,13 @@ test("local tool success stores media in the payload blob and omits base64 from
7879
await Effect.runPromise(publisher.publish(result))
7980

8081
const success = published.find((event) => event.type === "session.tool.success.1")
81-
expect(success).toBeDefined()
82-
if (!success) throw new Error("Expected session.tool.success.1")
82+
assertDefined(success)
8383
const data = Schema.decodeUnknownSync(SessionEvent.Tool.Success.data)(success.data)
84-
expect(data.payloadHash).toBeDefined()
84+
assertDefined(data.payloadHash)
8585
expect(JSON.stringify(success).includes(base64)).toBe(false)
8686
expect(success.data).not.toHaveProperty("result")
8787
expect(data.content).toEqual([{ type: "text", text: "Image read successfully" }])
8888

89-
if (!data.payloadHash) throw new Error("Expected payloadHash on thin success")
9089
const body = payloads.get(data.payloadHash)
9190
expect(body?.content).toEqual([
9291
{ type: "text", text: "Image read successfully" },
@@ -100,12 +99,10 @@ test("provider-executed success keeps raw provider result in the payload blob on
10099
await Effect.runPromise(publisher.publish(LLMEvent.toolCall({ ...call, providerExecuted: true })))
101100
await Effect.runPromise(publisher.publish(LLMEvent.toolResult({ ...result, providerExecuted: true })))
102101
const success = published.find((event) => event.type === "session.tool.success.1")
103-
expect(success).toBeDefined()
104-
if (!success) throw new Error("Expected session.tool.success.1")
102+
assertDefined(success)
105103
expect(success.data).not.toHaveProperty("result")
106104
const data = Schema.decodeUnknownSync(SessionEvent.Tool.Success.data)(success.data)
107-
expect(data.payloadHash).toBeDefined()
108-
if (!data.payloadHash) throw new Error("Expected payloadHash on thin success")
105+
assertDefined(data.payloadHash)
109106
expect(payloads.get(data.payloadHash)?.result).toBeDefined()
110107
})
111108

@@ -268,7 +265,7 @@ test("content-filter finish retains failure evidence until step closeout", async
268265
finish: "content-filter",
269266
tokens: { input: 8, output: 2, reasoning: 1 },
270267
})
271-
if (!settlement) throw new Error("Expected content-filter settlement")
268+
assertDefined(settlement)
272269
await Effect.runPromise(
273270
publisher.publishStepFailure({
274271
cost: Money.USD.make(1.25),

0 commit comments

Comments
 (0)