@parcel/graph 2.0.2-nightly.2534 → 2.0.2-nightly.2548

package/lib/ContentGraph.js

@@ -44,6 +44,7 @@ class ContentGraph extends _Graph.default {
 
 
   serialize() {
+    // $FlowFixMe[prop-missing]
     return { ...super.serialize(),
       _contentKeyToNodeId: this._contentKeyToNodeId,
       _nodeIdToContentKey: this._nodeIdToContentKey

package/lib/Graph.js

@@ -8,6 +8,8 @@ exports.default = exports.ALL_EDGE_TYPES = void 0;
 
 var _types = require("./types");
 
+var _AdjacencyList = _interopRequireDefault(require("./AdjacencyList"));
+
 function _assert() {
   const data = _interopRequireDefault(require("assert"));
 
@@ -30,35 +32,15 @@ function _nullthrows() {
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const ALL_EDGE_TYPES = '@@all_edge_types';
+const ALL_EDGE_TYPES = -1;
 exports.ALL_EDGE_TYPES = ALL_EDGE_TYPES;
 
 class Graph {
-  nextNodeId = 1;
-
   constructor(opts) {
-    var _opts$nextNodeId;
-
     this.nodes = (opts === null || opts === void 0 ? void 0 : opts.nodes) || new Map();
     this.setRootNodeId(opts === null || opts === void 0 ? void 0 : opts.rootNodeId);
-    this.nextNodeId = (_opts$nextNodeId = opts === null || opts === void 0 ? void 0 : opts.nextNodeId) !== null && _opts$nextNodeId !== void 0 ? _opts$nextNodeId : 0;
-    let edges = opts === null || opts === void 0 ? void 0 : opts.edges;
-
-    if (edges != null) {
-      this.inboundEdges = new AdjacencyList();
-      this.outboundEdges = new AdjacencyList(edges);
-
-      for (let [from, edgeList] of edges) {
-        for (let [type, toNodes] of edgeList) {
-          for (let to of toNodes) {
-            this.inboundEdges.addEdge(to, from, type);
-          }
-        }
-      }
-    } else {
-      this.inboundEdges = new AdjacencyList();
-      this.outboundEdges = new AdjacencyList();
-    }
+    let adjacencyList = opts === null || opts === void 0 ? void 0 : opts.adjacencyList;
+    this.adjacencyList = adjacencyList ? _AdjacencyList.default.deserialize(adjacencyList) : new _AdjacencyList.default();
   }
 
   setRootNodeId(id) {
@@ -68,43 +50,27 @@ class Graph {
   static deserialize(opts) {
     return new this({
       nodes: opts.nodes,
-      edges: opts.edges,
-      rootNodeId: opts.rootNodeId,
-      nextNodeId: opts.nextNodeId
+      adjacencyList: opts.adjacencyList,
+      rootNodeId: opts.rootNodeId
     });
   }
 
   serialize() {
     return {
       nodes: this.nodes,
-      edges: this.outboundEdges.getListMap(),
-      rootNodeId: this.rootNodeId,
-      nextNodeId: this.nextNodeId
+      adjacencyList: this.adjacencyList.serialize(),
+      rootNodeId: this.rootNodeId
     };
-  } // Returns a list of all edges in the graph. This can be large, so iterating
+  } // Returns an iterator of all edges in the graph. This can be large, so iterating
   // the complete list can be costly in large graphs. Used when merging graphs.
 
 
   getAllEdges() {
-    let edges = [];
-
-    for (let [from, edgeList] of this.outboundEdges.getListMap()) {
-      for (let [type, toNodes] of edgeList) {
-        for (let to of toNodes) {
-          edges.push({
-            from,
-            to,
-            type
-          });
-        }
-      }
-    }
-
-    return edges;
+    return this.adjacencyList.getAllEdges();
   }
 
   addNode(node) {
-    let id = (0, _types.toNodeId)(this.nextNodeId++);
+    let id = this.adjacencyList.addNode();
     this.nodes.set(id, node);
     return id;
   }
@@ -118,6 +84,10 @@ class Graph {
   }
 
   addEdge(from, to, type = 1) {
+    if (Number(type) === 0) {
+      throw new Error(`Edge type "${type}" not allowed`);
+    }
+
     if (!this.getNode(from)) {
       throw new Error(`"from" node '${(0, _types.fromNodeId)(from)}' not found`);
     }
@@ -126,108 +96,43 @@ class Graph {
       throw new Error(`"to" node '${(0, _types.fromNodeId)(to)}' not found`);
     }
 
-    this.outboundEdges.addEdge(from, to, type);
-    this.inboundEdges.addEdge(to, from, type);
+    return this.adjacencyList.addEdge(from, to, type);
   }
 
   hasEdge(from, to, type = 1) {
-    return this.outboundEdges.hasEdge(from, to, type);
+    return this.adjacencyList.hasEdge(from, to, type);
   }
 
   getNodeIdsConnectedTo(nodeId, type = 1) {
     this._assertHasNodeId(nodeId);
 
-    let inboundByType = this.inboundEdges.getEdgesByType(nodeId);
-
-    if (inboundByType == null) {
-      return [];
-    }
-
-    let nodes;
-
-    if (type === ALL_EDGE_TYPES) {
-      nodes = new Set();
-
-      for (let [, typeNodes] of inboundByType) {
-        for (let node of typeNodes) {
-          nodes.add(node);
-        }
-      }
-    } else if (Array.isArray(type)) {
-      nodes = new Set();
-
-      for (let typeName of type) {
-        for (let node of (_inboundByType$get$va = (_inboundByType$get = inboundByType.get(typeName)) === null || _inboundByType$get === void 0 ? void 0 : _inboundByType$get.values()) !== null && _inboundByType$get$va !== void 0 ? _inboundByType$get$va : []) {
-          var _inboundByType$get$va, _inboundByType$get;
-
-          nodes.add(node);
-        }
-      }
-    } else {
-      var _inboundByType$get$va2, _inboundByType$get2;
-
-      nodes = new Set((_inboundByType$get$va2 = (_inboundByType$get2 = inboundByType.get(type)) === null || _inboundByType$get2 === void 0 ? void 0 : _inboundByType$get2.values()) !== null && _inboundByType$get$va2 !== void 0 ? _inboundByType$get$va2 : []);
-    }
-
-    return [...nodes];
+    return this.adjacencyList.getNodeIdsConnectedTo(nodeId, type);
   }
 
   getNodeIdsConnectedFrom(nodeId, type = 1) {
     this._assertHasNodeId(nodeId);
 
-    let outboundByType = this.outboundEdges.getEdgesByType(nodeId);
-
-    if (outboundByType == null) {
-      return [];
-    }
-
-    let nodes;
-
-    if (type === ALL_EDGE_TYPES) {
-      nodes = new Set();
-
-      for (let [, typeNodes] of outboundByType) {
-        for (let node of typeNodes) {
-          nodes.add(node);
-        }
-      }
-    } else if (Array.isArray(type)) {
-      nodes = new Set();
-
-      for (let typeName of type) {
-        for (let node of (_outboundByType$get$v = (_outboundByType$get = outboundByType.get(typeName)) === null || _outboundByType$get === void 0 ? void 0 : _outboundByType$get.values()) !== null && _outboundByType$get$v !== void 0 ? _outboundByType$get$v : []) {
-          var _outboundByType$get$v, _outboundByType$get;
-
-          nodes.add(node);
-        }
-      }
-    } else {
-      var _outboundByType$get$v2, _outboundByType$get2;
-
-      nodes = new Set((_outboundByType$get$v2 = (_outboundByType$get2 = outboundByType.get(type)) === null || _outboundByType$get2 === void 0 ? void 0 : _outboundByType$get2.values()) !== null && _outboundByType$get$v2 !== void 0 ? _outboundByType$get$v2 : []);
-    }
-
-    return [...nodes];
+    return this.adjacencyList.getNodeIdsConnectedFrom(nodeId, type);
   } // Removes node and any edges coming from or to that node
 
 
   removeNode(nodeId) {
     this._assertHasNodeId(nodeId);
 
-    for (let [type, nodesForType] of this.inboundEdges.getEdgesByType(nodeId)) {
-      for (let from of nodesForType) {
-        this.removeEdge(from, nodeId, type, // Do not allow orphans to be removed as this node could be one
-        // and is already being removed.
-        false
-        /* removeOrphans */
-        );
-      }
+    for (let {
+      type,
+      from
+    } of this.adjacencyList.getInboundEdgesByType(nodeId)) {
+      this.removeEdge(from, nodeId, type, // Do not allow orphans to be removed as this node could be one
+      // and is already being removed.
+      false);
     }
 
-    for (let [type, toNodes] of this.outboundEdges.getEdgesByType(nodeId)) {
-      for (let to of toNodes) {
-        this.removeEdge(nodeId, to, type);
-      }
+    for (let {
+      type,
+      to
+    } of this.adjacencyList.getOutboundEdgesByType(nodeId)) {
+      this.removeEdge(nodeId, to, type);
     }
 
     let wasRemoved = this.nodes.delete(nodeId);
@@ -237,23 +142,18 @@ class Graph {
   removeEdges(nodeId, type = 1) {
     this._assertHasNodeId(nodeId);
 
-    for (let to of this.outboundEdges.getEdges(nodeId, type)) {
+    for (let to of this.getNodeIdsConnectedFrom(nodeId, type)) {
       this.removeEdge(nodeId, to, type);
     }
   } // Removes edge and node the edge is to if the node is orphaned
 
 
   removeEdge(from, to, type = 1, removeOrphans = true) {
-    if (!this.outboundEdges.hasEdge(from, to, type)) {
-      throw new Error(`Outbound edge from ${(0, _types.fromNodeId)(from)} to ${(0, _types.fromNodeId)(to)} not found!`);
+    if (!this.adjacencyList.hasEdge(from, to, type)) {
+      throw new Error(`Edge from ${(0, _types.fromNodeId)(from)} to ${(0, _types.fromNodeId)(to)} not found!`);
     }
 
-    if (!this.inboundEdges.hasEdge(to, from, type)) {
-      throw new Error(`Inbound edge from ${(0, _types.fromNodeId)(to)} to ${(0, _types.fromNodeId)(from)} not found!`);
-    }
-
-    this.outboundEdges.removeEdge(from, to, type);
-    this.inboundEdges.removeEdge(to, from, type);
+    this.adjacencyList.removeEdge(from, to, type);
 
     if (removeOrphans && this.isOrphanedNode(to)) {
       this.removeNode(to);
@@ -266,14 +166,7 @@ class Graph {
     if (this.rootNodeId == null) {
       // If the graph does not have a root, and there are inbound edges,
       // this node should not be considered orphaned.
-      // return false;
-      for (let [, inboundNodeIds] of this.inboundEdges.getEdgesByType(nodeId)) {
-        if (inboundNodeIds.size > 0) {
-          return false;
-        }
-      }
-
-      return true;
+      return !this.adjacencyList.hasInboundEdges(nodeId);
     } // Otherwise, attempt to traverse backwards to the root. If there is a path,
     // then this is not an orphaned node.
 
@@ -285,8 +178,7 @@ class Graph {
         hasPathToRoot = true;
         actions.stop();
       }
-    }, // $FlowFixMe
-    ALL_EDGE_TYPES);
+    }, ALL_EDGE_TYPES);
 
     if (hasPathToRoot) {
       return false;
@@ -299,25 +191,14 @@ class Graph {
     this._assertHasNodeId(nodeId);
 
     this.nodes.set(nodeId, node);
-  }
-
-  replaceNode(fromNodeId, toNodeId, type = 1) {
-    this._assertHasNodeId(fromNodeId);
-
-    for (let parent of this.inboundEdges.getEdges(fromNodeId, type)) {
-      this.addEdge(parent, toNodeId, type);
-      this.removeEdge(parent, fromNodeId, type);
-    }
-
-    this.removeNode(fromNodeId);
   } // Update a node's downstream nodes making sure to prune any orphaned branches
 
 
   replaceNodeIdsConnectedTo(fromNodeId, toNodeIds, replaceFilter, type = 1) {
     this._assertHasNodeId(fromNodeId);
 
-    let outboundEdges = this.outboundEdges.getEdges(fromNodeId, type);
-    let childrenToRemove = new Set(replaceFilter ? [...outboundEdges].filter(toNodeId => replaceFilter(toNodeId)) : outboundEdges);
+    let outboundEdges = this.getNodeIdsConnectedFrom(fromNodeId, type);
+    let childrenToRemove = new Set(replaceFilter ? outboundEdges.filter(toNodeId => replaceFilter(toNodeId)) : outboundEdges);
 
     for (let toNodeId of toNodeIds) {
       childrenToRemove.delete(toNodeId);
@@ -549,58 +430,4 @@ function mapVisitor(filter, visit) {
   }
 
   return mapped;
-}
-
-class AdjacencyList {
-  constructor(listMap) {
-    this._listMap = listMap !== null && listMap !== void 0 ? listMap : new Map();
-  }
-
-  getListMap() {
-    return this._listMap;
-  }
-
-  getEdges(from, type) {
-    var _this$_listMap$get$ge, _this$_listMap$get;
-
-    return (_this$_listMap$get$ge = (_this$_listMap$get = this._listMap.get(from)) === null || _this$_listMap$get === void 0 ? void 0 : _this$_listMap$get.get(type)) !== null && _this$_listMap$get$ge !== void 0 ? _this$_listMap$get$ge : new Set();
-  }
-
-  getEdgesByType(from) {
-    var _this$_listMap$get2;
-
-    return (_this$_listMap$get2 = this._listMap.get(from)) !== null && _this$_listMap$get2 !== void 0 ? _this$_listMap$get2 : new Map();
-  }
-
-  hasEdge(from, to, type) {
-    var _this$_listMap$get3, _this$_listMap$get3$g;
-
-    return Boolean((_this$_listMap$get3 = this._listMap.get(from)) === null || _this$_listMap$get3 === void 0 ? void 0 : (_this$_listMap$get3$g = _this$_listMap$get3.get(type)) === null || _this$_listMap$get3$g === void 0 ? void 0 : _this$_listMap$get3$g.has(to));
-  }
-
-  addEdge(from, to, type) {
-    let types = this._listMap.get(from);
-
-    if (types == null) {
-      types = new Map();
-
-      this._listMap.set(from, types);
-    }
-
-    let adjacent = types.get(type);
-
-    if (adjacent == null) {
-      adjacent = new Set();
-      types.set(type, adjacent);
-    }
-
-    adjacent.add(to);
-  }
-
-  removeEdge(from, to, type) {
-    var _this$_listMap$get4, _this$_listMap$get4$g;
-
-    (_this$_listMap$get4 = this._listMap.get(from)) === null || _this$_listMap$get4 === void 0 ? void 0 : (_this$_listMap$get4$g = _this$_listMap$get4.get(type)) === null || _this$_listMap$get4$g === void 0 ? void 0 : _this$_listMap$get4$g.delete(to);
-  }
-
 }

package/lib/index.js

@@ -27,12 +27,6 @@ Object.defineProperty(exports, "ALL_EDGE_TYPES", {
     return _Graph.ALL_EDGE_TYPES;
   }
 });
-Object.defineProperty(exports, "GraphOpts", {
-  enumerable: true,
-  get: function () {
-    return _Graph.GraphOpts;
-  }
-});
 Object.defineProperty(exports, "mapVisitor", {
   enumerable: true,
   get: function () {
@@ -45,18 +39,14 @@ Object.defineProperty(exports, "ContentGraph", {
     return _ContentGraph.default;
   }
 });
-Object.defineProperty(exports, "SerializedContentGraph", {
-  enumerable: true,
-  get: function () {
-    return _ContentGraph.SerializedContentGraph;
-  }
-});
 
 var _types = require("./types");
 
 var _Graph = _interopRequireWildcard(require("./Graph"));
 
-var _ContentGraph = _interopRequireWildcard(require("./ContentGraph"));
+var _ContentGraph = _interopRequireDefault(require("./ContentGraph"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/graph",
-  "version": "2.0.2-nightly.2534+f6518298",
+  "version": "2.0.2-nightly.2548+8cabeae8",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "MIT",
   "publishConfig": {
@@ -22,5 +22,5 @@
   "dependencies": {
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "f65182989334638e5fca7d4ce637bdf471b9b874"
+  "gitHead": "8cabeae83ca838134a003a52be468328e15d19ed"
 }