Merge branch 'main' into derived-reactivity-loss-fix

Author: dummdidumm

.changeset/legal-mangos-peel.md

@@ -1,5 +1,15 @@
 # svelte
 
+## 5.43.3
+
+### Patch Changes
+
+- fix: ensure fork always accesses correct values ([#17098](https://github.com/sveltejs/svelte/pull/17098))
+
+- fix: change title only after any pending work has completed ([#17061](https://github.com/sveltejs/svelte/pull/17061))
+
+- fix: preserve symbols when creating derived rest properties ([#17096](https://github.com/sveltejs/svelte/pull/17096))
+
 ## 5.43.2
 
 ### Patch Changes

packages/svelte/CHANGELOG.md

@@ -2,7 +2,7 @@
   "name": "svelte",
   "description": "Cybernetically enhanced web apps",
   "license": "MIT",
-  "version": "5.43.2",
+  "version": "5.43.3",
   "type": "module",
   "types": "./types/index.d.ts",
   "engines": {

packages/svelte/package.json

@@ -15,7 +15,8 @@ import {
 	DERIVED,
 	BOUNDARY_EFFECT,
 	EAGER_EFFECT,
-	HEAD_EFFECT
+	HEAD_EFFECT,
+	ERROR_VALUE
 } from '#client/constants';
 import { async_mode_flag } from '../../flags/index.js';
 import { deferred, define_property } from '../../shared/utils.js';
@@ -285,12 +286,16 @@ export class Batch {
 			this.previous.set(source, value);
 		}
 
-		this.current.set(source, source.v);
-		batch_values?.set(source, source.v);
+		// Don't save errors in `batch_values`, or they won't be thrown in `runtime.js#get`
+		if ((source.f & ERROR_VALUE) === 0) {
+			this.current.set(source, source.v);
+			batch_values?.set(source, source.v);
+		}
 	}
 
 	activate() {
 		current_batch = this;
+		this.apply();
 	}
 
 	deactivate() {
@@ -492,7 +497,7 @@ export class Batch {
 	}
 
 	apply() {
-		if (!async_mode_flag || batches.size === 1) return;
+		if (!async_mode_flag || (!this.is_fork && batches.size === 1)) return;
 
 		// if there are multiple batches, we are 'time travelling' —
 		// we need to override values with the ones in this batch...

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

@@ -773,12 +773,12 @@ export function set_signal_status(signal, status) {
 }
 
 /**
- * @param {Record<string, unknown>} obj
- * @param {string[]} keys
- * @returns {Record<string, unknown>}
+ * @param {Record<string | symbol, unknown>} obj
+ * @param {Array<string | symbol>} keys
+ * @returns {Record<string | symbol, unknown>}
  */
 export function exclude_from_object(obj, keys) {
-	/** @type {Record<string, unknown>} */
+	/** @type {Record<string | symbol, unknown>} */
 	var result = {};
 
 	for (var key in obj) {
@@ -787,6 +787,12 @@ export function exclude_from_object(obj, keys) {
 		}
 	}
 
+	for (var symbol of Object.getOwnPropertySymbols(obj)) {
+		if (Object.propertyIsEnumerable.call(obj, symbol) && !keys.includes(symbol)) {
+			result[symbol] = obj[symbol];
+		}
+	}
+
 	return result;
 }
 

packages/svelte/src/internal/client/runtime.js

@@ -4,5 +4,5 @@
  * The current version, as set in package.json.
  * @type {string}
  */
-export const VERSION = '5.43.2';
+export const VERSION = '5.43.3';
 export const PUBLIC_VERSION = '5';

packages/svelte/src/version.js

@@ -0,0 +1,8 @@
+<script>
+	let { x } = $props();
+	console.log(x);
+	await Promise.resolve();
+	console.log(x);
+</script>
+
+{x}

packages/svelte/tests/runtime-runes/samples/async-fork-if/Child.svelte

@@ -0,0 +1,12 @@
+import { test } from '../../test';
+
+export default test({
+	async test({ assert, target, logs }) {
+		const btn = target.querySelector('button');
+
+		btn?.click();
+		await new Promise((r) => setTimeout(r, 2));
+		assert.htmlEqual(target.innerHTML, `<button>fork</button> universe`);
+		assert.deepEqual(logs, ['universe', 'universe']);
+	}
+});

packages/svelte/tests/runtime-runes/samples/async-fork-if/_config.js

@@ -0,0 +1,17 @@
+<script>
+	import { fork } from 'svelte';
+	import Child from './Child.svelte';
+	let x = $state('world');
+</script>
+
+<button onclick={async () => {
+	const f = fork(() => {
+		x = 'universe'
+	});
+	await new Promise(r => setTimeout(r));
+	f.commit();
+}}>fork</button>
+
+{#if x === 'universe'}
+	<Child {x} />
+{/if}

packages/svelte/tests/runtime-runes/samples/async-fork-if/main.svelte

@@ -0,0 +1,5 @@
+import { test } from '../../test';
+
+export default test({
+	html: `<p>true false</p>`
+});