@atlaspack/graph 3.4.1-dev.16 → 3.4.1-dev.161

package/CHANGELOG.md

@@ -1,5 +1,90 @@
 # @atlaspack/graph
 
+## 3.5.4
+
+### Patch Changes
+
+- Updated dependencies [[`644b157`](https://github.com/atlassian-labs/atlaspack/commit/644b157dee72a871acc2d0facf0b87b8eea51956)]:
+  - @atlaspack/feature-flags@2.18.2
+
+## 3.5.3
+
+### Patch Changes
+
+- Updated dependencies [[`26aa9c5`](https://github.com/atlassian-labs/atlaspack/commit/26aa9c599d2be45ce1438a74c5fa22f39b9b554b), [`0501255`](https://github.com/atlassian-labs/atlaspack/commit/05012550da35b05ce7d356a8cc29311e7f9afdca)]:
+  - @atlaspack/feature-flags@2.18.1
+
+## 3.5.2
+
+### Patch Changes
+
+- Updated dependencies [[`10fbcfb`](https://github.com/atlassian-labs/atlaspack/commit/10fbcfbfa49c7a83da5d7c40983e36e87f524a75), [`85c52d3`](https://github.com/atlassian-labs/atlaspack/commit/85c52d3f7717b3c84a118d18ab98cfbfd71dcbd2)]:
+  - @atlaspack/feature-flags@2.18.0
+
+## 3.5.1
+
+### Patch Changes
+
+- Updated dependencies [[`73ea3c4`](https://github.com/atlassian-labs/atlaspack/commit/73ea3c4d85d4401fdd15abcbf988237e890e7ad3), [`b1b3693`](https://github.com/atlassian-labs/atlaspack/commit/b1b369317c66f8a431c170df2ebba4fa5b2e38ef)]:
+  - @atlaspack/feature-flags@2.17.0
+
+## 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
+
+- Updated dependencies [[`30f6017`](https://github.com/atlassian-labs/atlaspack/commit/30f60175ba4d272c5fc193973c63bc298584775b)]:
+  - @atlaspack/feature-flags@2.15.1
+
+## 3.4.5
+
+### Patch Changes
+
+- Updated dependencies [[`a1773d2`](https://github.com/atlassian-labs/atlaspack/commit/a1773d2a62d0ef7805ac7524621dcabcc1afe929)]:
+  - @atlaspack/feature-flags@2.15.0
+
+## 3.4.4
+
+### Patch Changes
+
+- Updated dependencies [[`e0f5337`](https://github.com/atlassian-labs/atlaspack/commit/e0f533757bd1019dbd108a04952c87da15286e09)]:
+  - @atlaspack/feature-flags@2.14.4
+
+## 3.4.3
+
+### Patch Changes
+
+- Updated dependencies [[`11d6f16`](https://github.com/atlassian-labs/atlaspack/commit/11d6f16b6397dee2f217167e5c98b39edb63f7a7)]:
+  - @atlaspack/feature-flags@2.14.3
+
+## 3.4.2
+
+### Patch Changes
+
+- Updated dependencies [[`9b85d3e`](https://github.com/atlassian-labs/atlaspack/commit/9b85d3e645b10bd027eed2304afc970a5ba40062), [`17b9579`](https://github.com/atlassian-labs/atlaspack/commit/17b9579484eced0ed8f23e2aba6d23b3c7238c39), [`8f4e6c1`](https://github.com/atlassian-labs/atlaspack/commit/8f4e6c1b0e7c1fd48624afda48c1dcc599f1460f)]:
+  - @atlaspack/feature-flags@2.14.2
+
+## 3.4.1
+
+### Patch Changes
+
+- [#478](https://github.com/atlassian-labs/atlaspack/pull/478) [`570493b`](https://github.com/atlassian-labs/atlaspack/commit/570493beaf754e7985aebc7daaaf6dfcfa8fe56b) Thanks [@yamadapc](https://github.com/yamadapc)! - The first attempt at Version Packages didn't include the built artifacts.
+  This has hopefully been fixed, so this change will force those packages to re-release.
+- Updated dependencies [[`4aab060`](https://github.com/atlassian-labs/atlaspack/commit/4aab0605c0d4ee8e0dcc3ffa1162eae5b360b677), [`e1422ad`](https://github.com/atlassian-labs/atlaspack/commit/e1422ad0a801faaa4bc4f1023bed042ffe236e9b), [`570493b`](https://github.com/atlassian-labs/atlaspack/commit/570493beaf754e7985aebc7daaaf6dfcfa8fe56b)]:
+  - @atlaspack/feature-flags@2.14.1
+
 ## 3.4.0
 
 ### Minor Changes

package/benchmark/BitSet.js

@@ -0,0 +1,37 @@
+/*
+ * BitSets are primarily used for performance reasons, so we want to be able to
+ * validate that changes we make to it are performace improvements.
+ *
+ * This file exists as a ready-made playground for benchmarking changes you may
+ * want to make to the BitSet implementation.
+ *
+ * Run with `yarn workspace @atlaspack/graph benchmark` from the root
+ */
+
+// Needed to make Flow work in the benchmarks
+require('@atlaspack/babel-register');
+
+const {BitSet} = require('../src/BitSet.js');
+const b = require('benny');
+
+function createBitSetWithEntries(capacity, entries) {
+  let bitSet = new BitSet(capacity);
+  for (const index of entries) {
+    bitSet.add(index);
+  }
+  return bitSet;
+}
+
+let bundleIndices = [4334, 348, 2145, 480, 747, 1446, 326, 2791, 2658, 1334];
+
+let bundleBitSet = createBitSetWithEntries(5000, bundleIndices);
+
+b.suite(
+  'BitSet - size',
+  b.add('Control', () => {
+    bundleBitSet.size();
+  }),
+  b.configure({minSamples: 100}),
+  b.cycle(),
+  b.complete(),
+);

package/lib/AdjacencyList.js

@@ -1359,7 +1359,8 @@ function link(from, to, type, edges, nodes, unloadFactor = DEFAULT_PARAMS.unload
   // Since the space occupied by deleted edges isn't reclaimed,
   // we include them in our count to avoid overflowing the `edges` array.
   let deletes = edges.deletes;
-  if (edges.getLoad(count + deletes) >= 1) {
+  let total = count + deletes;
+  if (edges.getLoad(total) >= 1) {
     if (edges.getLoad(deletes) >= unloadFactor && edges.getLoad(count) < unloadFactor) {
       // If we have a significant number of deletes, reclaim the space.
       return LinkResult.TooManyDeletes;

package/lib/BitSet.js

@@ -9,7 +9,8 @@ function ctz32(n) {
   if (n === 0) {
     return 32;
   }
-  return 31 - Math.clz32(n & -n);
+  let reversed = n & -n;
+  return 31 - Math.clz32(reversed);
 }
 class BitSet {
   constructor(maxBits) {
@@ -25,17 +26,28 @@ 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;
   }
   add(bit) {
-    this.bits[bit >>> 5] |= 1 << (bit & 31);
+    let i = bit >>> 5;
+    let b = bit & 31;
+    this.bits[i] |= 1 << b;
   }
   delete(bit) {
-    this.bits[bit >>> 5] &= ~(1 << (bit & 31));
+    let i = bit >>> 5;
+    let b = bit & 31;
+    this.bits[i] &= ~(1 << b);
   }
   has(bit) {
-    return Boolean(this.bits[bit >>> 5] & 1 << (bit & 31));
+    let i = bit >>> 5;
+    let b = bit & 31;
+    return Boolean(this.bits[i] & 1 << b);
   }
   empty() {
     for (let k = 0; k < this.bits.length; k++) {
@@ -63,6 +75,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/lib/Graph.js

@@ -324,6 +324,7 @@ class Graph {
       }
     }
     this._visited = visited;
+    return;
   }
 
   /**
@@ -506,7 +507,7 @@ class Graph {
 exports.default = Graph;
 function mapVisitor(filter, visit) {
   function makeEnter(visit) {
-    return function (nodeId, context, actions) {
+    return function mappedEnter(nodeId, context, actions) {
       let value = filter(nodeId, actions);
       if (value != null) {
         return visit(value, context, actions);
@@ -521,7 +522,7 @@ function mapVisitor(filter, visit) {
     mapped.enter = makeEnter(visit.enter);
   }
   if (visit.exit != null) {
-    mapped.exit = function (nodeId, context, actions) {
+    mapped.exit = function mappedExit(nodeId, context, actions) {
       let exit = visit.exit;
       if (!exit) {
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/graph",
-  "version": "3.4.1-dev.16+921d08b68",
+  "version": "3.4.1-dev.161+207d003c0",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
@@ -15,10 +15,17 @@
   "engines": {
     "node": ">= 16.0.0"
   },
+  "scripts": {
+    "benchmark": "node ./benchmark/BitSet.js"
+  },
   "dependencies": {
-    "@atlaspack/feature-flags": "2.14.1-dev.16+921d08b68",
+    "@atlaspack/feature-flags": "2.14.1-dev.161+207d003c0",
     "nullthrows": "^1.1.1"
   },
+  "devDependencies": {
+    "@atlaspack/babel-register": "2.14.1",
+    "benny": "^3.7.1"
+  },
   "type": "commonjs",
-  "gitHead": "921d08b68ca593f8cc8cb9ed0d182a5883a9e165"
+  "gitHead": "207d003c0f1d4ffa6a1c52d2f8841d998616c523"
 }

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);
       });
     });