Skip to content
Closed
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
4 changes: 2 additions & 2 deletions packages/store/src/atom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ let queuedEffectsLength = 0
let activeSub: ReactiveNode | undefined
let batchDepth = 0

export function batch(fn: () => void) {
export function batch<T>(fn: () => T): T {
try {
++batchDepth
fn()
return fn()
} finally {
if (!--batchDepth) {
flush()
Expand Down
24 changes: 23 additions & 1 deletion packages/store/tests/batch.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { describe, expect, test } from 'vitest'
import { describe, expect, test, vi } from 'vitest'
import { batch, createStore } from '../src'

describe('batch', () => {
Expand All @@ -16,4 +16,26 @@ describe('batch', () => {
expect(store.state.hello).toBe(101)
expect(store.state.world).toBe(201)
})

test('notifies subscribers once after entire batch completes', () => {
const store = createStore(0)
const listener = vi.fn()
store.subscribe(listener)

batch(() => {
store.setState((prev) => prev + 1)
store.setState((prev) => prev + 1)
store.setState((prev) => prev + 1)
expect(listener).not.toHaveBeenCalled()
})

expect(store.state).toBe(3)
expect(listener).toHaveBeenCalledTimes(1)
expect(listener).toHaveBeenCalledWith(3)
})

test('batch returns the value produced by callback', () => {
const result = batch(() => 'batched-result')
expect(result).toBe('batched-result')
})
})