@atlaspack/graph 3.4.1-canary.52 → 3.4.1-canary.521

package/test/{AdjacencyList.test.js → AdjacencyList.test.ts}

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 import assert from 'assert';
 import sinon from 'sinon';
 import path from 'path';
@@ -214,9 +212,7 @@ describe('AdjacencyList', () => {
 
   it('addEdge should not replace a deleted edge if the edge was already added', () => {
     // Mock hash fn to generate collisions
-    // $FlowFixMe[prop-missing]
     let originalHash = AdjacencyList.prototype.hash;
-    // $FlowFixMe[prop-missing]
     AdjacencyList.prototype.hash = () => 1;
 
     let graph = new AdjacencyList();
@@ -229,15 +225,12 @@ describe('AdjacencyList', () => {
     assert(graph.addEdge(n0, n1, 1) === false);
     assert(graph.stats.edges === 1);
 
-    // $FlowFixMe[prop-missing]
     AdjacencyList.prototype.hash = originalHash;
   });
 
   it('addEdge should replace a deleted edge', () => {
     // Mock hash fn to generate collisions
-    // $FlowFixMe[prop-missing]
     let originalHash = AdjacencyList.prototype.hash;
-    // $FlowFixMe[prop-missing]
     AdjacencyList.prototype.hash = () => 1;
 
     try {
@@ -254,7 +247,6 @@ describe('AdjacencyList', () => {
       assert(graph.stats.edges === 1);
       assert(graph.stats.deleted === 0);
     } finally {
-      // $FlowFixMe[prop-missing]
       AdjacencyList.prototype.hash = originalHash;
     }
   });
@@ -299,8 +291,8 @@ describe('AdjacencyList', () => {
       graph.addEdge(a, b);
       graph.addEdge(c, b);
 
-      const nodeIds = [];
-      graph.forEachNodeIdConnectedTo(b, (id) => {
+      const nodeIds: Array<any> = [];
+      graph.forEachNodeIdConnectedTo(b, (id: any) => {
         nodeIds.push(id);
       });
 
@@ -318,8 +310,8 @@ describe('AdjacencyList', () => {
       graph.addEdge(b, d);
       graph.addEdge(c, d);
 
-      const nodeIds = [];
-      graph.forEachNodeIdConnectedTo(d, (nodeId) => {
+      const nodeIds: Array<any> = [];
+      graph.forEachNodeIdConnectedTo(d, (nodeId: any) => {
         nodeIds.push(nodeId);
         return true;
       });
@@ -337,8 +329,8 @@ describe('AdjacencyList', () => {
       graph.addEdge(c, b);
       graph.addEdge(b, b);
 
-      const nodeIds = [];
-      graph.forEachNodeIdConnectedTo(b, (id) => {
+      const nodeIds: Array<any> = [];
+      graph.forEachNodeIdConnectedTo(b, (id: any) => {
         nodeIds.push(id);
       });
 
@@ -354,8 +346,8 @@ describe('AdjacencyList', () => {
       graph.addEdge(a, b);
       graph.addEdge(c, b, 2);
 
-      const nodeIds = [];
-      graph.forEachNodeIdConnectedTo(b, (id) => {
+      const nodeIds: Array<any> = [];
+      graph.forEachNodeIdConnectedTo(b, (id: any) => {
         nodeIds.push(id);
       });
 
@@ -371,10 +363,10 @@ describe('AdjacencyList', () => {
       graph.addEdge(a, b);
       graph.addEdge(c, b, 2);
 
-      const nodeIds = [];
+      const nodeIds: Array<any> = [];
       graph.forEachNodeIdConnectedTo(
         b,
-        (id) => {
+        (id: any) => {
           nodeIds.push(id);
         },
         ALL_EDGE_TYPES,
@@ -413,8 +405,8 @@ describe('AdjacencyList', () => {
       graph.addEdge(b, d, 3);
       graph.addEdge(c, e, 4);
 
-      const nodeIds = [];
-      graph.forEachNodeIdConnectedFromReverse(a, (nodeId) => {
+      const nodeIds: Array<any> = [];
+      graph.forEachNodeIdConnectedFromReverse(a, (nodeId: any) => {
         nodeIds.push(nodeId);
         return false;
       });
@@ -432,8 +424,8 @@ describe('AdjacencyList', () => {
       graph.addEdge(a, c);
       graph.addEdge(a, a);
 
-      const nodeIds = [];
-      graph.forEachNodeIdConnectedFromReverse(a, (nodeId) => {
+      const nodeIds: Array<any> = [];
+      graph.forEachNodeIdConnectedFromReverse(a, (nodeId: any) => {
         nodeIds.push(nodeId);
         return false;
       });
@@ -452,8 +444,8 @@ describe('AdjacencyList', () => {
       graph.addEdge(a, c);
       graph.addEdge(a, d);
 
-      const nodeIds = [];
-      graph.forEachNodeIdConnectedFromReverse(a, (nodeId) => {
+      const nodeIds: Array<any> = [];
+      graph.forEachNodeIdConnectedFromReverse(a, (nodeId: any) => {
         nodeIds.push(nodeId);
         return true;
       });
@@ -472,10 +464,10 @@ describe('AdjacencyList', () => {
       graph.addEdge(a, c, 2);
       graph.addEdge(a, d);
 
-      const nodeIds = [];
+      const nodeIds: Array<any> = [];
       graph.forEachNodeIdConnectedFromReverse(
         a,
-        (nodeId) => {
+        (nodeId: any) => {
           nodeIds.push(nodeId);
           return false;
         },
@@ -503,7 +495,7 @@ describe('AdjacencyList', () => {
       let originalSerialized = graph.serialize();
       let originalNodes = [...originalSerialized.nodes];
       let originalEdges = [...originalSerialized.edges];
-      let work = new Promise((resolve) => worker.on('message', resolve));
+      let work = new Promise((resolve: any) => worker.on('message', resolve));
       worker.postMessage(originalSerialized);
       let received = AdjacencyList.deserialize(await work);
       // eslint-disable-next-line no-unused-vars
@@ -512,7 +504,7 @@ describe('AdjacencyList', () => {
       assert.deepEqual(received.serialize().nodes, graph.serialize().nodes);
       assert.deepEqual(received.serialize().edges, graph.serialize().edges);
 
-      originalNodes.forEach((v, i) => {
+      originalNodes.forEach((v: any, i: any) => {
         if (i < NodeTypeMap.HEADER_SIZE) {
           assert.equal(v, received.serialize().nodes[i]);
           assert.equal(v, graph.serialize().nodes[i]);
@@ -522,7 +514,7 @@ describe('AdjacencyList', () => {
         }
       });
 
-      originalEdges.forEach((v, i) => {
+      originalEdges.forEach((v: any, i: any) => {
         if (i < EdgeTypeMap.HEADER_SIZE) {
           assert.equal(v, received.serialize().edges[i]);
           assert.equal(v, graph.serialize().edges[i]);

package/test/{BitSet.test.js → BitSet.test.ts}

@@ -1,18 +1,16 @@
-// @flow strict-local
-
 import assert from 'assert';
 import {BitSet} from '../src/BitSet';
 
 function assertValues(set: BitSet, values: Array<number>) {
-  let setValues = [];
-  set.forEach((bit) => {
+  let setValues: Array<any> = [];
+  set.forEach((bit: any) => {
     setValues.push(bit);
   });
 
   for (let value of values) {
     assert(set.has(value), 'Set.has returned false');
     assert(
-      setValues.some((v) => v === value),
+      setValues.some((v: any) => v === value),
       'Set values is missing value',
     );
   }
@@ -107,4 +105,46 @@ describe('BitSet', () => {
     assertValues(set2, [3, 5]);
     assertValues(set3, [1, 3, 5]);
   });
+
+  it('BitSet.intersect should create a new BitSet with the intersect', () => {
+    let set1 = new BitSet(5);
+    set1.add(1);
+    set1.add(3);
+
+    let set2 = new BitSet(5);
+    set2.add(3);
+    set2.add(5);
+
+    let set3 = BitSet.intersect(set1, set2);
+    assertValues(set1, [1, 3]);
+    assertValues(set2, [3, 5]);
+    assertValues(set3, [3]);
+  });
+
+  it('should identify equality with another BitSet', () => {
+    let set1 = new BitSet(5);
+    set1.add(1);
+    set1.add(3);
+
+    let set2 = new BitSet(5);
+    set2.add(3);
+    set2.add(5);
+
+    let set3 = set1.clone();
+
+    assert(set1.equals(set3));
+    assert(!set1.equals(set2));
+  });
+
+  it('should calculate size of BitSet', () => {
+    let set1 = new BitSet(5);
+    set1.add(1);
+    set1.add(3);
+
+    assert.equal(set1.size(), 2);
+
+    set1.add(3);
+    set1.add(4);
+    assert.equal(set1.size(), 3);
+  });
 });

package/test/{ContentGraph.test.js → ContentGraph.test.ts}

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 import assert from 'assert';
 import ContentGraph from '../src/ContentGraph';
 
@@ -7,7 +5,7 @@ describe('ContentGraph', () => {
   it('should addNodeByContentKey if no node exists with the content key', () => {
     let graph = new ContentGraph();
 
-    const node = {};
+    const node: Record<string, any> = {};
 
     const nodeId1 = graph.addNodeByContentKey('contentKey', node);
 
@@ -29,7 +27,7 @@ describe('ContentGraph', () => {
   it('should remove the content key from graph when node is removed', () => {
     let graph = new ContentGraph();
 
-    const node1 = {};
+    const node1: Record<string, any> = {};
     const nodeId1 = graph.addNodeByContentKey('contentKey', node1);
 
     assert.equal(graph.getNode(nodeId1), node1);

package/test/{Graph.test.js → Graph.test.ts}

@@ -1,11 +1,9 @@
-// @flow strict-local
-
 import assert from 'assert';
 import sinon from 'sinon';
 import type {TraversalActions} from '@atlaspack/types-internal';
 
 import Graph from '../src/Graph';
-import {toNodeId, type NodeId} from '../src/types';
+import {toNodeId, NodeId} from '../src/types';
 
 describe('Graph', () => {
   it('constructor should initialize an empty graph', () => {
@@ -16,7 +14,7 @@ describe('Graph', () => {
 
   it('addNode should add a node to the graph', () => {
     let graph = new Graph();
-    let node = {};
+    let node: Record<string, any> = {};
     let id = graph.addNode(node);
     assert.equal(graph.getNode(id), node);
   });
@@ -340,9 +338,9 @@ describe('Graph', () => {
 
     graph.setRootNodeId(nodeA);
 
-    let visited = [];
+    let visited: Array<any> = [];
     graph.traverse(
-      (nodeId) => {
+      (nodeId: any) => {
         visited.push(nodeId);
       },
       null, // use root as startNode
@@ -413,7 +411,7 @@ describe('Graph', () => {
       graph.addEdge(1, 3);
       graph.addEdge(2, 3);
 
-      const order = [];
+      const order: Array<any> = [];
       const visit = (node: NodeId) => {
         order.push(node);
       };
@@ -440,10 +438,10 @@ describe('Graph', () => {
         graph.addEdge(1, 2);
         graph.addEdge(0, 3);
 
-        const order = [];
+        const order: Array<any> = [];
         const visit = (
           node: NodeId,
-          context: mixed | null,
+          context: unknown | null,
           actions: TraversalActions,
         ) => {
           if (node === 1) actions.skipChildren();
@@ -474,10 +472,10 @@ describe('Graph', () => {
         graph.addEdge(0, 2);
         graph.addEdge(2, 3);
 
-        const order = [];
+        const order: Array<any> = [];
         const visit = (
           node: NodeId,
-          context: mixed | null,
+          context: unknown | null,
           actions: TraversalActions,
         ) => {
           order.push(node);
@@ -515,8 +513,8 @@ describe('Graph', () => {
         graph.addEdge(0, 2);
         graph.addEdge(2, 3);
 
-        const contexts = [];
-        const visit = (node: NodeId, context: mixed | null) => {
+        const contexts: Array<any> = [];
+        const visit = (node: NodeId, context: unknown | null) => {
           contexts.push([node, context]);
           return `node-${node}-created-context`;
         };
@@ -528,12 +526,17 @@ describe('Graph', () => {
           getChildren,
         });
 
-        assert.deepEqual(contexts, [
-          [0, undefined],
-          [1, 'node-0-created-context'],
-          [2, 'node-1-created-context'],
-          [3, 'node-2-created-context'],
-        ]);
+        assert.deepEqual(
+          contexts.map((values: any) =>
+            values.map((v: any) => (v != null ? v : undefined)),
+          ),
+          [
+            [0, undefined],
+            [1, 'node-0-created-context'],
+            [2, 'node-1-created-context'],
+            [3, 'node-2-created-context'],
+          ],
+        );
         assert.equal(result, undefined);
       });
     });
@@ -552,12 +555,12 @@ describe('Graph', () => {
         graph.addEdge(1, 3);
         graph.addEdge(0, 2);
 
-        const contexts = [];
-        const visit = (node: NodeId, context: mixed | null) => {
+        const contexts: Array<any> = [];
+        const visit = (node: NodeId, context: unknown | null) => {
           contexts.push([node, context]);
           return `node-${node}-created-context`;
         };
-        const visitExit = (node: NodeId, context: mixed | null) => {
+        const visitExit = (node: NodeId, context: unknown | null) => {
           contexts.push(['exit', node, context]);
           return `node-exit-${node}-created-context`;
         };
@@ -572,16 +575,21 @@ describe('Graph', () => {
           getChildren,
         });
 
-        assert.deepEqual(contexts, [
-          [0, undefined],
-          [1, 'node-0-created-context'],
-          [2, 'node-1-created-context'],
-          ['exit', 2, 'node-2-created-context'],
-          [3, 'node-1-created-context'],
-          ['exit', 3, 'node-3-created-context'],
-          ['exit', 1, 'node-1-created-context'],
-          ['exit', 0, 'node-0-created-context'],
-        ]);
+        assert.deepEqual(
+          contexts.map((values: any) =>
+            values.map((v: any) => (v != null ? v : undefined)),
+          ),
+          [
+            [0, undefined],
+            [1, 'node-0-created-context'],
+            [2, 'node-1-created-context'],
+            ['exit', 2, 'node-2-created-context'],
+            [3, 'node-1-created-context'],
+            ['exit', 3, 'node-3-created-context'],
+            ['exit', 1, 'node-1-created-context'],
+            ['exit', 0, 'node-0-created-context'],
+          ],
+        );
         assert.equal(result, undefined);
       });
     });
@@ -602,8 +610,8 @@ describe('Graph', () => {
       graph.addEdge(a, c);
       graph.addEdge(c, d);
 
-      const order = [];
-      graph.forEachNodeIdConnectedTo(d, (node) => {
+      const order: Array<any> = [];
+      graph.forEachNodeIdConnectedTo(d, (node: any) => {
         order.push(node);
       });
 
@@ -626,8 +634,8 @@ describe('Graph', () => {
       graph.addEdge(a, c);
       graph.addEdge(c, d);
 
-      const order = [];
-      graph.forEachNodeIdConnectedFrom(a, (node) => {
+      const order: Array<any> = [];
+      graph.forEachNodeIdConnectedFrom(a, (node: any) => {
         order.push(node);
       });
 

package/tsconfig.json

@@ -0,0 +1,18 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "include": ["src"],
+  "compilerOptions": {
+    "composite": true
+  },
+  "references": [
+    {
+      "path": "../../dev/babel-register/tsconfig.json"
+    },
+    {
+      "path": "../feature-flags/tsconfig.json"
+    },
+    {
+      "path": "../types-internal/tsconfig.json"
+    }
+  ]
+}