chore: generate uuid for nodes

sveltejs · Apr 1, 2024 · e33687c · e33687c
1 parent fb8a72d
commit e33687c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 18 deletions.
diff --git a/src/app.d.ts b/src/app.d.ts
@@ -34,7 +34,7 @@ declare global {
 	};
 
 	type SvelteBlockDetail = {
-		id: number;
+		id: string; // crypto.randomUUID();
 		source: string;
 		type:
 			| 'anchor'

diff --git a/src/client/index.js b/src/client/index.js
@@ -202,8 +202,8 @@ addListener({
 	add(node, anchor) {
 		send('bridge::courier/node->add', {
 			node: serialize(node),
-			target: node.parent?.id ?? null,
-			anchor: anchor?.id ?? null,
+			target: node.parent?.id,
+			anchor: anchor?.id,
 		});
 	},
 

diff --git a/src/client/svelte.js b/src/client/svelte.js
@@ -3,17 +3,13 @@ import { listeners } from './listener.js';
 
 /** @type {undefined | SvelteBlockDetail} */
 let current_block;
-let pointer = 0;
 
-/** @param {number | Node} id */
+/** @param {string | Node} id */
 export function getNode(id) {
 	return nodes.map.get(id);
 }
 
 const nodes = {
-	/** @type {SvelteBlockDetail[]} */
-	root: [],
-
 	/** @type {Map<any, SvelteBlockDetail>} */
 	map: new Map(),
 
@@ -33,8 +29,6 @@ const nodes = {
 			const index = target.children.findIndex((n) => n === sibling);
 			if (index === -1) target.children.push(node);
 			else target.children.splice(index, 0, node);
-		} else {
-			this.root.push(node);
 		}
 
 		listeners.add(node, sibling);
@@ -81,7 +75,7 @@ document.addEventListener('SvelteRegisterComponent', ({ detail }) => {
 let last_promise;
 document.addEventListener('SvelteRegisterBlock', ({ detail }) => {
 	const { type, id, block, ...rest } = detail;
-	const current_node_id = pointer++;
+	const current_node_id = crypto.randomUUID();
 
 	if (block.m) {
 		const original = block.m;
@@ -134,7 +128,7 @@ document.addEventListener('SvelteRegisterBlock', ({ detail }) => {
 					// @ts-expect-error - each block fallback
 					group = /** @type {SvelteBlockDetail} */ ({
 						version: '',
-						id: pointer++,
+						id: crypto.randomUUID(),
 						type: 'block',
 						tagName: 'each',
 						container: parent,
@@ -214,7 +208,7 @@ document.addEventListener('SvelteDOMInsert', ({ detail }) => {
 			target,
 			// @ts-expect-error - missing properties are irrelevant
 			node: {
-				id: pointer++,
+				id: crypto.randomUUID(),
 				type,
 				detail: element,
 				tagName: element.nodeName.toLowerCase(),

diff --git a/src/lib/panel/PropertyList.svelte b/src/lib/panel/PropertyList.svelte
@@ -2,18 +2,16 @@
 	import Expandable from './Expandable.svelte';
 
 	export let entries: Array<{ key: string; value: any }> = [];
-	export let id: number;
+	export let id: string;
 	export let readonly = false;
 
 	const errors: Record<string, string | undefined> = {};
 	function change(key: string, value: any) {
 		chrome.devtools.inspectedWindow.eval(
-			`__svelte_devtools_inject_state(${id}, '${key}', ${value})`,
+			`__svelte_devtools_inject_state("${id}", "${key}", ${value})`,
 			(_, error) => {
 				errors[key] =
-					error && error.isException
-						? error.value.substring(0, error.value.indexOf('\n'))
-						: undefined;
+					error && error.isException ? error.value.slice(0, error.value.indexOf('\n')) : undefined;
 			},
 		);
 	}