feat: use devalue for pushState/replaceState

Author: GauBen

packages/kit/src/runtime/client/client.js

@@ -39,7 +39,13 @@ import {
 } from './constants.js';
 import { validate_page_exports } from '../../utils/exports.js';
 import { compact } from '../../utils/array.js';
-import { INVALIDATED_PARAM, TRAILING_SLASH_PARAM, validate_depends } from '../shared.js';
+import {
+	INVALIDATED_PARAM,
+	stringify,
+	TRAILING_SLASH_PARAM,
+	validate_depends,
+	parse as unstringify
+} from '../shared.js';
 import { get_message, get_status } from '../../utils/error.js';
 import { writable } from 'svelte/store';
 import { page, update, navigating } from './state.svelte.js';
@@ -1590,7 +1596,7 @@ async function navigate({
 		const entry = {
 			[HISTORY_INDEX]: (current_history_index += change),
 			[NAVIGATION_INDEX]: (current_navigation_index += change),
-			[STATES_KEY]: state
+			[STATES_KEY]: stringify(state, app.hooks.transport)
 		};
 
 		const fn = replace_state ? history.replaceState : history.pushState;
@@ -2144,18 +2150,8 @@ export function pushState(url, state) {
 		throw new Error('Cannot call pushState(...) on the server');
 	}
 
-	if (DEV) {
-		if (!started) {
-			throw new Error('Cannot call pushState(...) before router is initialized');
-		}
-
-		try {
-			// use `devalue.stringify` as a convenient way to ensure we exclude values that can't be properly rehydrated, such as custom class instances
-			devalue.stringify(state);
-		} catch (error) {
-			// @ts-expect-error
-			throw new Error(`Could not serialize state${error.path}`);
-		}
+	if (DEV && !started) {
+		throw new Error('Cannot call pushState(...) before router is initialized');
 	}
 
 	update_scroll_positions(current_history_index);
@@ -2164,7 +2160,7 @@ export function pushState(url, state) {
 		[HISTORY_INDEX]: (current_history_index += 1),
 		[NAVIGATION_INDEX]: current_navigation_index,
 		[PAGE_URL_KEY]: page.url.href,
-		[STATES_KEY]: state
+		[STATES_KEY]: stringify(state, app.hooks.transport)
 	};
 
 	history.pushState(opts, '', resolve_url(url));
@@ -2191,25 +2187,15 @@ export function replaceState(url, state) {
 		throw new Error('Cannot call replaceState(...) on the server');
 	}
 
-	if (DEV) {
-		if (!started) {
-			throw new Error('Cannot call replaceState(...) before router is initialized');
-		}
-
-		try {
-			// use `devalue.stringify` as a convenient way to ensure we exclude values that can't be properly rehydrated, such as custom class instances
-			devalue.stringify(state);
-		} catch (error) {
-			// @ts-expect-error
-			throw new Error(`Could not serialize state${error.path}`);
-		}
+	if (DEV && !started) {
+		throw new Error('Cannot call replaceState(...) before router is initialized');
 	}
 
 	const opts = {
 		[HISTORY_INDEX]: current_history_index,
 		[NAVIGATION_INDEX]: current_navigation_index,
 		[PAGE_URL_KEY]: page.url.href,
-		[STATES_KEY]: state
+		[STATES_KEY]: stringify(state, app.hooks.transport)
 	};
 
 	history.replaceState(opts, '', resolve_url(url));
@@ -2519,7 +2505,7 @@ function _start_router() {
 			if (history_index === current_history_index) return;
 
 			const scroll = scroll_positions[history_index];
-			const state = event.state[STATES_KEY] ?? {};
+			const state = unstringify(event.state[STATES_KEY], app.hooks.transport) ?? {};
 			const url = new URL(event.state[PAGE_URL_KEY] ?? location.href);
 			const navigation_index = event.state[NAVIGATION_INDEX];
 			const is_hash_change = current.url ? strip_hash(location) === strip_hash(current.url) : false;

packages/kit/src/runtime/shared.js

@@ -49,6 +49,17 @@ export function stringify_remote_arg(value, transport) {
 		.replace(/\//g, '_');
 }
 
+/**
+ * Parses `string` with `devalue.parse`, using the provided transport decoders.
+ * @param {string} string
+ * @param {Transport} transport
+ */
+export function parse(string, transport) {
+	const decoders = Object.fromEntries(Object.entries(transport).map(([k, v]) => [k, v.decode]));
+
+	return devalue.parse(string, decoders);
+}
+
 /**
  * Parses the argument (if any) for a remote function
  * @param {string} string
@@ -57,15 +68,13 @@ export function stringify_remote_arg(value, transport) {
 export function parse_remote_arg(string, transport) {
 	if (!string) return undefined;
 
-	const decoders = Object.fromEntries(Object.entries(transport).map(([k, v]) => [k, v.decode]));
-
 	// We don't need to add back the `=`-padding because atob can handle it
 	const base64_restored = string.replace(/-/g, '+').replace(/_/g, '/');
 	const binary_string = atob(base64_restored);
 	const utf8_bytes = new Uint8Array([...binary_string].map((char) => char.charCodeAt(0)));
 	const json_string = new TextDecoder().decode(utf8_bytes);
 
-	return devalue.parse(json_string, decoders);
+	return parse(json_string, transport);
 }
 
 /**

packages/kit/test/apps/basics/src/app.d.ts

@@ -1,3 +1,5 @@
+import type { Foo } from '$lib';
+
 declare global {
 	namespace App {
 		interface Locals {
@@ -12,6 +14,7 @@ declare global {
 		interface PageState {
 			active?: boolean;
 			count?: number;
+			foo?: Foo;
 		}
 	}
 }

packages/kit/test/apps/basics/src/routes/shallow-routing/push-state/foo/+page.svelte

@@ -0,0 +1,9 @@
+<script>
+	import { pushState } from '$app/navigation';
+	import { page } from '$app/state';
+	import { Foo } from '$lib';
+</script>
+
+<button onclick={() => pushState('', { foo: new Foo('it works?') })}>do the thing</button>
+
+<p>foo: {page.state.foo?.bar() ?? 'nope'}</p>

packages/kit/test/apps/basics/test/client.test.js

@@ -1491,6 +1491,17 @@ test.describe('Shallow routing', () => {
 		await page.locator('button').click();
 		await expect(page.locator('p')).toHaveText('count: 1');
 	});
+
+	test('pushState properly serializes objects', async ({ page }) => {
+		await page.goto('/shallow-routing/push-state/foo');
+		await expect(page.locator('p')).toHaveText('foo: nope');
+
+		await page.locator('button').click();
+		await expect(page.locator('p')).toHaveText('foo: it works?!');
+
+		await page.goBack();
+		await expect(page.locator('p')).toHaveText('foo: nope');
+	});
 });
 
 test.describe('reroute', () => {