msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

fix: populate `this.#sources` when constructing reactive map (#11915)

Browse Source 
* fix: populate `this.#sources` when constructing reactive map

* populate sources in first #read_all

* use increment helper

* use numbers instead of symbols

* make forEach work
pull/11899/head
Rich Harris 1 year ago committed by GitHub
parent 862949d22a
commit b1cbfc3d38
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File

2
.changeset/cold-beans-tease.md
Unescape View File

@ -2,4 +2,4 @@
'svelte': patch
---
fix: increment version when creating new source in Map.get or Map.has
fix: populate `this.#sources` when constructing reactive map

43
packages/svelte/src/reactivity/map.js
Unescape View File

@ -1,7 +1,7 @@
import { DEV } from 'esm-env';
import { source, set } from '../internal/client/reactivity/sources.js';
import { get } from '../internal/client/runtime.js';
import { UNINITIALIZED } from '../constants.js';
import { increment } from './utils.js';
/**
* @template K
@ -9,7 +9,7 @@ import { UNINITIALIZED } from '../constants.js';
* @extends {Map<K, V>}
*/
export class ReactiveMap extends Map {
/** @type {Map<K, import('#client').Source<symbol>>} */
/** @type {Map<K, import('#client').Source<number>>} */
#sources = new Map();
#version = source(0);
#size = source(0);
@ -31,10 +31,6 @@ export class ReactiveMap extends Map {
}
}
#increment_version() {
set(this.#version, this.#version.v + 1);
}
/** @param {K} key */
has(key) {
var sources = this.#sources;
@ -43,9 +39,8 @@ export class ReactiveMap extends Map {
if (s === undefined) {
var ret = super.get(key);
if (ret !== undefined) {
s = source(Symbol());
s = source(0);
sources.set(key, s);
this.#increment_version();
} else {
// We should always track the version in case
// the Set ever gets this value in the future.
@ -63,9 +58,8 @@ export class ReactiveMap extends Map {
* @param {any} [this_arg]
*/
forEach(callbackfn, this_arg) {
get(this.#version);
return super.forEach(callbackfn, this_arg);
this.#read_all();
super.forEach(callbackfn, this_arg);
}
/** @param {K} key */
@ -76,9 +70,8 @@ export class ReactiveMap extends Map {
if (s === undefined) {
var ret = super.get(key);
if (ret !== undefined) {
s = source(Symbol());
s = source(0);
sources.set(key, s);
this.#increment_version();
} else {
// We should always track the version in case
// the Set ever gets this value in the future.
@ -102,11 +95,11 @@ export class ReactiveMap extends Map {
var res = super.set(key, value);
if (s === undefined) {
sources.set(key, source(Symbol()));
sources.set(key, source(0));
set(this.#size, super.size);
this.#increment_version();
increment(this.#version);
} else if (prev_res !== value) {
set(s, Symbol());
increment(s);
}
return res;
@ -121,8 +114,8 @@ export class ReactiveMap extends Map {
if (s !== undefined) {
sources.delete(key);
set(this.#size, super.size);
set(s, UNINITIALIZED);
this.#increment_version();
set(s, -1);
increment(this.#version);
}
return res;
@ -134,9 +127,9 @@ export class ReactiveMap extends Map {
if (super.size !== 0) {
set(this.#size, 0);
for (var s of sources.values()) {
set(s, UNINITIALIZED);
set(s, -1);
}
this.#increment_version();
increment(this.#version);
sources.clear();
}
super.clear();
@ -144,6 +137,16 @@ export class ReactiveMap extends Map {
#read_all() {
get(this.#version);
var sources = this.#sources;
if (this.#size.v !== sources.size) {
for (var key of super.keys()) {
if (!sources.has(key)) {
sources.set(key, source(0));
}
}
}
for (var [, s] of this.#sources) {
get(s);
}

11
packages/svelte/src/reactivity/set.js
Unescape View File

@ -1,6 +1,7 @@
import { DEV } from 'esm-env';
import { source, set } from '../internal/client/reactivity/sources.js';
import { get } from '../internal/client/runtime.js';
import { increment } from './utils.js';
var read_methods = ['forEach', 'isDisjointFrom', 'isSubsetOf', 'isSupersetOf'];
var set_like_methods = ['difference', 'intersection', 'symmetricDifference', 'union'];
@ -63,10 +64,6 @@ export class ReactiveSet extends Set {
}
}
#increment_version() {
set(this.#version, this.#version.v + 1);
}
/** @param {T} value */
has(value) {
var sources = this.#sources;
@ -98,7 +95,7 @@ export class ReactiveSet extends Set {
if (s === undefined) {
sources.set(value, source(true));
set(this.#size, super.size);
this.#increment_version();
increment(this.#version);
} else {
set(s, true);
}
@ -116,7 +113,7 @@ export class ReactiveSet extends Set {
sources.delete(value);
set(this.#size, super.size);
set(s, false);
this.#increment_version();
increment(this.#version);
}
return res;
@ -130,7 +127,7 @@ export class ReactiveSet extends Set {
for (var s of sources.values()) {
set(s, false);
}
this.#increment_version();
increment(this.#version);
sources.clear();
}
super.clear();

15
packages/svelte/src/reactivity/url.js
Unescape View File

@ -1,5 +1,6 @@
import { source, set } from '../internal/client/reactivity/sources.js';
import { get } from '../internal/client/runtime.js';
import { increment } from './utils.js';
const REPLACE = Symbol();
@ -155,10 +156,6 @@ export class ReactiveURL extends URL {
export class ReactiveURLSearchParams extends URLSearchParams {
#version = source(0);
#increment_version() {
set(this.#version, this.#version.v + 1);
}
/**
* @param {URLSearchParams} params
*/
@ -171,7 +168,7 @@ export class ReactiveURLSearchParams extends URLSearchParams {
super.append(key, value);
}
this.#increment_version();
increment(this.#version);
}
/**
@ -180,7 +177,7 @@ export class ReactiveURLSearchParams extends URLSearchParams {
* @returns {void}
*/
append(name, value) {
this.#increment_version();
increment(this.#version);
return super.append(name, value);
}
@ -190,7 +187,7 @@ export class ReactiveURLSearchParams extends URLSearchParams {
* @returns {void}
*/
delete(name, value) {
this.#increment_version();
increment(this.#version);
return super.delete(name, value);
}
@ -233,12 +230,12 @@ export class ReactiveURLSearchParams extends URLSearchParams {
* @returns {void}
*/
set(name, value) {
this.#increment_version();
increment(this.#version);
return super.set(name, value);
}
sort() {
this.#increment_version();
increment(this.#version);
return super.sort();
}

7
packages/svelte/src/reactivity/utils.js
Unescape View File

@ -1,3 +1,5 @@
import { set } from '../internal/client/reactivity/sources.js';
/**
* @template T
* @template U
@ -27,3 +29,8 @@ export function map(iterable, fn, name) {
function get_this() {
return this;
}
/** @param {import('#client').Source<number>} source */
export function increment(source) {
set(source, source.v + 1);
}

Write Preview
Loading…
Cancel
Save