chore: rebase batches after process, not during (#17900)

This is part of me trying to figure out #17162. It feels less confusing
to rebase other branches after the current batch has been processed,
rather than sort of doing it in the middle (which is an artifact of
historical constraints that no longer apply).

No test because it doesn't change any user-observable behaviour (but I
added a changeset just in case)

### Before submitting the PR, please make sure you do the following

- [x] It's really useful if your PR references an issue where it is
discussed ahead of time. In many cases, features are absent for a
reason. For large changes, please create an RFC:
https://github.com/sveltejs/rfcs
- [x] Prefix your PR title with `feat:`, `fix:`, `chore:`, or `docs:`.
- [x] This message body should clearly illustrate what problems it
solves.
- [ ] Ideally, include a test that fails without this PR but passes with
it.
- [x] If this PR changes code within `packages/svelte/src`, add a
changeset (`npx changeset`).

### Tests and linting

- [x] Run the tests with `pnpm test` and lint the project with `pnpm
lint`

.changeset/upset-parts-throw.md

@@ -0,0 +1,5 @@
+---
+'svelte': patch
+---
+
+chore: rebase batches after process, not during

packages/svelte/src/internal/client/reactivity/batch.js

@@ -249,6 +249,10 @@ export class Batch {
 				reset_branch(e, t);
 			}
 		} else {
+			if (this.#pending === 0) {
+				batches.delete(this);
+			}
+
 			// clear effects. Those that are still needed will be rescheduled through unskipping the skipped branches.
 			this.#dirty_effects.clear();
 			this.#maybe_dirty_effects.clear();
@@ -262,10 +266,6 @@ export class Batch {
 			flush_queued_effects(effects);
 			previous_batch = null;
 
-			if (this.#pending === 0) {
-				this.#commit();
-			}
-
 			this.#deferred?.resolve();
 		}
 
@@ -290,6 +290,10 @@ export class Batch {
 
 			next_batch.#process();
 		}
+
+		if (!batches.has(this)) {
+			this.#commit();
+		}
 	}
 
 	/**
@@ -433,74 +437,59 @@ export class Batch {
 		// in other words, we re-run block/async effects with the newly
 		// committed state, unless the batch in question has a more
 		// recent value for a given source
-		if (batches.size > 1) {
-			this.previous.clear();
-
-			var previous_batch = current_batch;
-			var previous_batch_values = batch_values;
-			var is_earlier = true;
-
-			for (const batch of batches) {
-				if (batch === this) {
-					is_earlier = false;
-					continue;
+		for (const batch of batches) {
+			var is_earlier = batch.id < this.id;
+
+			/** @type {Source[]} */
+			var sources = [];
+
+			for (const [source, value] of this.current) {
+				if (batch.current.has(source)) {
+					if (is_earlier && value !== batch.current.get(source)) {
+						// bring the value up to date
+						batch.current.set(source, value);
+					} else {
+						// same value or later batch has more recent value,
+						// no need to re-run these effects
+						continue;
+					}
 				}
 
-				/** @type {Source[]} */
-				const sources = [];
-
-				for (const [source, value] of this.current) {
-					if (batch.current.has(source)) {
-						if (is_earlier && value !== batch.current.get(source)) {
-							// bring the value up to date
-							batch.current.set(source, value);
-						} else {
-							// same value or later batch has more recent value,
-							// no need to re-run these effects
-							continue;
-						}
-					}
+				sources.push(source);
+			}
 
-					sources.push(source);
-				}
+			if (sources.length === 0) {
+				continue;
+			}
 
-				if (sources.length === 0) {
-					continue;
-				}
+			// Re-run async/block effects that depend on distinct values changed in both batches
+			var others = [...batch.current.keys()].filter((s) => !this.current.has(s));
+			if (others.length > 0) {
+				batch.activate();
 
-				// Re-run async/block effects that depend on distinct values changed in both batches
-				const others = [...batch.current.keys()].filter((s) => !this.current.has(s));
-				if (others.length > 0) {
-					batch.activate();
-
-					/** @type {Set<Value>} */
-					const marked = new Set();
-					/** @type {Map<Reaction, boolean>} */
-					const checked = new Map();
-					for (const source of sources) {
-						mark_effects(source, others, marked, checked);
-					}
+				/** @type {Set<Value>} */
+				var marked = new Set();
 
-					if (batch.#roots.length > 0) {
-						batch.apply();
+				/** @type {Map<Reaction, boolean>} */
+				var checked = new Map();
 
-						for (const root of batch.#roots) {
-							batch.#traverse(root, [], []);
-						}
+				for (var source of sources) {
+					mark_effects(source, others, marked, checked);
+				}
 
-						// TODO do we need to do anything with the dummy effect arrays?
+				if (batch.#roots.length > 0) {
+					batch.apply();
+
+					for (var root of batch.#roots) {
+						batch.#traverse(root, [], []);
 					}
 
-					batch.deactivate();
+					// TODO do we need to do anything with the dummy effect arrays?
 				}
-			}
 
-			current_batch = previous_batch;
-			batch_values = previous_batch_values;
+				batch.deactivate();
+			}
 		}
-
-		this.#skipped_branches.clear();
-		batches.delete(this);
 	}
 
 	/**
@@ -567,7 +556,10 @@ export class Batch {
 	}
 
 	apply() {
-		if (!async_mode_flag || (!this.is_fork && batches.size === 1)) return;
+		if (!async_mode_flag || (!this.is_fork && batches.size === 1)) {
+			batch_values = null;
+			return;
+		}
 
 		// if there are multiple batches, we are 'time travelling' —
 		// we need to override values with the ones in this batch...