@dcl/ecs 7.24.2 → 7.24.3-28183854529.commit-ed08c4e

package/dist/runtime/helpers/coordinates.js

@@ -1,3 +1,7 @@
+/** Returns a string representation of the given coordinates in the format "x,y" */
+function formatCoord(coord) {
+    return `${coord.x},${coord.y}`;
+}
 /**
  * Returns true if the given parcels array are connected
  */
@@ -5,8 +9,8 @@ export function areConnected(parcels) {
     if (parcels.length === 0) {
         return false;
     }
-    const visited = visitParcel(parcels[0], parcels);
-    return visited.length === parcels.length;
+    const visited = visitConnectedParcels(parcels[0], parcels);
+    return visited.size === parcels.length;
 }
 /**
  * Returns true if the given coords are equal
@@ -14,19 +18,38 @@ export function areConnected(parcels) {
 export function isEqual(p1, p2) {
     return p1.x === p2.x && p1.y === p2.y;
 }
-function visitParcel(parcel, allParcels, visited = []) {
-    const isVisited = visited.some((visitedParcel) => isEqual(visitedParcel, parcel));
-    if (!isVisited) {
-        visited.push(parcel);
-        const neighbours = getNeighbours(parcel.x, parcel.y, allParcels);
-        neighbours.forEach((neighbours) => visitParcel(neighbours, allParcels, visited));
+/**
+ * Returns the list of connected parcels starting from the given parcel.
+ * @param parcel - The starting parcel to visit
+ * @param allParcels - The list of all parcels to consider for connectivity
+ * @returns The list of connected parcels starting from the given parcel
+ * @remarks This function uses an iterative depth-first search (DFS) approach to avoid blowing the call stack on large connected parcel sets.
+ */
+function visitConnectedParcels(parcel, allParcels) {
+    const allParcelsSet = new Set(allParcels.map(formatCoord));
+    const visitedSet = new Set();
+    const stackToVisit = [parcel];
+    while (stackToVisit.length > 0) {
+        const currentParcel = stackToVisit.pop();
+        const key = formatCoord(currentParcel);
+        const isVisited = visitedSet.has(key);
+        if (!isVisited) {
+            visitedSet.add(key);
+            const neighbours = getNeighbours(currentParcel.x, currentParcel.y, allParcelsSet);
+            for (const n of neighbours) {
+                if (!visitedSet.has(formatCoord(n)))
+                    stackToVisit.push(n);
+            }
+        }
     }
-    return visited;
-}
-function getIsNeighbourMatcher(x, y) {
-    return (coords) => (coords.x === x && (coords.y + 1 === y || coords.y - 1 === y)) ||
-        (coords.y === y && (coords.x + 1 === x || coords.x - 1 === x));
+    return visitedSet;
 }
 function getNeighbours(x, y, parcels) {
-    return parcels.filter(getIsNeighbourMatcher(x, y));
+    const neighbourCandidates = [
+        { x: x + 1, y },
+        { x: x - 1, y },
+        { x, y: y + 1 },
+        { x, y: y - 1 }
+    ];
+    return neighbourCandidates.filter((c) => parcels.has(formatCoord(c)));
 }

package/dist-cjs/runtime/helpers/coordinates.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isEqual = exports.areConnected = void 0;
+/** Returns a string representation of the given coordinates in the format "x,y" */
+function formatCoord(coord) {
+    return `${coord.x},${coord.y}`;
+}
 /**
  * Returns true if the given parcels array are connected
  */
@@ -8,8 +12,8 @@ function areConnected(parcels) {
     if (parcels.length === 0) {
         return false;
     }
-    const visited = visitParcel(parcels[0], parcels);
-    return visited.length === parcels.length;
+    const visited = visitConnectedParcels(parcels[0], parcels);
+    return visited.size === parcels.length;
 }
 exports.areConnected = areConnected;
 /**
@@ -19,19 +23,38 @@ function isEqual(p1, p2) {
     return p1.x === p2.x && p1.y === p2.y;
 }
 exports.isEqual = isEqual;
-function visitParcel(parcel, allParcels, visited = []) {
-    const isVisited = visited.some((visitedParcel) => isEqual(visitedParcel, parcel));
-    if (!isVisited) {
-        visited.push(parcel);
-        const neighbours = getNeighbours(parcel.x, parcel.y, allParcels);
-        neighbours.forEach((neighbours) => visitParcel(neighbours, allParcels, visited));
+/**
+ * Returns the list of connected parcels starting from the given parcel.
+ * @param parcel - The starting parcel to visit
+ * @param allParcels - The list of all parcels to consider for connectivity
+ * @returns The list of connected parcels starting from the given parcel
+ * @remarks This function uses an iterative depth-first search (DFS) approach to avoid blowing the call stack on large connected parcel sets.
+ */
+function visitConnectedParcels(parcel, allParcels) {
+    const allParcelsSet = new Set(allParcels.map(formatCoord));
+    const visitedSet = new Set();
+    const stackToVisit = [parcel];
+    while (stackToVisit.length > 0) {
+        const currentParcel = stackToVisit.pop();
+        const key = formatCoord(currentParcel);
+        const isVisited = visitedSet.has(key);
+        if (!isVisited) {
+            visitedSet.add(key);
+            const neighbours = getNeighbours(currentParcel.x, currentParcel.y, allParcelsSet);
+            for (const n of neighbours) {
+                if (!visitedSet.has(formatCoord(n)))
+                    stackToVisit.push(n);
+            }
+        }
     }
-    return visited;
-}
-function getIsNeighbourMatcher(x, y) {
-    return (coords) => (coords.x === x && (coords.y + 1 === y || coords.y - 1 === y)) ||
-        (coords.y === y && (coords.x + 1 === x || coords.x - 1 === x));
+    return visitedSet;
 }
 function getNeighbours(x, y, parcels) {
-    return parcels.filter(getIsNeighbourMatcher(x, y));
+    const neighbourCandidates = [
+        { x: x + 1, y },
+        { x: x - 1, y },
+        { x, y: y + 1 },
+        { x, y: y - 1 }
+    ];
+    return neighbourCandidates.filter((c) => parcels.has(formatCoord(c)));
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dcl/ecs",
   "description": "Decentraland ECS",
-  "version": "7.24.2",
+  "version": "7.24.3-28183854529.commit-ed08c4e",
   "author": "DCL",
   "bugs": "https://github.com/decentraland/ecs/issues",
   "files": [
@@ -34,5 +34,5 @@
   "dependencies": {},
   "types": "./dist/index.d.ts",
   "typings": "./dist/index.d.ts",
-  "commit": "0c395302e3bc05ab4354776769a97ec9be81a741"
+  "commit": "ed08c4e2ba560914e13634e28ab7879b70c01070"
 }