Skip to content

fix: improve deep cloning for graph and resampling to handle non-cloneable properties #1365

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.

Sign up for GitHub

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

Open
SheepFromHeaven wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: improve deep cloning for graph and resampling to handle non-cloneable properties #1365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b80dc94
fix: improve deep cloning for graph and resampling to handle non-clon…
SheepFromHeaven Mar 26, 2026
a566150
refactor: replace safeDeepClone with structuredClone for improved clo…
SheepFromHeaven Apr 4, 2026
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
9 changes: 8 additions & 1 deletion public/modules/dynamic/heightmap-selection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,14 @@ function getName(id) {
}

function getGraph(currentGraph) {
const newGraph = shouldRegenerateGrid(currentGraph, seed) ? generateGrid() : structuredClone(currentGraph);
if (shouldRegenerateGrid(currentGraph, seed)) return generateGrid();

// Deep clone avoiding non-cloneable properties (like D3 quadtrees with functions)
const newGraph = JSON.parse(JSON.stringify(currentGraph));
// Recreate voronoi cells since JSON doesn't preserve typed arrays or circular refs
const {cells, vertices} = calculateVoronoi(newGraph.points, newGraph.boundary);
newGraph.cells = cells;
newGraph.vertices = vertices;
delete newGraph.cells.h;
return newGraph;
Comment on lines +265 to 272
Copy link

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using JSON.parse(JSON.stringify(currentGraph)) as a deep clone is fragile and can be very expensive for large graphs. It also drops/rewrites non-JSON-safe values (typed arrays, undefined, Infinity/NaN, etc.), and will still throw if any circular references exist. Consider cloning only the specific fields needed for preview generation (e.g., points/boundary/dimensions), or using a dedicated clone that explicitly omits the non-cloneable quadtree rather than serializing the entire graph.

Copilot uses AI. Check for mistakes.
}
Expand Down
2 changes: 1 addition & 1 deletion src/types/PackedGraph.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export interface PackedGraph {
p: [number, number][]; // cell polygon points
b: boolean[]; // cell is on border
h: TypedArray; // cell heights
q: Quadtree<[number, number, number]>; // cell quadtree index
q?: Quadtree<[number, number, number]>; // cell quadtree index (optional, not cloned)
Copy link

Copilot AI Mar 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Making PackedGraph.cells.q optional is a type-level breaking change for any code that expects cells.q to always exist. If q is only non-cloneable transient state, consider modeling it outside of PackedGraph (or as a separate runtime-only augmentation type) so consumers of PackedGraph don't need to handle undefined everywhere.

Copilot uses AI. Check for mistakes.
/** Terrain type */
t: TypedArray; // cell terrain types
r: TypedArray; // river id passing through cell
Expand Down
Loading