@parcel/graph 2.4.2-nightly.2674 → 2.4.2-nightly.2678

package/lib/Graph.js

@@ -117,7 +117,9 @@ class Graph {
 
 
   removeNode(nodeId) {
-    this._assertHasNodeId(nodeId);
+    if (!this.hasNode(nodeId)) {
+      return;
+    }
 
     for (let {
       type,
@@ -140,7 +142,9 @@ class Graph {
   }
 
   removeEdges(nodeId, type = 1) {
-    this._assertHasNodeId(nodeId);
+    if (!this.hasNode(nodeId)) {
+      return;
+    }
 
     for (let to of this.getNodeIdsConnectedFrom(nodeId, type)) {
       this.removeEdge(nodeId, to, type);
@@ -150,7 +154,7 @@ class Graph {
 
   removeEdge(from, to, type = 1, removeOrphans = true) {
     if (!this.adjacencyList.hasEdge(from, to, type)) {
-      throw new Error(`Edge from ${(0, _types.fromNodeId)(from)} to ${(0, _types.fromNodeId)(to)} not found!`);
+      return;
     }
 
     this.adjacencyList.removeEdge(from, to, type);
@@ -161,7 +165,9 @@ class Graph {
   }
 
   isOrphanedNode(nodeId) {
-    this._assertHasNodeId(nodeId);
+    if (!this.hasNode(nodeId)) {
+      return false;
+    }
 
     if (this.rootNodeId == null) {
       // If the graph does not have a root, and there are inbound edges,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/graph",
-  "version": "2.4.2-nightly.2674+1bca9dbb7",
+  "version": "2.4.2-nightly.2678+6851d07fc",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "MIT",
   "publishConfig": {
@@ -20,8 +20,8 @@
     "node": ">= 12.0.0"
   },
   "dependencies": {
-    "@parcel/utils": "2.0.0-nightly.1051+1bca9dbb7",
+    "@parcel/utils": "2.0.0-nightly.1055+6851d07fc",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "1bca9dbb73cfbb39583e4b1f04e5fdf529762355"
+  "gitHead": "6851d07fca6a0c97f669462914b5d5cdfbf84a04"
 }

package/src/Graph.js

@@ -137,7 +137,9 @@ export default class Graph<TNode, TEdgeType: number = 1> {
 
   // Removes node and any edges coming from or to that node
   removeNode(nodeId: NodeId) {
-    this._assertHasNodeId(nodeId);
+    if (!this.hasNode(nodeId)) {
+      return;
+    }
 
     for (let {type, from} of this.adjacencyList.getInboundEdgesByType(nodeId)) {
       this.removeEdge(
@@ -159,7 +161,9 @@ export default class Graph<TNode, TEdgeType: number = 1> {
   }
 
   removeEdges(nodeId: NodeId, type: TEdgeType | NullEdgeType = 1) {
-    this._assertHasNodeId(nodeId);
+    if (!this.hasNode(nodeId)) {
+      return;
+    }
 
     for (let to of this.getNodeIdsConnectedFrom(nodeId, type)) {
       this.removeEdge(nodeId, to, type);
@@ -174,9 +178,7 @@ export default class Graph<TNode, TEdgeType: number = 1> {
     removeOrphans: boolean = true,
   ) {
     if (!this.adjacencyList.hasEdge(from, to, type)) {
-      throw new Error(
-        `Edge from ${fromNodeId(from)} to ${fromNodeId(to)} not found!`,
-      );
+      return;
     }
 
     this.adjacencyList.removeEdge(from, to, type);
@@ -186,7 +188,9 @@ export default class Graph<TNode, TEdgeType: number = 1> {
   }
 
   isOrphanedNode(nodeId: NodeId): boolean {
-    this._assertHasNodeId(nodeId);
+    if (!this.hasNode(nodeId)) {
+      return false;
+    }
 
     if (this.rootNodeId == null) {
       // If the graph does not have a root, and there are inbound edges,

package/test/Graph.test.js

@@ -20,13 +20,6 @@ describe('Graph', () => {
     assert.equal(graph.nodes.get(id), node);
   });
 
-  it("errors when removeNode is called with a node that doesn't belong", () => {
-    let graph = new Graph();
-    assert.throws(() => {
-      graph.removeNode(toNodeId(-1));
-    }, /Does not have node/);
-  });
-
   it('errors when traversing a graph with no root', () => {
     let graph = new Graph();
 
@@ -317,4 +310,24 @@ describe('Graph', () => {
 
     assert.deepEqual(visited, [nodeA, nodeB, nodeD]);
   });
+
+  it('correctly removes non-tree subgraphs', () => {
+    let graph = new Graph();
+    let nodeRoot = graph.addNode('root');
+    let node1 = graph.addNode('1');
+    let node2 = graph.addNode('2');
+    let node3 = graph.addNode('3');
+
+    graph.addEdge(nodeRoot, node1);
+    graph.addEdge(node1, node2);
+    graph.addEdge(node1, node3);
+    graph.addEdge(node2, node3);
+
+    graph.setRootNodeId(nodeRoot);
+
+    graph.removeNode(node1);
+
+    assert.strictEqual(graph.nodes.size, 1);
+    assert.deepStrictEqual(Array.from(graph.getAllEdges()), []);
+  });
 });