@parcel/graph 2.0.0-nightly.2448 → 2.0.0-nightly.2464

package/lib/Graph.js

@@ -34,7 +34,7 @@ const ALL_EDGE_TYPES = '@@all_edge_types';
 exports.ALL_EDGE_TYPES = ALL_EDGE_TYPES;
 
 class Graph {
-  nextNodeId = 0;
+  nextNodeId = 1;
 
   constructor(opts) {
     var _opts$nextNodeId;
@@ -117,7 +117,7 @@ class Graph {
     return this.nodes.get(id);
   }
 
-  addEdge(from, to, type = null) {
+  addEdge(from, to, type = 1) {
     if (!this.getNode(from)) {
       throw new Error(`"from" node '${(0, _types.fromNodeId)(from)}' not found`);
     }
@@ -130,11 +130,11 @@ class Graph {
     this.inboundEdges.addEdge(to, from, type);
   }
 
-  hasEdge(from, to, type = null) {
+  hasEdge(from, to, type = 1) {
     return this.outboundEdges.hasEdge(from, to, type);
   }
 
-  getNodeIdsConnectedTo(nodeId, type = null) {
+  getNodeIdsConnectedTo(nodeId, type = 1) {
     this._assertHasNodeId(nodeId);
 
     let inboundByType = this.inboundEdges.getEdgesByType(nodeId);
@@ -172,7 +172,7 @@ class Graph {
     return [...nodes];
   }
 
-  getNodeIdsConnectedFrom(nodeId, type = null) {
+  getNodeIdsConnectedFrom(nodeId, type = 1) {
     this._assertHasNodeId(nodeId);
 
     let outboundByType = this.outboundEdges.getEdgesByType(nodeId);
@@ -234,7 +234,7 @@ class Graph {
     (0, _assert().default)(wasRemoved);
   }
 
-  removeEdges(nodeId, type = null) {
+  removeEdges(nodeId, type = 1) {
     this._assertHasNodeId(nodeId);
 
     for (let to of this.outboundEdges.getEdges(nodeId, type)) {
@@ -243,7 +243,7 @@ class Graph {
   } // Removes edge and node the edge is to if the node is orphaned
 
 
-  removeEdge(from, to, type = null, removeOrphans = true) {
+  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!`);
     }
@@ -301,7 +301,7 @@ class Graph {
     this.nodes.set(nodeId, node);
   }
 
-  replaceNode(fromNodeId, toNodeId, type = null) {
+  replaceNode(fromNodeId, toNodeId, type = 1) {
     this._assertHasNodeId(fromNodeId);
 
     for (let parent of this.inboundEdges.getEdges(fromNodeId, type)) {
@@ -313,7 +313,7 @@ class Graph {
   } // Update a node's downstream nodes making sure to prune any orphaned branches
 
 
-  replaceNodeIdsConnectedTo(fromNodeId, toNodeIds, replaceFilter, type = null) {
+  replaceNodeIdsConnectedTo(fromNodeId, toNodeIds, replaceFilter, type = 1) {
     this._assertHasNodeId(fromNodeId);
 
     let outboundEdges = this.outboundEdges.getEdges(fromNodeId, type);
@@ -332,7 +332,7 @@ class Graph {
     }
   }
 
-  traverse(visit, startNodeId, type = null) {
+  traverse(visit, startNodeId, type = 1) {
     return this.dfs({
       visit,
       startNodeId,
@@ -344,7 +344,7 @@ class Graph {
     return this.traverse(mapVisitor(filter, visit), startNodeId, type);
   }
 
-  traverseAncestors(startNodeId, visit, type = null) {
+  traverseAncestors(startNodeId, visit, type = 1) {
     return this.dfs({
       visit,
       startNodeId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/graph",
-  "version": "2.0.0-nightly.2448+80d7ae24",
+  "version": "2.0.0-nightly.2464+2013dfff",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "MIT",
   "publishConfig": {
@@ -22,5 +22,5 @@
   "dependencies": {
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "80d7ae24f272cc4568a001d44d496c4e13b600ec"
+  "gitHead": "2013dfff74468ee8a3a1dbed6742db32dd24032a"
 }

package/src/ContentGraph.js

@@ -4,16 +4,16 @@ import type {ContentKey, NodeId} from './types';
 import Graph, {type GraphOpts} from './Graph';
 import nullthrows from 'nullthrows';
 
-export type SerializedContentGraph<TNode, TEdgeType: string | null = null> = {|
+export type SerializedContentGraph<TNode, TEdgeType: number = 1> = {|
   ...GraphOpts<TNode, TEdgeType>,
   _contentKeyToNodeId: Map<ContentKey, NodeId>,
   _nodeIdToContentKey: Map<NodeId, ContentKey>,
 |};
 
-export default class ContentGraph<
+export default class ContentGraph<TNode, TEdgeType: number = 1> extends Graph<
   TNode,
-  TEdgeType: string | null = null,
-> extends Graph<TNode, TEdgeType> {
+  TEdgeType,
+> {
   _contentKeyToNodeId: Map<ContentKey, NodeId>;
   _nodeIdToContentKey: Map<NodeId, ContentKey>;
 

package/src/Graph.js

@@ -7,21 +7,22 @@ import type {TraversalActions, GraphVisitor} from '@parcel/types';
 import assert from 'assert';
 import nullthrows from 'nullthrows';
 
-export type GraphOpts<TNode, TEdgeType: string | null = null> = {|
+type NullEdgeType = 1;
+export type GraphOpts<TNode, TEdgeType: number = 1> = {|
   nodes?: Map<NodeId, TNode>,
-  edges?: AdjacencyListMap<TEdgeType | null>,
+  edges?: AdjacencyListMap<TEdgeType | NullEdgeType>,
   rootNodeId?: ?NodeId,
   nextNodeId?: ?number,
 |};
 
 export const ALL_EDGE_TYPES = '@@all_edge_types';
 
-export default class Graph<TNode, TEdgeType: string | null = null> {
+export default class Graph<TNode, TEdgeType: number = 1> {
   nodes: Map<NodeId, TNode>;
-  inboundEdges: AdjacencyList<TEdgeType | null>;
-  outboundEdges: AdjacencyList<TEdgeType | null>;
+  inboundEdges: AdjacencyList<TEdgeType | NullEdgeType>;
+  outboundEdges: AdjacencyList<TEdgeType | NullEdgeType>;
   rootNodeId: ?NodeId;
-  nextNodeId: number = 0;
+  nextNodeId: number = 1;
 
   constructor(opts: ?GraphOpts<TNode, TEdgeType>) {
     this.nodes = opts?.nodes || new Map();
@@ -71,7 +72,7 @@ export default class Graph<TNode, TEdgeType: string | null = null> {
 
   // Returns a list 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(): Array<Edge<TEdgeType | null>> {
+  getAllEdges(): Array<Edge<TEdgeType | NullEdgeType>> {
     let edges = [];
     for (let [from, edgeList] of this.outboundEdges.getListMap()) {
       for (let [type, toNodes] of edgeList) {
@@ -97,7 +98,7 @@ export default class Graph<TNode, TEdgeType: string | null = null> {
     return this.nodes.get(id);
   }
 
-  addEdge(from: NodeId, to: NodeId, type: TEdgeType | null = null): void {
+  addEdge(from: NodeId, to: NodeId, type: TEdgeType | NullEdgeType = 1): void {
     if (!this.getNode(from)) {
       throw new Error(`"from" node '${fromNodeId(from)}' not found`);
     }
@@ -110,13 +111,17 @@ export default class Graph<TNode, TEdgeType: string | null = null> {
     this.inboundEdges.addEdge(to, from, type);
   }
 
-  hasEdge(from: NodeId, to: NodeId, type?: TEdgeType | null = null): boolean {
+  hasEdge(
+    from: NodeId,
+    to: NodeId,
+    type?: TEdgeType | NullEdgeType = 1,
+  ): boolean {
     return this.outboundEdges.hasEdge(from, to, type);
   }
 
   getNodeIdsConnectedTo(
     nodeId: NodeId,
-    type: TEdgeType | null | Array<TEdgeType | null> = null,
+    type: TEdgeType | NullEdgeType | Array<TEdgeType | NullEdgeType> = 1,
   ): Array<NodeId> {
     this._assertHasNodeId(nodeId);
 
@@ -149,7 +154,7 @@ export default class Graph<TNode, TEdgeType: string | null = null> {
 
   getNodeIdsConnectedFrom(
     nodeId: NodeId,
-    type: TEdgeType | null | Array<TEdgeType | null> = null,
+    type: TEdgeType | NullEdgeType | Array<TEdgeType | NullEdgeType> = 1,
   ): Array<NodeId> {
     this._assertHasNodeId(nodeId);
     let outboundByType = this.outboundEdges.getEdgesByType(nodeId);
@@ -206,7 +211,7 @@ export default class Graph<TNode, TEdgeType: string | null = null> {
     assert(wasRemoved);
   }
 
-  removeEdges(nodeId: NodeId, type: TEdgeType | null = null) {
+  removeEdges(nodeId: NodeId, type: TEdgeType | NullEdgeType = 1) {
     this._assertHasNodeId(nodeId);
 
     for (let to of this.outboundEdges.getEdges(nodeId, type)) {
@@ -218,7 +223,7 @@ export default class Graph<TNode, TEdgeType: string | null = null> {
   removeEdge(
     from: NodeId,
     to: NodeId,
-    type: TEdgeType | null = null,
+    type: TEdgeType | NullEdgeType = 1,
     removeOrphans: boolean = true,
   ) {
     if (!this.outboundEdges.hasEdge(from, to, type)) {
@@ -290,7 +295,7 @@ export default class Graph<TNode, TEdgeType: string | null = null> {
   replaceNode(
     fromNodeId: NodeId,
     toNodeId: NodeId,
-    type: TEdgeType | null = null,
+    type: TEdgeType | NullEdgeType = 1,
   ): void {
     this._assertHasNodeId(fromNodeId);
     for (let parent of this.inboundEdges.getEdges(fromNodeId, type)) {
@@ -305,7 +310,7 @@ export default class Graph<TNode, TEdgeType: string | null = null> {
     fromNodeId: NodeId,
     toNodeIds: $ReadOnlyArray<NodeId>,
     replaceFilter?: null | (NodeId => boolean),
-    type?: TEdgeType | null = null,
+    type?: TEdgeType | NullEdgeType = 1,
   ): void {
     this._assertHasNodeId(fromNodeId);
 
@@ -331,7 +336,7 @@ export default class Graph<TNode, TEdgeType: string | null = null> {
   traverse<TContext>(
     visit: GraphVisitor<NodeId, TContext>,
     startNodeId: ?NodeId,
-    type: TEdgeType | null | Array<TEdgeType | null> = null,
+    type: TEdgeType | NullEdgeType | Array<TEdgeType | NullEdgeType> = 1,
   ): ?TContext {
     return this.dfs({
       visit,
@@ -344,7 +349,7 @@ export default class Graph<TNode, TEdgeType: string | null = null> {
     filter: (NodeId, TraversalActions) => ?TValue,
     visit: GraphVisitor<TValue, TContext>,
     startNodeId: ?NodeId,
-    type?: TEdgeType | null | Array<TEdgeType | null>,
+    type?: TEdgeType | Array<TEdgeType | NullEdgeType>,
   ): ?TContext {
     return this.traverse(mapVisitor(filter, visit), startNodeId, type);
   }
@@ -352,7 +357,7 @@ export default class Graph<TNode, TEdgeType: string | null = null> {
   traverseAncestors<TContext>(
     startNodeId: ?NodeId,
     visit: GraphVisitor<NodeId, TContext>,
-    type: TEdgeType | null | Array<TEdgeType | null> = null,
+    type: TEdgeType | NullEdgeType | Array<TEdgeType | NullEdgeType> = 1,
   ): ?TContext {
     return this.dfs({
       visit,

package/src/types.js

@@ -11,7 +11,7 @@ export function fromNodeId(x: NodeId): number {
 
 export type ContentKey = string;
 
-export type Edge<TEdgeType: string | null> = {|
+export type Edge<TEdgeType: number> = {|
   from: NodeId,
   to: NodeId,
   type: TEdgeType,

package/test/Graph.test.js

@@ -87,7 +87,7 @@ describe('Graph', () => {
     let nodeB = graph.addNode('b');
     let nodeC = graph.addNode('c');
     graph.addEdge(nodeA, nodeB);
-    graph.addEdge(nodeA, nodeC, 'edgetype');
+    graph.addEdge(nodeA, nodeC, 1);
     assert(graph.isOrphanedNode(nodeA));
     assert(!graph.isOrphanedNode(nodeB));
     assert(!graph.isOrphanedNode(nodeC));
@@ -114,9 +114,7 @@ describe('Graph', () => {
     assert(graph.nodes.has(nodeD));
     assert(!graph.nodes.has(nodeB));
     assert(!graph.nodes.has(nodeC));
-    assert.deepEqual(graph.getAllEdges(), [
-      {from: nodeA, to: nodeD, type: null},
-    ]);
+    assert.deepEqual(graph.getAllEdges(), [{from: nodeA, to: nodeD, type: 1}]);
   });
 
   it('removing a node recursively deletes orphaned nodes', () => {
@@ -157,8 +155,8 @@ describe('Graph', () => {
 
     assert.deepEqual([...graph.nodes.keys()], [nodeA, nodeC, nodeF]);
     assert.deepEqual(graph.getAllEdges(), [
-      {from: nodeA, to: nodeC, type: null},
-      {from: nodeC, to: nodeF, type: null},
+      {from: nodeA, to: nodeC, type: 1},
+      {from: nodeC, to: nodeF, type: 1},
     ]);
   });
 
@@ -202,8 +200,8 @@ describe('Graph', () => {
 
     assert.deepEqual([...graph.nodes.keys()], [nodeA, nodeC, nodeF]);
     assert.deepEqual(graph.getAllEdges(), [
-      {from: nodeA, to: nodeC, type: null},
-      {from: nodeC, to: nodeF, type: null},
+      {from: nodeA, to: nodeC, type: 1},
+      {from: nodeC, to: nodeF, type: 1},
     ]);
   });
 
@@ -237,11 +235,11 @@ describe('Graph', () => {
 
     assert.deepEqual(nodesBefore, getNodeIds());
     assert.deepEqual(graph.getAllEdges(), [
-      {from: nodeA, to: nodeB, type: null},
-      {from: nodeB, to: nodeC, type: null},
-      {from: nodeB, to: nodeD, type: null},
-      {from: nodeD, to: nodeE, type: null},
-      {from: nodeE, to: nodeB, type: null},
+      {from: nodeA, to: nodeB, type: 1},
+      {from: nodeB, to: nodeC, type: 1},
+      {from: nodeB, to: nodeD, type: 1},
+      {from: nodeD, to: nodeE, type: 1},
+      {from: nodeE, to: nodeB, type: 1},
     ]);
   });
 
@@ -280,8 +278,8 @@ describe('Graph', () => {
     assert(!graph.hasNode(nodeC));
     assert(graph.hasNode(nodeD));
     assert.deepEqual(graph.getAllEdges(), [
-      {from: nodeA, to: nodeB, type: null},
-      {from: nodeA, to: nodeD, type: null},
+      {from: nodeA, to: nodeB, type: 1},
+      {from: nodeA, to: nodeD, type: 1},
     ]);
   });
 
@@ -292,10 +290,10 @@ describe('Graph', () => {
     let nodeC = graph.addNode('c');
     let nodeD = graph.addNode('d');
 
-    graph.addEdge(nodeA, nodeB, 'edgetype');
+    graph.addEdge(nodeA, nodeB, 2);
     graph.addEdge(nodeA, nodeD);
     graph.addEdge(nodeB, nodeC);
-    graph.addEdge(nodeB, nodeD, 'edgetype');
+    graph.addEdge(nodeB, nodeD, 2);
 
     graph.setRootNodeId(nodeA);
 
@@ -305,7 +303,7 @@ describe('Graph', () => {
         visited.push(nodeId);
       },
       null, // use root as startNode
-      'edgetype',
+      2,
     );
 
     assert.deepEqual(visited, [nodeA, nodeB, nodeD]);