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/tidy-lizards-happen.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'svelte': patch
---

fix: make `$state` component exports settable
3 changes: 3 additions & 0 deletions packages/svelte/src/compiler/phases/2-analyze/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,9 @@ const runes_scope_tweaker = {
name: node.local.name,
alias: node.exported.name
});

const binding = state.scope.get(node.local.name);
if (binding) binding.reassigned = true;
},
ExportNamedDeclaration(node, { next, state }) {
if (!node.declaration || state.ast_type !== 'instance') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,14 +198,38 @@ export function client_component(source, analysis, options) {
}

/** @type {Array<ESTree.Property | ESTree.SpreadElement>} */
const component_returned_object = analysis.exports.map(({ name, alias }) => {
const component_returned_object = analysis.exports.flatMap(({ name, alias }) => {
const binding = instance_state.scope.get(name);
const expression = serialize_get_binding(b.id(name), instance_state);
const getter = b.get(alias ?? name, [b.return(expression)]);

if (expression.type === 'Identifier') {
if (binding?.declaration_kind === 'let' || binding?.declaration_kind === 'var') {
return [
getter,
b.set(alias ?? name, [b.stmt(b.assignment('=', expression, b.id('$$value')))])
];
} else if (!options.dev) {
return b.init(alias ?? name, expression);
}
}

if (expression.type === 'Identifier' && !options.dev) {
return b.init(alias ?? name, expression);
if (binding?.kind === 'state' || binding?.kind === 'frozen_state') {
return [
getter,
b.set(alias ?? name, [
b.stmt(
b.call(
'$.set',
b.id(name),
b.call(binding.kind === 'state' ? '$.proxy' : '$.freeze', b.id('$$value'))
)
)
])
];
}

return b.get(alias ?? name, [b.return(expression)]);
return getter;
});

const properties = [...analysis.instance.scope.declarations].filter(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ import { test } from '../../test';
export default test({
test({ assert, target }) {
assert.htmlEqual(target.innerHTML, `0 0 <button>0 / 0</button>`);
const [btn] = target.querySelectorAll('button');
const btn = target.querySelector('button');

btn?.click();
flushSync();
flushSync(() => btn?.click());
assert.htmlEqual(target.innerHTML, '1 2 <button>1 / 2</button>');
}
});
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script>
import Sub from './sub.svelte'
import Sub from './sub.svelte';
let sub = $state();
</script>

Expand Down
12 changes: 12 additions & 0 deletions packages/svelte/tests/runtime-runes/samples/exports-4/_config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { flushSync } from 'svelte';
import { test } from '../../test';

export default test({
test({ assert, target }) {
assert.htmlEqual(target.innerHTML, `0 0 <button>0 / 0</button>`);
const btn = target.querySelector('button');

flushSync(() => btn?.click());
assert.htmlEqual(target.innerHTML, '1 2 <button>1 / 2</button>');
}
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<script>
import Sub from './sub.svelte';
let sub = $state();
</script>

<Sub bind:this={sub} />
<button on:click={() => sub.count++}>{sub?.count} / {sub?.doubled}</button>
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<script>
let count = $state(0);
let doubled = $derived(count * 2);

export { count, doubled };
</script>

{count}
{doubled}