Skip to content

chore: simplify batch logic #16838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rich-Harris merged 5 commits into from
Sep 25, 2025
Merged

chore: simplify batch logic #16838

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
32401b3
always delete a batch once committed
Rich-Harris Sep 25, 2025
dcc438a
activate inside flush
Rich-Harris Sep 25, 2025
81fdcb0
centralise logic
Rich-Harris Sep 25, 2025
a9ab2af
Merge branch 'main' into simplify-batch
Rich-Harris Sep 25, 2025
2c64556
chore: simplify batch logic a bit more (#16845)
Rich-Harris Sep 25, 2025
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
1 change: 0 additions & 1 deletion packages/svelte/src/internal/client/reactivity/async.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ export async function async_body(fn) {
if (pending) {
batch.flush();
} else {
batch.activate();
batch.decrement();
}

Expand Down
20 changes: 5 additions & 15 deletions packages/svelte/src/internal/client/reactivity/batch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,15 +216,6 @@ export class Batch {
flush_queued_effects(render_effects);
flush_queued_effects(effects);

// Reinstate the current batch if there was no new one created, as `process()` runs in a loop in `flush_effects()`.
// That method expects `current_batch` to be set, and could run the loop again if effects result in new effects
// being scheduled but without writes happening in which case no new batch is created.
if (current_batch === null) {
current_batch = this;
} else {
batches.delete(this);
}

this.#deferred?.resolve();
} else {
this.#defer_effects(this.#render_effects);
Expand Down Expand Up @@ -364,22 +355,20 @@ export class Batch {
}

flush() {
this.activate();

if (queued_root_effects.length > 0) {
flush_effects();
} else {
} else if (this.#pending === 0) {
this.#commit();
}

if (current_batch !== this) {
if (current_batch !== null && current_batch !== this) {
// this can happen if a `flushSync` occurred during `flush_effects()`,
// which is permitted in legacy mode despite being a terrible idea
return;
}

if (this.#pending === 0) {
batches.delete(this);
}

this.deactivate();
}

Expand All @@ -394,6 +383,7 @@ export class Batch {
}

this.#callbacks.clear();
batches.delete(this);
}

increment() {
Expand Down
Loading