Skip to content

chore: ensure effect destruction of deriveds is consistent #13693

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.

Sign up for GitHub

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

Merged
trueadm merged 2 commits into from
Oct 19, 2024
Merged

chore: ensure effect destruction of deriveds is consistent #13693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37fa415
chore: ensure effect destruction of deriveds is consistent
trueadm Oct 19, 2024
e78508a
chore: ensure effect destruction of deriveds is consistent
trueadm Oct 19, 2024
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
51 changes: 50 additions & 1 deletion packages/svelte/src/internal/client/reactivity/effects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
component_context,
active_effect,
active_reaction,
destroy_effect_children,
dev_current_component_function,
update_effect,
get,
Expand Down Expand Up @@ -42,6 +41,7 @@ import * as e from '../errors.js';
import { DEV } from 'esm-env';
import { define_property } from '../../shared/utils.js';
import { get_next_sibling } from '../dom/operations.js';
import { destroy_derived } from './deriveds.js';

/**
* @param {'$effect' | '$effect.pre' | '$inspect'} rune
Expand Down Expand Up @@ -363,6 +363,54 @@ export function execute_effect_teardown(effect) {
}
}

/**
* @param {Effect} signal
* @returns {void}
*/
export function destroy_effect_deriveds(signal) {
var deriveds = signal.deriveds;

if (deriveds !== null) {
signal.deriveds = null;

for (var i = 0; i < deriveds.length; i += 1) {
destroy_derived(deriveds[i]);
}
}
}

/**
* @param {Effect} signal
* @param {boolean} remove_dom
* @returns {void}
*/
export function destroy_effect_children(signal, remove_dom = false) {
var effect = signal.first;
signal.first = signal.last = null;

while (effect !== null) {
var next = effect.next;
destroy_effect(effect, remove_dom);
effect = next;
}
}

/**
* @param {Effect} signal
* @returns {void}
*/
export function destroy_block_effect_children(signal) {
var effect = signal.first;

while (effect !== null) {
var next = effect.next;
if ((effect.f & BRANCH_EFFECT) === 0) {
destroy_effect(effect);
}
effect = next;
}
}

/**
* @param {Effect} effect
* @param {boolean} [remove_dom]
Expand All @@ -387,6 +435,7 @@ export function destroy_effect(effect, remove_dom = true) {
removed = true;
}

destroy_effect_deriveds(effect);
destroy_effect_children(effect, remove_dom && !removed);
remove_reactions(effect, 0);
set_signal_status(effect, DESTROYED);
Expand Down
47 changes: 4 additions & 43 deletions packages/svelte/src/internal/client/runtime.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
import { DEV } from 'esm-env';
import { define_property, get_descriptors, get_prototype_of } from '../shared/utils.js';
import {
destroy_effect,
destroy_block_effect_children,
destroy_effect_children,
destroy_effect_deriveds,
effect,
execute_effect_teardown,
unlink_effect
Expand Down Expand Up @@ -403,48 +405,6 @@ export function remove_reactions(signal, start_index) {
}
}

/**
* @param {Effect} signal
* @param {boolean} remove_dom
* @returns {void}
*/
export function destroy_effect_children(signal, remove_dom = false) {
var deriveds = signal.deriveds;

if (deriveds !== null) {
signal.deriveds = null;

for (var i = 0; i < deriveds.length; i += 1) {
destroy_derived(deriveds[i]);
}
}

var effect = signal.first;
signal.first = signal.last = null;

while (effect !== null) {
var next = effect.next;
destroy_effect(effect, remove_dom);
effect = next;
}
}

/**
* @param {Effect} signal
* @returns {void}
*/
export function destroy_block_effect_children(signal) {
var effect = signal.first;

while (effect !== null) {
var next = effect.next;
if ((effect.f & BRANCH_EFFECT) === 0) {
destroy_effect(effect);
}
effect = next;
}
}

/**
* @param {Effect} effect
* @returns {void}
Expand All @@ -470,6 +430,7 @@ export function update_effect(effect) {
}

try {
destroy_effect_deriveds(effect);
if ((flags & BLOCK_EFFECT) !== 0) {
destroy_block_effect_children(effect);
} else {
Expand Down