Skip to content

chore: improve old value implementation performance #15854

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 4 commits 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
5 changes: 5 additions & 0 deletions .changeset/early-ties-study.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'svelte': patch
---

chore: improve old value implementation performance
71 changes: 67 additions & 4 deletions packages/svelte/src/internal/client/reactivity/sources.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/** @import { Derived, Effect, Source, Value } from '#client' */
/** @import { Derived, Effect, Source, Value, ValueNode } from '#client' */
import { DEV } from 'esm-env';
import {
active_reaction,
Expand Down Expand Up @@ -37,7 +37,70 @@ import { proxy } from '../proxy.js';
import { execute_derived } from './deriveds.js';

export let inspect_effects = new Set();
export const old_values = new Map();
/** @type { null | ValueNode } */
export let old_value_node = null;
/** @type { null | ValueNode } */
export let last_old_value_node = null;

export function clear_old_value_node() {
old_value_node = null;
last_old_value_node = null;
}

/**
* @param {Source} signal
*/
export function get_old_value_node(signal) {
let current = old_value_node;
while (current !== null) {
if (current.s === signal) {
return current;
}
current = current.n;
}
return null;
}

/**
* @param {Source} signal
* @param {any} value
*/
function create_value_node(signal, value) {
return {
s: signal,
v: value,
n: null
};
}

/**
* @param {Source} signal
* @param {any} value
*/
function set_old_value(signal, value) {
const value_node = get_old_value_node(signal);
if (value_node !== null) {
value_node.v = value;
return;
}
add_old_value(signal, value);
}

/**
* @param {Source} signal
* @param {any} value
*/
function add_old_value(signal, value) {
const value_node = create_value_node(signal, value);

if (last_old_value_node === null) {
last_old_value_node = value_node;
old_value_node = value_node;
} else {
last_old_value_node.n = value_node;
last_old_value_node = value_node;
}
}

/**
* @param {Set<any>} v
Expand Down Expand Up @@ -155,9 +218,9 @@ export function internal_set(source, value) {
var old_value = source.v;

if (is_destroying_effect) {
old_values.set(source, value);
set_old_value(source, value);
} else {
old_values.set(source, old_value);
add_old_value(source, old_value);
}

source.v = value;
Expand Down
2 changes: 2 additions & 0 deletions packages/svelte/src/internal/client/reactivity/types.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,5 @@ export interface Effect extends Reaction {
export type Source<V = unknown> = Value<V>;

export type MaybeSource<T = unknown> = T | Source<T>;

export type ValueNode = { s: Source; n: null | ValueNode; v: any };
11 changes: 7 additions & 4 deletions packages/svelte/src/internal/client/runtime.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
EFFECT_IS_UPDATING
} from './constants.js';
import { flush_tasks } from './dom/task.js';
import { internal_set, old_values } from './reactivity/sources.js';
import { clear_old_value_node, internal_set, get_old_value_node } from './reactivity/sources.js';
import { destroy_derived_effects, update_derived } from './reactivity/deriveds.js';
import * as e from './errors.js';
import { FILENAME } from '../../constants.js';
Expand Down Expand Up @@ -676,7 +676,7 @@ function flush_queued_root_effects() {
var collected_effects = process_effects(root_effects[i]);
flush_queued_effects(collected_effects);
}
old_values.clear();
clear_old_value_node();
}
} finally {
is_flushing = false;
Expand Down Expand Up @@ -931,8 +931,11 @@ export function get(signal) {
}
}

if (is_destroying_effect && old_values.has(signal)) {
return old_values.get(signal);
if (is_destroying_effect) {
const value_node = get_old_value_node(signal);
if (value_node !== null) {
return value_node.v;
}
}

return signal.v;
Expand Down