@atlaspack/graph 3.4.6 → 3.5.0

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaspack/graph
 
+## 3.5.0
+
+### Minor Changes
+
+- [#600](https://github.com/atlassian-labs/atlaspack/pull/600) [`1b52b99`](https://github.com/atlassian-labs/atlaspack/commit/1b52b99db4298b04c1a6eb0f97994d75a2d436f9) Thanks [@mattcompiles](https://github.com/mattcompiles)! - Add static intersect, size and equals methods to BitSet
+
+## 3.4.7
+
+### Patch Changes
+
+- Updated dependencies [[`209692f`](https://github.com/atlassian-labs/atlaspack/commit/209692ffb11eae103a0d65c5e1118a5aa1625818), [`f4da1e1`](https://github.com/atlassian-labs/atlaspack/commit/f4da1e120e73eeb5e8b8927f05e88f04d6148c7b)]:
+  - @atlaspack/feature-flags@2.16.0
+
 ## 3.4.6
 
 ### Patch Changes

package/lib/BitSet.js

@@ -25,6 +25,11 @@ class BitSet {
     res.union(b);
     return res;
   }
+  static intersect(a, b) {
+    let res = a.clone();
+    res.intersect(b);
+    return res;
+  }
   get capacity() {
     return this.bits.length * 32;
   }
@@ -63,6 +68,26 @@ class BitSet {
       this.bits[i] &= ~other.bits[i];
     }
   }
+  size() {
+    let bits = this.bits;
+    let setBitsCount = 0;
+    for (let k = 0; k < bits.length; k++) {
+      let chunk = bits[k];
+      while (chunk !== 0) {
+        chunk &= chunk - 1; // Clear the least significant bit set
+        setBitsCount++;
+      }
+    }
+    return setBitsCount;
+  }
+  equals(other) {
+    for (let i = 0; i < this.bits.length; i++) {
+      if (this.bits[i] !== other.bits[i]) {
+        return false;
+      }
+    }
+    return true;
+  }
   forEach(fn) {
     // https://lemire.me/blog/2018/02/21/iterating-over-set-bits-quickly/
     let bits = this.bits;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/graph",
-  "version": "3.4.6",
+  "version": "3.5.0",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
@@ -16,7 +16,7 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/feature-flags": "2.15.1",
+    "@atlaspack/feature-flags": "2.16.0",
     "nullthrows": "^1.1.1"
   },
   "type": "commonjs"

package/src/BitSet.js

@@ -28,6 +28,12 @@ export class BitSet {
     return res;
   }
 
+  static intersect(a: BitSet, b: BitSet): BitSet {
+    let res = a.clone();
+    res.intersect(b);
+    return res;
+  }
+
   get capacity(): number {
     return this.bits.length * 32;
   }
@@ -82,6 +88,31 @@ export class BitSet {
     }
   }
 
+  size(): number {
+    let bits = this.bits;
+    let setBitsCount = 0;
+
+    for (let k = 0; k < bits.length; k++) {
+      let chunk = bits[k];
+
+      while (chunk !== 0) {
+        chunk &= chunk - 1; // Clear the least significant bit set
+        setBitsCount++;
+      }
+    }
+
+    return setBitsCount;
+  }
+
+  equals(other: BitSet): boolean {
+    for (let i = 0; i < this.bits.length; i++) {
+      if (this.bits[i] !== other.bits[i]) {
+        return false;
+      }
+    }
+    return true;
+  }
+
   forEach(fn: (bit: number) => void) {
     // https://lemire.me/blog/2018/02/21/iterating-over-set-bits-quickly/
     let bits = this.bits;

package/test/BitSet.test.js

@@ -107,4 +107,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/Graph.test.js

@@ -528,12 +528,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) =>
+            values.map((v) => (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);
       });
     });
@@ -572,16 +577,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) =>
+            values.map((v) => (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);
       });
     });