Skip to content

Commit e33687c

Browse files
committed
chore: generate uuid for nodes
1 parent fb8a72d commit e33687c

File tree

4 files changed

+10
-18
lines changed

4 files changed

+10
-18
lines changed

src/app.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ declare global {
3434
};
3535

3636
type SvelteBlockDetail = {
37-
id: number;
37+
id: string; // crypto.randomUUID();
3838
source: string;
3939
type:
4040
| 'anchor'

src/client/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@ addListener({
202202
add(node, anchor) {
203203
send('bridge::courier/node->add', {
204204
node: serialize(node),
205-
target: node.parent?.id ?? null,
206-
anchor: anchor?.id ?? null,
205+
target: node.parent?.id,
206+
anchor: anchor?.id,
207207
});
208208
},
209209

src/client/svelte.js

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,13 @@ import { listeners } from './listener.js';
33

44
/** @type {undefined | SvelteBlockDetail} */
55
let current_block;
6-
let pointer = 0;
76

8-
/** @param {number | Node} id */
7+
/** @param {string | Node} id */
98
export function getNode(id) {
109
return nodes.map.get(id);
1110
}
1211

1312
const nodes = {
14-
/** @type {SvelteBlockDetail[]} */
15-
root: [],
16-
1713
/** @type {Map<any, SvelteBlockDetail>} */
1814
map: new Map(),
1915

@@ -33,8 +29,6 @@ const nodes = {
3329
const index = target.children.findIndex((n) => n === sibling);
3430
if (index === -1) target.children.push(node);
3531
else target.children.splice(index, 0, node);
36-
} else {
37-
this.root.push(node);
3832
}
3933

4034
listeners.add(node, sibling);
@@ -81,7 +75,7 @@ document.addEventListener('SvelteRegisterComponent', ({ detail }) => {
8175
let last_promise;
8276
document.addEventListener('SvelteRegisterBlock', ({ detail }) => {
8377
const { type, id, block, ...rest } = detail;
84-
const current_node_id = pointer++;
78+
const current_node_id = crypto.randomUUID();
8579

8680
if (block.m) {
8781
const original = block.m;
@@ -134,7 +128,7 @@ document.addEventListener('SvelteRegisterBlock', ({ detail }) => {
134128
// @ts-expect-error - each block fallback
135129
group = /** @type {SvelteBlockDetail} */ ({
136130
version: '',
137-
id: pointer++,
131+
id: crypto.randomUUID(),
138132
type: 'block',
139133
tagName: 'each',
140134
container: parent,
@@ -214,7 +208,7 @@ document.addEventListener('SvelteDOMInsert', ({ detail }) => {
214208
target,
215209
// @ts-expect-error - missing properties are irrelevant
216210
node: {
217-
id: pointer++,
211+
id: crypto.randomUUID(),
218212
type,
219213
detail: element,
220214
tagName: element.nodeName.toLowerCase(),

src/lib/panel/PropertyList.svelte

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22
import Expandable from './Expandable.svelte';
33
44
export let entries: Array<{ key: string; value: any }> = [];
5-
export let id: number;
5+
export let id: string;
66
export let readonly = false;
77
88
const errors: Record<string, string | undefined> = {};
99
function change(key: string, value: any) {
1010
chrome.devtools.inspectedWindow.eval(
11-
`__svelte_devtools_inject_state(${id}, '${key}', ${value})`,
11+
`__svelte_devtools_inject_state("${id}", "${key}", ${value})`,
1212
(_, error) => {
1313
errors[key] =
14-
error && error.isException
15-
? error.value.substring(0, error.value.indexOf('\n'))
16-
: undefined;
14+
error && error.isException ? error.value.slice(0, error.value.indexOf('\n')) : undefined;
1715
},
1816
);
1917
}

0 commit comments

Comments
 (0)