Skip to content

fix: fix string name of reactive map and set iterator #11169

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

Merged
merged 3 commits into from
Apr 14, 2024
Merged
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/shy-fishes-drive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"svelte": patch
---

fix: fix string name of reactive map and set iterator
5 changes: 3 additions & 2 deletions packages/svelte/src/reactivity/map.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,15 @@ export class ReactiveMap extends Map {

values() {
get(this.#version);
return map(this.#sources.values(), get);
return map(this.#sources.values(), get, 'Map Iterator');
}

entries() {
get(this.#version);
return map(
this.#sources.entries(),
([key, source]) => /** @type {[K, V]} */ ([key, get(source)])
([key, source]) => /** @type {[K, V]} */ ([key, get(source)]),
'Map Iterator'
);
}

Expand Down
4 changes: 2 additions & 2 deletions packages/svelte/src/reactivity/set.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,15 @@ export class ReactiveSet extends Set {

keys() {
get(this.#version);
return this.#sources.keys();
return map(this.#sources.keys(), (key) => key, 'Set Iterator');
}

values() {
return this.keys();
}

entries() {
return map(this.keys(), (key) => /** @type {[T, T]} */ ([key, key]));
return map(this.keys(), (key) => /** @type {[T, T]} */ ([key, key]), 'Set Iterator');
}

[Symbol.iterator]() {
Expand Down
7 changes: 6 additions & 1 deletion packages/svelte/src/reactivity/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
* @template U
* @param {Iterable<T>} iterable
* @param {(value: T) => U} fn
* @param {string} name
* @returns {IterableIterator<U>}
*/
export function map(iterable, fn) {
export function map(iterable, fn, name) {
return {
[Symbol.iterator]: get_this,
next() {
Expand All @@ -14,6 +15,10 @@ export function map(iterable, fn) {
}

return { done: true, value: undefined };
},
// @ts-expect-error
get [Symbol.toStringTag]() {
return name;
}
};
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { test } from '../../test';

export default test({
html: `
<div>[object Set Iterator] [object Set Iterator] [object Set Iterator]</div>
<div>[object Set Iterator] [object Set Iterator] [object Set Iterator]</div>
<div>[object Map Iterator] [object Map Iterator] [object Map Iterator]</div>
<div>[object Map Iterator] [object Map Iterator] [object Map Iterator]</div>
`
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<script>
import { Set as ReactiveSet, Map as ReactiveMap } from 'svelte/reactivity';

let map = new Map();
let set = new Set();
let rmap = new ReactiveMap();
let rset = new ReactiveSet();
</script>

<div>{rset.entries()} {rset.keys()} {rset.values()}</div>
<div>{set.entries()} {set.keys()} {set.values()}</div>
<div>{rmap.entries()} {rmap.keys()} {rmap.values()}</div>
<div>{map.entries()} {map.keys()} {map.values()}</div>