fix: ensure frozen objects in state are correctly skipped (#11889)

Fixes #11887

.changeset/tidy-fans-relax.md

@@ -0,0 +1,5 @@
+---
+"svelte": patch
+---
+
+fix: ensure frozen objects in state are correctly skipped

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

@@ -24,19 +24,19 @@ import * as e from './errors.js';
 
 /**
  * @template T
- * @param {T} initial_value
+ * @param {T} value
  * @param {boolean} [immutable]
  * @param {import('#client').ProxyMetadata | null} [parent]
  * @param {import('#client').Source<T>} [prev] dev mode only
  * @returns {import('#client').ProxyStateObject<T> | T}
  */
-export function proxy(initial_value, immutable = true, parent = null, prev) {
+export function proxy(value, immutable = true, parent = null, prev) {
-	if (typeof initial_value === 'object' && initial_value != null) {
+	if (
-		let value = initial_value;
+		typeof value === 'object' &&
-		// If the object is frozen then snapshot the value
+		value != null &&
-		if (is_frozen(value) || STATE_FROZEN_SYMBOL in value) {
+		!is_frozen(value) &&
-			value = snapshot(value);
+		!(STATE_FROZEN_SYMBOL in value)
-		}
+	) {
 		// If we have an existing proxy, return it...
 		if (STATE_SYMBOL in value) {
 			const metadata = /** @type {import('#client').ProxyMetadata<T>} */ (value[STATE_SYMBOL]);
@@ -99,7 +99,7 @@ export function proxy(initial_value, immutable = true, parent = null, prev) {
 		}
 	}
 
-	return initial_value;
+	return value;
 }
 
 /**

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

@@ -1337,9 +1337,14 @@ if (DEV) {
  * @returns {Readonly<T>}
  */
 export function freeze(value) {
-	if (typeof value === 'object' && value != null && !(STATE_FROZEN_SYMBOL in value)) {
+	if (
+		typeof value === 'object' &&
+		value != null &&
+		!is_frozen(value) &&
+		!(STATE_FROZEN_SYMBOL in value)
+	) {
 		// If the object is already proxified, then snapshot the value
-		if (STATE_SYMBOL in value || is_frozen(value)) {
+		if (STATE_SYMBOL in value) {
 			value = snapshot(value);
 		}
 		define_property(value, STATE_FROZEN_SYMBOL, {

packages/svelte/tests/runtime-runes/samples/class-state-frozen/_config.js

@@ -0,0 +1,7 @@
+import { test } from '../../test';
+
+export default test({
+	test({ assert, target }) {
+		assert.htmlEqual(target.innerHTML, `<input type="text"><span>hello</span>`);
+	}
+});

packages/svelte/tests/runtime-runes/samples/class-state-frozen/main.svelte

@@ -0,0 +1,34 @@
+<script>
+	const libFreezesObjects = true
+
+	function someLibFunctionCreatingFroozenObject(value) {
+		if(libFreezesObjects) {
+			return Object.freeze({inner: value})
+		} else {
+			return {inner: value}
+		}
+	}
+
+	function someLibFunctionReturningInner(wrapped) {
+		return wrapped.inner
+	}
+
+	function atom(init = null) {
+		let el = $state({value: someLibFunctionCreatingFroozenObject(init)})
+
+		return {
+			get value() {
+				return someLibFunctionReturningInner(el.value)
+			},
+			set value(v) {
+				el.value = someLibFunctionCreatingFroozenObject(v)
+			},
+		}
+	}
+
+	let val = atom('hello')
+</script>
+
+<input type="text" bind:value={val.value} />
+
+<span>{val.value}</span>