Skip to content
Open
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/honest-dingos-bake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'svelte': minor
---

feat: allow deriveds to reference their own values
42 changes: 6 additions & 36 deletions packages/svelte/src/internal/client/reactivity/deriveds.js
Original file line number Diff line number Diff line change
Expand Up @@ -291,13 +291,6 @@ export function destroy_derived_effects(derived) {
}
}

/**
* The currently updating deriveds, used to detect infinite recursion
* in dev mode and provide a nicer error than 'too much recursion'
* @type {Derived[]}
*/
let stack = [];

/**
* @param {Derived} derived
* @returns {Effect | null}
Expand All @@ -321,40 +314,17 @@ function get_derived_parent_effect(derived) {
* @returns {T}
*/
export function execute_derived(derived) {
var value;
var prev_active_effect = active_effect;

set_active_effect(get_derived_parent_effect(derived));

if (DEV) {
let prev_eager_effects = eager_effects;
set_eager_effects(new Set());
try {
if (includes.call(stack, derived)) {
e.derived_references_self();
}

stack.push(derived);

derived.f &= ~WAS_MARKED;
destroy_derived_effects(derived);
value = update_reaction(derived);
} finally {
set_active_effect(prev_active_effect);
set_eager_effects(prev_eager_effects);
stack.pop();
}
} else {
try {
derived.f &= ~WAS_MARKED;
destroy_derived_effects(derived);
value = update_reaction(derived);
} finally {
set_active_effect(prev_active_effect);
}
try {
derived.f &= ~WAS_MARKED;
destroy_derived_effects(derived);
return update_reaction(derived);
} finally {
set_active_effect(prev_active_effect);
}

return value;
}

/**
Expand Down
13 changes: 12 additions & 1 deletion packages/svelte/src/internal/client/runtime.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,10 @@ export function is_dirty(reaction) {
for (var i = 0; i < length; i++) {
var dependency = dependencies[i];

if (is_dirty(/** @type {Derived} */ (dependency))) {
if (
(dependency.f & REACTION_IS_UPDATING) === 0 &&
is_dirty(/** @type {Derived} */ (dependency))
) {
update_derived(/** @type {Derived} */ (dependency));
}

Expand Down Expand Up @@ -624,6 +627,14 @@ export function get(signal) {
if (is_derived) {
var derived = /** @type {Derived} */ (signal);

if ((derived.f & REACTION_IS_UPDATING) !== 0) {
return derived.v === UNINITIALIZED
? /** @type {V} */ (undefined)
: batch_values?.has(derived)
? batch_values.get(derived)
: derived.v;
}

if (is_destroying_effect) {
var value = derived.v;

Expand Down

This file was deleted.

This file was deleted.

Loading