Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/react/projects/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"tsx": "^4.21.0",
"typescript": "^5.9.2",
"vite": "^7.3.7",
"vitest": "^3.2.4",
"vitest": "^4.1.12",
"web-vitals": "^5.1.0"
}
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"devDependencies": {
"@changesets/cli": "^2.29.8",
"@eslint/js": "^9.39.2",
"@fast-check/vitest": "^0.2.0",
"@fast-check/vitest": "^0.4.1",
"@svitejs/changesets-changelog-github-compact": "^1.2.0",
"@tanstack/eslint-config": "0.3.4",
"@tanstack/typedoc-config": "0.3.3",
Expand Down Expand Up @@ -71,7 +71,7 @@
"tsx": "^4.21.0",
"typescript": "^5.9.2",
"vite": "^7.3.7",
"vitest": "^3.2.4",
"vitest": "^4.1.12",
"zod": "^4.6.7"
}
}
2 changes: 1 addition & 1 deletion packages/angular-db/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"@angular/core": "^20.3.34",
"@angular/platform-browser": "^20.3.34",
"@angular/platform-browser-dynamic": "^20.3.34",
"@vitest/coverage-istanbul": "^3.2.4",
"@vitest/coverage-istanbul": "^4.1.12",
"rxjs": "^7.8.2",
"zone.js": "~0.15.0"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/browser-db-sqlite-persistence/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"@tanstack/query-core": "^5.90.20",
"@tanstack/query-db-collection": "workspace:*",
"@types/better-sqlite3": "^7.6.13",
"@vitest/coverage-istanbul": "^3.2.4",
"@vitest/coverage-istanbul": "^4.1.12",
"better-sqlite3": "^12.6.2",
"next": "^16.3.1",
"react": "^19.2.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,58 +147,54 @@ vi.mock(
const actual = await importOriginal<Record<string, unknown>>()
return {
...actual,
ShapeStream: vi.fn(
(options: {
headers?: Record<string, string>
offset?: string
handle?: string
onError?: (error: unknown) => unknown
}) => {
const stream: ControlledStream = {
tab: options.headers?.[`x-tab`] ?? `unknown`,
startedAt: {
handle: options.handle,
offset: options.offset ?? `-1`,
},
stopped: false,
shapeHandle: options.handle,
lastOffset: options.offset ?? `-1`,
send: () => {
throw new Error(`stream for tab ${stream.tab} is not subscribed`)
},
onError: (error) => options.onError?.(error),
giveUp: () => {
throw new Error(`stream for tab ${stream.tab} is not subscribed`)
},
}
streams.push(stream)
return {
subscribe: (
send: ControlledStream[`send`],
giveUp: ControlledStream[`giveUp`],
) => {
stream.send = send
stream.giveUp = giveUp
return () => undefined
},
unsubscribeAll: () => {
stream.stopped = true
},
requestSnapshot: vi.fn().mockResolvedValue(undefined),
fetchSnapshot: vi
.fn()
.mockResolvedValue({ metadata: {}, data: [] }),
forceDisconnectAndRefresh: vi.fn().mockResolvedValue(undefined),
isUpToDate: false,
get shapeHandle() {
return stream.shapeHandle
},
get lastOffset() {
return stream.lastOffset
},
}
},
),
ShapeStream: vi.fn(function (options: {
headers?: Record<string, string>
offset?: string
handle?: string
onError?: (error: unknown) => unknown
}) {
const stream: ControlledStream = {
tab: options.headers?.[`x-tab`] ?? `unknown`,
startedAt: {
handle: options.handle,
offset: options.offset ?? `-1`,
},
stopped: false,
shapeHandle: options.handle,
lastOffset: options.offset ?? `-1`,
send: () => {
throw new Error(`stream for tab ${stream.tab} is not subscribed`)
},
onError: (error) => options.onError?.(error),
giveUp: () => {
throw new Error(`stream for tab ${stream.tab} is not subscribed`)
},
}
streams.push(stream)
return {
subscribe: (
send: ControlledStream[`send`],
giveUp: ControlledStream[`giveUp`],
) => {
stream.send = send
stream.giveUp = giveUp
return () => undefined
},
unsubscribeAll: () => {
stream.stopped = true
},
requestSnapshot: vi.fn().mockResolvedValue(undefined),
fetchSnapshot: vi.fn().mockResolvedValue({ metadata: {}, data: [] }),
forceDisconnectAndRefresh: vi.fn().mockResolvedValue(undefined),
isUpToDate: false,
get shapeHandle() {
return stream.shapeHandle
},
get lastOffset() {
return stream.lastOffset
},
}
}),
}
},
)
Expand Down
2 changes: 1 addition & 1 deletion packages/capacitor-db-sqlite-persistence/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
},
"devDependencies": {
"@types/better-sqlite3": "^7.6.13",
"@vitest/coverage-istanbul": "^3.2.4",
"@vitest/coverage-istanbul": "^4.1.12",
"better-sqlite3": "^12.6.2"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
},
"devDependencies": {
"@types/better-sqlite3": "^7.6.13",
"@vitest/coverage-istanbul": "^3.2.4",
"@vitest/coverage-istanbul": "^4.1.12",
"better-sqlite3": "^12.6.2",
"wrangler": "^4.64.0"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/convex-db-collection/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"typescript": ">=4.7"
},
"devDependencies": {
"@vitest/coverage-istanbul": "^3.2.4",
"@vitest/coverage-istanbul": "^4.1.12",
"convex": "^1.47.0"
}
}
4 changes: 2 additions & 2 deletions packages/db-collection-e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
},
"devDependencies": {
"@types/pg": "^8.16.0",
"@vitest/ui": "^3.2.4",
"@vitest/ui": "^4.1.12",
"typescript": "^5.9.2",
"vite": "^7.3.7",
"vitest": "^3.2.4"
"vitest": "^4.1.12"
}
}
4 changes: 2 additions & 2 deletions packages/db-collection-e2e/support/global-setup.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Client } from 'pg'
import type { ClientConfig } from 'pg'
import type { GlobalSetupContext } from 'vitest/node'
import type { TestProject } from 'vitest/node'

const ELECTRIC_URL = process.env.ELECTRIC_URL ?? 'http://localhost:3000'
const POSTGRES_HOST = process.env.POSTGRES_HOST ?? 'localhost'
Expand Down Expand Up @@ -102,7 +102,7 @@ async function waitForPostgres(client: Client): Promise<void> {
* 4. Provides context to all tests
* 5. Returns cleanup function
*/
export default async function ({ provide }: GlobalSetupContext) {
export default async function ({ provide }: TestProject) {
console.log('🚀 Starting e2e test suite global setup...')

// Wait for Electric server to be ready
Expand Down
2 changes: 1 addition & 1 deletion packages/db-ivm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"typescript": ">=4.7"
},
"devDependencies": {
"@vitest/coverage-istanbul": "^3.2.4",
"@vitest/coverage-istanbul": "^4.1.12",
"temporal-polyfill": "^0.3.0"
}
}
2 changes: 1 addition & 1 deletion packages/db-sqlite-persistence-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"typescript": ">=4.7"
},
"devDependencies": {
"@vitest/coverage-istanbul": "^3.2.4",
"@vitest/coverage-istanbul": "^4.1.12",
"temporal-polyfill": "^0.3.0"
}
}
2 changes: 1 addition & 1 deletion packages/db/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"devDependencies": {
"@playwright/test": "^1.60.0",
"@tanstack/config": "^0.22.2",
"@vitest/coverage-istanbul": "^3.2.4",
"@vitest/coverage-istanbul": "^4.1.12",
"arktype": "^2.1.29",
"fake-indexeddb": "^6.0.0",
"mitt": "^3.0.1",
Expand Down
5 changes: 3 additions & 2 deletions packages/db/tests/collection-change-events.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
import { Func, PropRef, Value } from '../src/query/ir.js'
import { DEFAULT_COMPARE_OPTIONS } from '../src/utils.js'
import { BTreeIndex } from '../src/indexes/btree-index.js'
import type { SyncConfig } from '../src/types.js'

interface TestUser {
id: string
Expand Down Expand Up @@ -37,10 +38,10 @@ it(`treats predicate evaluation failures as nonmatches`, () => {
})

describe(`currentStateAsChanges`, () => {
let mockSync: ReturnType<typeof vi.fn>
let mockSync: ReturnType<typeof vi.fn<SyncConfig<TestUser>[`sync`]>>

beforeEach(() => {
mockSync = vi.fn()
mockSync = vi.fn<SyncConfig<TestUser>[`sync`]>()
})

afterEach(() => {
Expand Down
4 changes: 2 additions & 2 deletions packages/db/tests/collection-events.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ class TestEventEmitter extends EventEmitter<{ event: { id: number } }> {

describe(`Collection Events System`, () => {
let collection: Collection
let mockSync: ReturnType<typeof vi.fn>
let mockSync: ReturnType<typeof vi.fn<() => void>>

beforeEach(() => {
mockSync = vi.fn()
mockSync = vi.fn<() => void>()
collection = createCollection({
id: `test-collection`,
getKey: (item: any) => item.id,
Expand Down
2 changes: 1 addition & 1 deletion packages/db/tests/paced-mutations-scenarios.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1951,7 +1951,7 @@ for (const admission of [`admitted`, `dropped`, `queued`] as const)
})
try {
expect(() => mutate(1)).toThrow(failure)
const scope = create.mock.instances.at(-1) as unknown as TransactionScope
const scope = create.mock.instances.at(-1) as TransactionScope
const transaction = create.mock.results.at(-1)?.value as Transaction<{
id: number
}>
Expand Down
3 changes: 2 additions & 1 deletion packages/db/tests/query/join-subquery.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { createLiveQueryCollection, eq, gt } from '../../src/query/index.js'
import { createCollection } from '../../src/collection/index.js'
import { BTreeIndex } from '../../src/indexes/btree-index.js'
import { mockSyncCollectionOptions, stripVirtualProps } from '../utils.js'
import type { MockInstance } from 'vitest'

// Sample data types for join-subquery testing
type Issue = {
Expand Down Expand Up @@ -1149,7 +1150,7 @@ describe(`Lazy join: subquery whose join key resolves to an indexed collection`,

let teams: ReturnType<typeof makeTeamsCollection>
let members: ReturnType<typeof makeMembersCollection>
let warnSpy: ReturnType<typeof vi.spyOn>
let warnSpy: MockInstance<typeof console.warn>

beforeEach(() => {
teams = makeTeamsCollection()
Expand Down
6 changes: 5 additions & 1 deletion packages/db/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ const config = defineConfig({
name: packageJson.name,
dir: `./tests`,
environment: `jsdom`,
coverage: { enabled: true, provider: `istanbul`, include: [`src/**/*`] },
coverage: {
enabled: true,
provider: `istanbul`,
include: [`src/**/*.{ts,tsx,js,jsx,mts,cts,mjs,cjs}`],
},
typecheck: { enabled: true, tsconfig: `./tsconfig.test.json` },
setupFiles: [`./tests/test-setup.ts`],
},
Expand Down
2 changes: 1 addition & 1 deletion packages/electric-db-collection/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"@tanstack/query-core": "^5.90.20",
"@types/debug": "^4.1.12",
"@types/pg": "^8.16.0",
"@vitest/coverage-istanbul": "^3.2.4",
"@vitest/coverage-istanbul": "^4.1.12",
"pg": "^8.20.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,14 @@ vi.mock(`@electric-sql/client`, async () => {
const actual = await vi.importActual(`@electric-sql/client`)
return {
...actual,
ShapeStream: vi.fn(() => ({
subscribe: mockSubscribe,
unsubscribeAll: vi.fn(),
fetchSnapshot: mockFetchSnapshot,
requestSnapshot: vi.fn(),
})),
ShapeStream: vi.fn(function () {
return {
subscribe: mockSubscribe,
unsubscribeAll: vi.fn(),
fetchSnapshot: mockFetchSnapshot,
requestSnapshot: vi.fn(),
}
}),
}
})

Expand Down
16 changes: 13 additions & 3 deletions packages/electric-db-collection/tests/electric-adapter-support.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { expect, vi } from 'vitest'
import { createCollection } from '@tanstack/db'
import { electricCollectionOptions } from '../src/electric'
import { withElectricCleanup } from './electric-oracle-lifecycle'
import type { Mock } from 'vitest'
import type { Collection, SyncMetadataApi } from '@tanstack/db'
import type { ChangeMessage, Message, Offset, Row } from '@electric-sql/client'
import type {
Expand All @@ -21,11 +22,20 @@ export type OracleRow = Row & {
stable: string
}

export const mockSubscribe = vi.fn()
export const mockSubscribe: Mock = vi.fn()

export const shapeId = `{"params":{"table":"test_table"},"url":"http://test-url"}`

export const mockStream = {
export const mockStream: {
subscribe: Mock
unsubscribeAll: Mock
requestSnapshot: Mock
fetchSnapshot: Mock
forceDisconnectAndRefresh: Mock
isUpToDate: boolean
shapeHandle: string | undefined
lastOffset: string
} = {
subscribe: mockSubscribe,
unsubscribeAll: vi.fn(),
requestSnapshot: vi.fn().mockResolvedValue(undefined),
Expand Down Expand Up @@ -211,7 +221,7 @@ export function createOracleCollection(
) {
let subscriber!: (messages: Array<Message<OracleRow>>) => void
let sdkError!: (error: unknown) => void
const unsubscribe = vi.fn()
const unsubscribe: Mock = vi.fn()
mockSubscribe.mockImplementationOnce((callback, onSubscriberError) => {
subscriber = callback
sdkError = onSubscriberError
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ vi.mock(`@electric-sql/client`, async () => {
const actual = await vi.importActual(`@electric-sql/client`)
return {
...actual,
ShapeStream: vi.fn(() => createMockStream(mockStream)),
ShapeStream: vi.fn(function () {
return createMockStream(mockStream)
}),
}
})

Expand Down
Loading
Loading