Improve collect_nodes

frontend/src/messages.ts

@@ -78,7 +78,7 @@ export class UpdateLayerWidths extends JsMessage {
 }
 
 export class UpdateNodeGraphNodes extends JsMessage {
-	readonly nodesToRender!: FrontendNode[];
+	readonly nodesToRender!: FrontendNodeToRender[];
 
 	readonly inSelectedNetwork!: boolean;
 
@@ -199,6 +199,8 @@ export class FrontendGraphOutput {
 }
 
 export class FrontendNodeMetadata {
+	readonly nodeId!: bigint;
+
 	readonly canBeLayer!: boolean;
 
 	readonly displayName!: string;
@@ -255,11 +257,15 @@ export class FrontendLayerPosition {
 }
 
 export class FrontendNodeOrLayer {
-	readonly metadata!: FrontendNodeMetadata;
 	readonly node!: FrontendNode | undefined;
 	readonly layer!: FrontendLayer | undefined;
 }
 
+export class FrontendNodeToRender {
+	readonly metadata!: FrontendNodeMetadata;
+	readonly nodeOrLayer!: FrontendNodeOrLayer;
+}
+
 export class UpdateCentralNodeGraph extends JsMessage {
 	readonly nodeOrLayer!: FrontendNodeOrLayer[];
 	readonly inSelectedNetwork!: boolean;

frontend/src/state-providers/node-graph.ts

@@ -1,11 +1,11 @@
 import { writable } from "svelte/store";
 
 import { type Editor } from "@graphite/editor";
-import type { FrontendNodeOrLayer } from "@graphite/messages";
 import {
 	type Box,
 	type FrontendClickTargets,
 	type ContextMenuInformation,
+	type FrontendNodeToRender,
 	type FrontendNodeType,
 	type WirePath,
 	ClearAllNodeGraphWires,
@@ -102,7 +102,7 @@ export function createNodeGraphState(editor: Editor) {
 		update((state) => {
 			state.nodesToRender.clear();
 			updateNodeGraphNodes.nodesToRender.forEach((node) => {
-				state.nodesToRender.set(node.id, node);
+				state.nodesToRender.set(node.metadata.nodeId, node);
 			});
 			state.inSelectedNetwork = updateNodeGraphNodes.inSelectedNetwork;
 			state.previewedNode = updateNodeGraphNodes.previewedNode;