diff --git a/.changeset/green-walls-clap.md b/.changeset/green-walls-clap.md new file mode 100644 index 0000000000..164083db7a --- /dev/null +++ b/.changeset/green-walls-clap.md @@ -0,0 +1,5 @@ +--- +'svelte': patch +--- + +breaking: remove `$state.link` rune pending further design work diff --git a/documentation/docs/03-runes/01-state.md b/documentation/docs/03-runes/01-state.md index 8d78e6c73e..7bcff2c968 100644 --- a/documentation/docs/03-runes/01-state.md +++ b/documentation/docs/03-runes/01-state.md @@ -62,33 +62,6 @@ Objects and arrays are made deeply reactive by wrapping them with [`Proxies`](ht > Only POJOs (plain old JavaScript objects) are made deeply reactive. Reactivity will stop at class boundaries and leave those alone -## `$state.link` - -Linked state stays up to date with its input: - -```js -let a = $state(0); -let b = $state.link(a); - -a = 1; -console.log(a, b); // 1, 1 -``` - -You can temporarily _unlink_ state. It will be _relinked_ when the input value changes: - -```js -let a = 1; -let b = 1; -// ---cut--- -b = 2; // unlink -console.log(a, b); // 1, 2 - -a = 3; // relink -console.log(a, b); // 3, 3 -``` - -As with `$state`, if `$state.link` is passed a plain object or array it will be made deeply reactive. If passed an existing state proxy it will be reused, meaning that mutating the linked state will mutate the original. To clone a state proxy, you can use [`$state.snapshot`](#$state-snapshot). - ## `$state.raw` State declared with `$state.raw` cannot be mutated; it can only be _reassigned_. In other words, rather than assigning to a property of an object, or using an array method like `push`, replace the object or array altogether if you'd like to update it: diff --git a/packages/svelte/src/ambient.d.ts b/packages/svelte/src/ambient.d.ts index a84085fd5a..6af8ca5156 100644 --- a/packages/svelte/src/ambient.d.ts +++ b/packages/svelte/src/ambient.d.ts @@ -124,32 +124,6 @@ declare namespace $state { * * @param initial The initial value */ - - /** - * Declares reactive state that is linked to another value. Local reassignments - * will override the linked value until the linked value changes. - * - * Example: - * ```ts - * let a = $state(0); - * let b = $state.link(a); - - * a = 1; - * console.log(a, b); // 1, 1 - - * b = 2; // unlink - * console.log(a, b); // 1, 2 - * - * a = 3; // relink - * console.log(a, b); // 3, 3 - * ``` - * - * https://svelte-5-preview.vercel.app/docs/runes#$state-link - * - * @param value The linked value - */ - export function link(value: T): T; - export function raw(initial: T): T; export function raw(): T | undefined; /** diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/BindDirective.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/BindDirective.js index eeeb4cea43..43d1a3d468 100644 --- a/packages/svelte/src/compiler/phases/2-analyze/visitors/BindDirective.js +++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/BindDirective.js @@ -34,7 +34,6 @@ export function BindDirective(node, context) { node.name !== 'this' && // bind:this also works for regular variables (!binding || (binding.kind !== 'state' && - binding.kind !== 'linked_state' && binding.kind !== 'raw_state' && binding.kind !== 'prop' && binding.kind !== 'bindable_prop' && diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/CallExpression.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/CallExpression.js index bdcca2bff8..f9999f5252 100644 --- a/packages/svelte/src/compiler/phases/2-analyze/visitors/CallExpression.js +++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/CallExpression.js @@ -74,7 +74,6 @@ export function CallExpression(node, context) { case '$state': case '$state.raw': - case '$state.link': case '$derived': case '$derived.by': if ( @@ -86,7 +85,7 @@ export function CallExpression(node, context) { if ((rune === '$derived' || rune === '$derived.by') && node.arguments.length !== 1) { e.rune_invalid_arguments_length(node, rune, 'exactly one argument'); - } else if ((rune === '$state' || rune === '$state.link') && node.arguments.length > 1) { + } else if (rune === '$state' && node.arguments.length > 1) { e.rune_invalid_arguments_length(node, rune, 'zero or one arguments'); } @@ -170,7 +169,7 @@ export function CallExpression(node, context) { } // `$inspect(foo)` or `$derived(foo) should not trigger the `static-state-reference` warning - if (rune === '$inspect' || rune === '$derived' || rune === '$state.link') { + if (rune === '$inspect' || rune === '$derived') { context.next({ ...context.state, function_depth: context.state.function_depth + 1 }); } else { context.next(); diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/ExportSpecifier.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/ExportSpecifier.js index d2caf27ab9..27eb39acbf 100644 --- a/packages/svelte/src/compiler/phases/2-analyze/visitors/ExportSpecifier.js +++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/ExportSpecifier.js @@ -38,10 +38,7 @@ function validate_export(node, scope, name) { e.derived_invalid_export(node); } - if ( - (binding.kind === 'state' || binding.kind === 'raw_state' || binding.kind === 'linked_state') && - binding.reassigned - ) { + if ((binding.kind === 'state' || binding.kind === 'raw_state') && binding.reassigned) { e.state_invalid_export(node); } } diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/Identifier.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/Identifier.js index 002462fc44..79dccd5a7c 100644 --- a/packages/svelte/src/compiler/phases/2-analyze/visitors/Identifier.js +++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/Identifier.js @@ -99,7 +99,7 @@ export function Identifier(node, context) { context.state.function_depth === binding.scope.function_depth && // If we have $state that can be proxied or frozen and isn't re-assigned, then that means // it's likely not using a primitive value and thus this warning isn't that helpful. - (((binding.kind === 'state' || binding.kind === 'linked_state') && + ((binding.kind === 'state' && (binding.reassigned || (binding.initial?.type === 'CallExpression' && binding.initial.arguments.length === 1 && diff --git a/packages/svelte/src/compiler/phases/2-analyze/visitors/VariableDeclarator.js b/packages/svelte/src/compiler/phases/2-analyze/visitors/VariableDeclarator.js index bb74e003d7..6d9b3e29b9 100644 --- a/packages/svelte/src/compiler/phases/2-analyze/visitors/VariableDeclarator.js +++ b/packages/svelte/src/compiler/phases/2-analyze/visitors/VariableDeclarator.js @@ -21,7 +21,6 @@ export function VariableDeclarator(node, context) { // TODO feels like this should happen during scope creation? if ( rune === '$state' || - rune === '$state.link' || rune === '$state.raw' || rune === '$derived' || rune === '$derived.by' || @@ -33,15 +32,13 @@ export function VariableDeclarator(node, context) { binding.kind = rune === '$state' ? 'state' - : rune === '$state.link' - ? 'linked_state' - : rune === '$state.raw' - ? 'raw_state' - : rune === '$derived' || rune === '$derived.by' - ? 'derived' - : path.is_rest - ? 'rest_prop' - : 'prop'; + : rune === '$state.raw' + ? 'raw_state' + : rune === '$derived' || rune === '$derived.by' + ? 'derived' + : path.is_rest + ? 'rest_prop' + : 'prop'; } } diff --git a/packages/svelte/src/compiler/phases/3-transform/client/types.d.ts b/packages/svelte/src/compiler/phases/3-transform/client/types.d.ts index 57ce1507c5..e44cc0239c 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/types.d.ts +++ b/packages/svelte/src/compiler/phases/3-transform/client/types.d.ts @@ -88,7 +88,7 @@ export interface ComponentClientTransformState extends ClientTransformState { } export interface StateField { - kind: 'state' | 'raw_state' | 'linked_state' | 'derived' | 'derived_by'; + kind: 'state' | 'raw_state' | 'derived' | 'derived_by'; id: PrivateIdentifier; } diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/ClassBody.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/ClassBody.js index d121600c1b..5342e70aac 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/ClassBody.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/ClassBody.js @@ -44,7 +44,6 @@ export function ClassBody(node, context) { const rune = get_rune(definition.value, context.state.scope); if ( rune === '$state' || - rune === '$state.link' || rune === '$state.raw' || rune === '$derived' || rune === '$derived.by' @@ -56,11 +55,9 @@ export function ClassBody(node, context) { ? 'state' : rune === '$state.raw' ? 'raw_state' - : rune === '$state.link' - ? 'linked_state' - : rune === '$derived.by' - ? 'derived_by' - : 'derived', + : rune === '$derived.by' + ? 'derived_by' + : 'derived', // @ts-expect-error this is set in the next pass id: is_private ? definition.key : null }; @@ -119,18 +116,11 @@ export function ClassBody(node, context) { '$.source', should_proxy(init, context.state.scope) ? b.call('$.proxy', init) : init ) - : field.kind === 'linked_state' - ? b.call( - '$.source_link', - b.thunk( - should_proxy(init, context.state.scope) ? b.call('$.proxy', init) : init - ) - ) - : field.kind === 'raw_state' - ? b.call('$.source', init) - : field.kind === 'derived_by' - ? b.call('$.derived', init) - : b.call('$.derived', b.thunk(init)); + : field.kind === 'raw_state' + ? b.call('$.source', init) + : field.kind === 'derived_by' + ? b.call('$.derived', init) + : b.call('$.derived', b.thunk(init)); } else { // if no arguments, we know it's state as `$derived()` is a compile error value = b.call('$.source'); @@ -143,24 +133,8 @@ export function ClassBody(node, context) { const member = b.member(b.this, field.id); body.push(b.prop_def(field.id, value)); - if (field.kind === 'linked_state') { - // get foo() { return this.#foo; } - body.push(b.method('get', definition.key, [], [b.return(b.call(member))])); - - // set foo(value) { this.#foo = value; } - const value = b.id('value'); - body.push( - b.method( - 'set', - definition.key, - [value], - [b.stmt(b.call(member, build_proxy_reassignment(value, field.id)))] - ) - ); - } else { - // get foo() { return this.#foo; } - body.push(b.method('get', definition.key, [], [b.return(b.call('$.get', member))])); - } + // get foo() { return this.#foo; } + body.push(b.method('get', definition.key, [], [b.return(b.call('$.get', member))])); if (field.kind === 'state') { // set foo(value) { this.#foo = value; } diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Program.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Program.js index f3f3808594..c34a9b05c6 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/Program.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/Program.js @@ -102,7 +102,7 @@ export function Program(_, context) { if (is_prop_source(binding, context.state)) { context.state.transform[name] = { read: b.call, - assign: b.call, + assign: (node, value) => b.call(node, value), mutate: (node, value) => { if (binding.kind === 'bindable_prop') { // only necessary for interop with legacy parent bindings diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/VariableDeclaration.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/VariableDeclaration.js index 84713f73ca..77177e397f 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/VariableDeclaration.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/VariableDeclaration.js @@ -113,7 +113,7 @@ export function VariableDeclaration(node, context) { const value = args.length === 0 ? b.id('undefined') : /** @type {Expression} */ (context.visit(args[0])); - if (rune === '$state' || rune === '$state.raw' || rune === '$state.link') { + if (rune === '$state' || rune === '$state.raw') { /** * @param {Identifier} id * @param {Expression} value @@ -122,20 +122,12 @@ export function VariableDeclaration(node, context) { const binding = /** @type {import('#compiler').Binding} */ ( context.state.scope.get(id.name) ); - - if ( - (rune === '$state' || rune === '$state.link') && - should_proxy(value, context.state.scope) - ) { + if (rune === '$state' && should_proxy(value, context.state.scope)) { value = b.call('$.proxy', value); } - - if (rune === '$state.link') { - value = b.call('$.source_link', b.thunk(value)); - } else if (is_state_source(binding, context.state.analysis)) { + if (is_state_source(binding, context.state.analysis)) { value = b.call('$.source', value); } - return value; }; diff --git a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/declarations.js b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/declarations.js index 5db639c190..33566f1c10 100644 --- a/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/declarations.js +++ b/packages/svelte/src/compiler/phases/3-transform/client/visitors/shared/declarations.js @@ -49,12 +49,5 @@ export function add_state_transformers(context) { } }; } - - if (binding.kind === 'linked_state') { - context.state.transform[name] = { - read: b.call, - assign: b.call - }; - } } } diff --git a/packages/svelte/src/compiler/phases/3-transform/server/visitors/PropertyDefinition.js b/packages/svelte/src/compiler/phases/3-transform/server/visitors/PropertyDefinition.js index 10fd6de7e2..04751a19d1 100644 --- a/packages/svelte/src/compiler/phases/3-transform/server/visitors/PropertyDefinition.js +++ b/packages/svelte/src/compiler/phases/3-transform/server/visitors/PropertyDefinition.js @@ -11,12 +11,7 @@ export function PropertyDefinition(node, context) { if (context.state.analysis.runes && node.value != null && node.value.type === 'CallExpression') { const rune = get_rune(node.value, context.state.scope); - if ( - rune === '$state' || - rune === '$state.link' || - rune === '$state.raw' || - rune === '$derived' - ) { + if (rune === '$state' || rune === '$state.raw' || rune === '$derived') { return { ...node, value: diff --git a/packages/svelte/src/compiler/types/index.d.ts b/packages/svelte/src/compiler/types/index.d.ts index ac2b617777..587c9e373c 100644 --- a/packages/svelte/src/compiler/types/index.d.ts +++ b/packages/svelte/src/compiler/types/index.d.ts @@ -278,7 +278,6 @@ export interface Binding { | 'bindable_prop' | 'rest_prop' | 'state' - | 'linked_state' | 'raw_state' | 'derived' | 'each' diff --git a/packages/svelte/src/internal/client/index.js b/packages/svelte/src/internal/client/index.js index adb595b80d..1ca71708af 100644 --- a/packages/svelte/src/internal/client/index.js +++ b/packages/svelte/src/internal/client/index.js @@ -105,7 +105,7 @@ export { user_effect, user_pre_effect } from './reactivity/effects.js'; -export { mutable_source, mutate, source, source_link, set } from './reactivity/sources.js'; +export { mutable_source, mutate, source, set } from './reactivity/sources.js'; export { prop, rest_props, diff --git a/packages/svelte/src/internal/client/reactivity/sources.js b/packages/svelte/src/internal/client/reactivity/sources.js index edfa8806e8..86427a7509 100644 --- a/packages/svelte/src/internal/client/reactivity/sources.js +++ b/packages/svelte/src/internal/client/reactivity/sources.js @@ -26,7 +26,6 @@ import { MAYBE_DIRTY } from '../constants.js'; import * as e from '../errors.js'; -import { derived } from './deriveds.js'; let inspect_effects = new Set(); @@ -46,39 +45,6 @@ export function source(v) { }; } -/** - * @template V - * @param {() => V} get_value - * @returns {(value?: V) => V} - */ -export function source_link(get_value) { - var was_local = false; - var local_source = source(/** @type {V} */ (undefined)); - - var linked_derived = derived(() => { - var local_value = /** @type {V} */ (get(local_source)); - var linked_value = get_value(); - - if (was_local) { - was_local = false; - return local_value; - } - - return linked_value; - }); - - return function (/** @type {any} */ value) { - if (arguments.length > 0) { - was_local = true; - set(local_source, value); - get(linked_derived); - return value; - } - - return (local_source.v = get(linked_derived)); - }; -} - /** * @template V * @param {V} initial_value diff --git a/packages/svelte/src/utils.js b/packages/svelte/src/utils.js index 880fe9a2d4..289a9523de 100644 --- a/packages/svelte/src/utils.js +++ b/packages/svelte/src/utils.js @@ -393,7 +393,6 @@ export function is_mathml(name) { const RUNES = /** @type {const} */ ([ '$state', - '$state.link', '$state.raw', '$state.snapshot', '$props', diff --git a/packages/svelte/tests/runtime-runes/samples/state-link-class/_config.js b/packages/svelte/tests/runtime-runes/samples/state-link-class/_config.js deleted file mode 100644 index 4628d4f5b4..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/state-link-class/_config.js +++ /dev/null @@ -1,19 +0,0 @@ -import { flushSync } from 'svelte'; -import { test } from '../../test'; - -export default test({ - html: ``, - - test({ assert, target }) { - const [btn1, btn2] = target.querySelectorAll('button'); - - flushSync(() => btn1.click()); - assert.htmlEqual(target.innerHTML, ``); - - flushSync(() => btn2.click()); - assert.htmlEqual(target.innerHTML, ``); - - flushSync(() => btn1.click()); - assert.htmlEqual(target.innerHTML, ``); - } -}); diff --git a/packages/svelte/tests/runtime-runes/samples/state-link-class/main.svelte b/packages/svelte/tests/runtime-runes/samples/state-link-class/main.svelte deleted file mode 100644 index 30d8968f8c..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/state-link-class/main.svelte +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/packages/svelte/tests/runtime-runes/samples/state-link-object/_config.js b/packages/svelte/tests/runtime-runes/samples/state-link-object/_config.js deleted file mode 100644 index a0cf4b3c3f..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/state-link-object/_config.js +++ /dev/null @@ -1,24 +0,0 @@ -import { flushSync } from 'svelte'; -import { test } from '../../test'; - -export default test({ - html: ``, - - test({ assert, target }) { - const [btn1, btn2, btn3] = target.querySelectorAll('button'); - - flushSync(() => btn1.click()); - assert.htmlEqual(target.innerHTML, ``); - - // mutate the original object, via the link - flushSync(() => btn2.click()); - assert.htmlEqual(target.innerHTML, ``); - - // mutate the copy - flushSync(() => btn3.click()); - assert.htmlEqual(target.innerHTML, ``); - - flushSync(() => btn1.click()); - assert.htmlEqual(target.innerHTML, ``); - } -}); diff --git a/packages/svelte/tests/runtime-runes/samples/state-link-object/main.svelte b/packages/svelte/tests/runtime-runes/samples/state-link-object/main.svelte deleted file mode 100644 index ec7dec4507..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/state-link-object/main.svelte +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/packages/svelte/tests/runtime-runes/samples/state-link/_config.js b/packages/svelte/tests/runtime-runes/samples/state-link/_config.js deleted file mode 100644 index 4628d4f5b4..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/state-link/_config.js +++ /dev/null @@ -1,19 +0,0 @@ -import { flushSync } from 'svelte'; -import { test } from '../../test'; - -export default test({ - html: ``, - - test({ assert, target }) { - const [btn1, btn2] = target.querySelectorAll('button'); - - flushSync(() => btn1.click()); - assert.htmlEqual(target.innerHTML, ``); - - flushSync(() => btn2.click()); - assert.htmlEqual(target.innerHTML, ``); - - flushSync(() => btn1.click()); - assert.htmlEqual(target.innerHTML, ``); - } -}); diff --git a/packages/svelte/tests/runtime-runes/samples/state-link/main.svelte b/packages/svelte/tests/runtime-runes/samples/state-link/main.svelte deleted file mode 100644 index aaa8d4ecaf..0000000000 --- a/packages/svelte/tests/runtime-runes/samples/state-link/main.svelte +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/packages/svelte/types/index.d.ts b/packages/svelte/types/index.d.ts index 535250bc77..09e9a23888 100644 --- a/packages/svelte/types/index.d.ts +++ b/packages/svelte/types/index.d.ts @@ -927,7 +927,6 @@ declare module 'svelte/compiler' { | 'bindable_prop' | 'rest_prop' | 'state' - | 'linked_state' | 'raw_state' | 'derived' | 'each' @@ -2913,32 +2912,6 @@ declare namespace $state { * * @param initial The initial value */ - - /** - * Declares reactive state that is linked to another value. Local reassignments - * will override the linked value until the linked value changes. - * - * Example: - * ```ts - * let a = $state(0); - * let b = $state.link(a); - - * a = 1; - * console.log(a, b); // 1, 1 - - * b = 2; // unlink - * console.log(a, b); // 1, 2 - * - * a = 3; // relink - * console.log(a, b); // 3, 3 - * ``` - * - * https://svelte-5-preview.vercel.app/docs/runes#$state-link - * - * @param value The linked value - */ - export function link(value: T): T; - export function raw(initial: T): T; export function raw(): T | undefined; /** diff --git a/sites/svelte-5-preview/src/lib/autocomplete.js b/sites/svelte-5-preview/src/lib/autocomplete.js index d2e989e4d6..b535c7ff04 100644 --- a/sites/svelte-5-preview/src/lib/autocomplete.js +++ b/sites/svelte-5-preview/src/lib/autocomplete.js @@ -118,7 +118,6 @@ const runes = [ { snippet: '$bindable()', test: is_bindable }, { snippet: '$effect.root(() => {\n\t${}\n})' }, { snippet: '$state.snapshot(${})' }, - { snippet: '$state.link(${})' }, { snippet: '$effect.tracking()' }, { snippet: '$inspect(${});', test: is_statement } ]; diff --git a/sites/svelte-5-preview/src/routes/docs/content/01-api/02-runes.md b/sites/svelte-5-preview/src/routes/docs/content/01-api/02-runes.md index 5fbed65a09..02cea6ffb4 100644 --- a/sites/svelte-5-preview/src/routes/docs/content/01-api/02-runes.md +++ b/sites/svelte-5-preview/src/routes/docs/content/01-api/02-runes.md @@ -64,33 +64,6 @@ Only plain objects and arrays [are made deeply reactive](/#H4sIAAAAAAAAE42QwWrDM In non-runes mode, a `let` declaration is treated as reactive state if it is updated at some point. Unlike `$state(...)`, which works anywhere in your app, `let` only behaves this way at the top level of a component. -## `$state.link` - -Linked state stays up to date with its input: - -```js -let a = $state(0); -let b = $state.link(a); - -a = 1; -console.log(a, b); // 1, 1 -``` - -You can temporarily _unlink_ state. It will be _relinked_ when the input value changes: - -```js -let a = 1; -let b = 1; -// ---cut--- -b = 2; // unlink -console.log(a, b); // 1, 2 - -a = 3; // relink -console.log(a, b); // 3, 3 -``` - -As with `$state`, if `$state.link` is passed a plain object or array it will be made deeply reactive. If passed an existing state proxy it will be reused, meaning that mutating the linked state will mutate the original. To clone a state proxy, you can use [`$state.snapshot`](#$state-snapshot). - ## `$state.raw` State declared with `$state.raw` cannot be mutated; it can only be _reassigned_. In other words, rather than assigning to a property of an object, or using an array method like `push`, replace the object or array altogether if you'd like to update it: