Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/silly-berries-repair.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

fix: correctly run `deserialize` on the server
9 changes: 6 additions & 3 deletions packages/kit/src/runtime/app/forms.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import * as devalue from 'devalue';
import { DEV } from 'esm-env';
import { BROWSER, DEV } from 'esm-env';
import { invalidateAll } from './navigation.js';
import { app, applyAction } from '../client/client.js';
import { app as client_app, applyAction } from '../client/client.js';
import { app as server_app } from '../server/app.js';

export { applyAction };

const decoders = BROWSER ? client_app.decoders : server_app?.decoders;

/**
* Use this function to deserialize the response from a form submission.
* Usage:
Expand All @@ -31,7 +34,7 @@ export function deserialize(result) {
const parsed = JSON.parse(result);

if (parsed.data) {
parsed.data = devalue.parse(parsed.data, app.decoders);
parsed.data = devalue.parse(parsed.data, decoders);
}

return parsed;
Expand Down
9 changes: 9 additions & 0 deletions packages/kit/src/runtime/server/app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/** @type {{ decoders: Record<string, (data: any) => any> }} */
export let app;

/**
* @param {{ decoders: Record<string, (data: any) => any> }} value
*/
export function set_app(value) {
app = value;
}
11 changes: 11 additions & 0 deletions packages/kit/src/runtime/server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { DEV } from 'esm-env';
import { filter_private_env, filter_public_env } from '../../utils/env.js';
import { prerendering } from '__sveltekit/environment';
import { set_read_implementation, set_manifest } from '__sveltekit/server';
import { set_app } from './app.js';

/** @type {ProxyHandler<{ type: 'public' | 'private' }>} */
const prerender_env_handler = {
Expand Down Expand Up @@ -83,6 +84,12 @@ export class Server {
transport: module.transport || {}
};

set_app({
decoders: module.transport
? Object.fromEntries(Object.entries(module.transport).map(([k, v]) => [k, v.decode]))
: {}
});

if (module.init) {
await module.init();
}
Expand All @@ -97,6 +104,10 @@ export class Server {
reroute: () => {},
transport: {}
};

set_app({
decoders: {}
});
} else {
throw error;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
let { form } = $props();
const { form } = $props();
</script>

<form method="POST">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { deserialize } from '$app/forms';

export async function GET({ fetch }) {
const response = await fetch('/serialization-form', {
method: 'POST',
body: new FormData(),
headers: {
'x-sveltekit-action': 'true'
}
});
const result = deserialize(await response.text());

if (result.type === 'success' && result.data) {
return Response.json({
data: /** @type {import('../../../lib').Foo} */ (result.data.foo).bar()
});
}

return Response.json({});
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import { enhance } from '$app/forms';

let { form } = $props();
const { form } = $props();
</script>

<form method="POST" use:enhance>
Expand Down
11 changes: 9 additions & 2 deletions packages/kit/test/apps/basics/test/server.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,7 @@ test.describe('Static files', () => {
test.describe('setHeaders', () => {
test('allows multiple set-cookie headers with different values', async ({ page }) => {
const response = await page.goto('/headers/set-cookie/sub');
const cookies = (await response.allHeaders())['set-cookie'];
const cookies = response ? (await response.allHeaders())['set-cookie'] : '';

expect(cookies).toMatch('cookie1=value1');
expect(cookies).toMatch('cookie2=value2');
Expand All @@ -649,7 +649,7 @@ test.describe('setHeaders', () => {
test.describe('cookies', () => {
test('cookie.serialize created correct cookie header string', async ({ page }) => {
const response = await page.goto('/cookies/serialize');
const cookies = await response.headerValue('set-cookie');
const cookies = response ? await response.headerValue('set-cookie') : '';

expect(cookies).toMatch('before=before');
expect(cookies).toMatch('after=after');
Expand Down Expand Up @@ -729,3 +729,10 @@ test.describe('getRequestEvent', () => {
expect(await response.text()).toBe('hello from hooks.server.js');
});
});

test.describe('$app/forms', () => {
test('deserialize works on the server', async ({ request }) => {
const response = await request.get('/serialization-form/server-deserialize');
expect(await response.json()).toEqual({ data: 'It works!' });
});
});
Loading