Skip to content

feat: simplify props #9767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed
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
Original file line number Diff line number Diff line change
Expand Up @@ -795,31 +795,51 @@ function serialize_inline_component(node, component_name, context) {
push_prop(
b.get(attribute.name, [
b.return(
b.call(
'$.exposable',
b.thunk(
/** @type {import('estree').Expression} */ (context.visit(attribute.expression))
)
)
context.state.analysis.immutable
? /** @type {import('estree').Expression} */ (context.visit(attribute.expression))
: b.call(
'$.exposable',
b.thunk(
/** @type {import('estree').Expression} */ (
context.visit(attribute.expression)
)
)
)
)
])
);
// If the binding is just a reference to a top level state variable
// we don't need a setter as the inner component can write to the signal directly
const binding =
attribute.expression.type !== 'Identifier'
? null
: context.state.scope.get(attribute.expression.name);
if (
binding === null ||
(binding.kind !== 'state' && binding.kind !== 'prop' && binding.kind !== 'rest_prop')
) {

if (attribute.expression.type === 'Identifier') {
const assignment = b.assignment('=', attribute.expression, b.id('$$value'));
push_prop(
b.set(attribute.name, [
b.stmt(serialize_set_binding(assignment, context, () => context.visit(assignment)))
])
);
} else {
if (context.state.analysis.immutable) {
const assignment = b.assignment('=', attribute.expression, b.id('$$value'));
push_prop(
b.set(attribute.name, [
b.stmt(
b.assignment(
'=',
/** @type {import('estree').MemberExpression} */ (
context.visit(attribute.expression)
),
b.id('$$value')
)
)
])
);
} else {
const assignment = b.assignment('=', attribute.expression, b.id('$$value'));
push_prop(
b.set(attribute.name, [
b.stmt(serialize_set_binding(assignment, context, () => context.visit(assignment)))
])
);
}
}
}
}
Expand Down
114 changes: 54 additions & 60 deletions packages/svelte/src/internal/client/runtime.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { DEV } from 'esm-env';
import { subscribe_to_store } from '../../store/utils.js';
import { EMPTY_FUNC, run_all } from '../common.js';
import { get_descriptors, is_array } from './utils.js';
import { get_descriptor, get_descriptors, is_array } from './utils.js';

export const SOURCE = 1;
export const DERIVED = 1 << 1;
Expand Down Expand Up @@ -1470,88 +1470,82 @@ export function is_store(val) {
*/
export function prop_source(props_obj, key, immutable, default_value, call_default_value) {
const props = is_signal(props_obj) ? get(props_obj) : props_obj;
const possible_signal = /** @type {import('./types.js').MaybeSignal<V>} */ (
expose(() => props[key])
);
const update_bound_prop = Object.getOwnPropertyDescriptor(props, key)?.set;
const desc = get_descriptor(props, key);
const setter = desc && desc.set;

let value = props[key];
const should_set_default_value = value === undefined && default_value !== undefined;
let was_defined = value !== undefined;

if (
is_signal(possible_signal) &&
possible_signal.v === value &&
update_bound_prop === undefined
) {
if (should_set_default_value) {
set(
possible_signal,
// @ts-expect-error would need a cumbersome method overload to type this
call_default_value ? default_value() : default_value
);
/** @type {import('./types.js').SourceSignal | undefined} */
let exposed = undefined;

if (setter !== undefined) {
if (default_value !== undefined) {
// TODO consolidate all these random runtime errors
throw new Error('Cannot use fallback values with bind:');
}
return possible_signal;

exposed = expose(() => props[key]);
}

if (should_set_default_value) {
value =
// @ts-expect-error would need a cumbersome method overload to type this
call_default_value ? default_value() : default_value;
if (!was_defined && default_value !== undefined) {
value = call_default_value ? /** @type {() => V} */ (default_value)() : default_value;
}

const source_signal = immutable ? source(value) : mutable_source(value);

// Synchronize prop changes with source signal.
// Needs special equality checking because the prop in the
// parent could be changed through `foo.bar = 'new value'`.
let ignore_next1 = false;
let ignore_next2 = false;
let did_update_to_defined = !should_set_default_value;
let updating = false;
let initial = true;

let mount = true;
// sync parent to child
sync_effect(() => {
const props = is_signal(props_obj) ? get(props_obj) : props_obj;
// Before if to ensure signal dependency is registered
const propagating_value = props[key];
if (mount) {
mount = false;
const value = props[key];

// console.log('ptc', { key, value, initial, updating });

if (initial) {
initial = false;
return;
}
if (ignore_next1) {
ignore_next1 = false;
return;

if (updating) return;
updating = true;

if (value !== undefined) {
was_defined = true;
}

if (
// Ensure that updates from undefined to undefined are ignored
(did_update_to_defined || propagating_value !== undefined) &&
not_equal(immutable, propagating_value, source_signal.v)
) {
ignore_next2 = true;
did_update_to_defined = true;
// TODO figure out why we need it this way and the explain in a comment;
// some tests fail is we just do set_signal_value(source_signal, propagating_value)
untrack(() => set_signal_value(source_signal, propagating_value));
if (was_defined) {
set(source_signal, value);
}

updating = false;
});

if (is_signal(possible_signal) && update_bound_prop !== undefined) {
let ignore_first = !should_set_default_value;
// sync child to parent
// TODO get rid of the props signal, so we can just write these as `$$props.foo = ...`
// instead of mucking about with effects (we can probably delete sync_effect)
if (setter) {
let initial = true;

sync_effect(() => {
// Before if to ensure signal dependency is registered
const propagating_value = get(source_signal);
if (ignore_first) {
ignore_first = false;
return;
}
if (ignore_next2) {
ignore_next2 = false;
const value = get(source_signal);

// console.log('ctp', { key, value, initial });

if (initial) {
initial = false;
return;
}

if (not_equal(immutable, propagating_value, possible_signal.v)) {
ignore_next1 = true;
did_update_to_defined = true;
untrack(() => update_bound_prop(propagating_value));
if (updating) return;

setter(value);

// legacy
if (exposed) {
set(exposed, exposed.v);
}
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<script>
import { getContext } from "svelte";

export let count = 0;
export let count;

const context = getContext("context");
</script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import { setContext } from "svelte";
import Counter from "./Counter.svelte";

export let count;
export let count = 0;
export let counter;

setContext("context", "works");
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading