@atlaspack/bundler-default 2.14.5-dev.1c70d50f9.99 → 2.14.5-dev.69

package/CHANGELOG.md

@@ -1,49 +1,5 @@
 # @atlaspack/bundler-default
 
-## 3.0.5
-
-### Patch Changes
-
-- Updated dependencies [[`644b157`](https://github.com/atlassian-labs/atlaspack/commit/644b157dee72a871acc2d0facf0b87b8eea51956)]:
-  - @atlaspack/feature-flags@2.18.2
-  - @atlaspack/graph@3.5.4
-  - @atlaspack/utils@2.15.2
-  - @atlaspack/plugin@2.14.14
-
-## 3.0.4
-
-### 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
-  - @atlaspack/utils@2.15.1
-  - @atlaspack/graph@3.5.3
-  - @atlaspack/plugin@2.14.13
-
-## 3.0.3
-
-### Patch Changes
-
-- [#622](https://github.com/atlassian-labs/atlaspack/pull/622) [`e39c6cf`](https://github.com/atlassian-labs/atlaspack/commit/e39c6cf05f7e95ce5420dbcea66f401b1cbd397c) Thanks [@benjervis](https://github.com/benjervis)! - Change the overlap calculation system in findMergeCandidates to improve performance
-
-- Updated dependencies [[`10fbcfb`](https://github.com/atlassian-labs/atlaspack/commit/10fbcfbfa49c7a83da5d7c40983e36e87f524a75), [`85c52d3`](https://github.com/atlassian-labs/atlaspack/commit/85c52d3f7717b3c84a118d18ab98cfbfd71dcbd2), [`e39c6cf`](https://github.com/atlassian-labs/atlaspack/commit/e39c6cf05f7e95ce5420dbcea66f401b1cbd397c)]:
-  - @atlaspack/feature-flags@2.18.0
-  - @atlaspack/utils@2.15.0
-  - @atlaspack/graph@3.5.2
-  - @atlaspack/plugin@2.14.12
-
-## 3.0.2
-
-### Patch Changes
-
-- [#613](https://github.com/atlassian-labs/atlaspack/pull/613) [`4ca19d8`](https://github.com/atlassian-labs/atlaspack/commit/4ca19d8060dfcd279183e4039f2ecb43334ac44c) Thanks [@marcins](https://github.com/marcins)! - Ensure that constant modules are correctly included in MSBs even if they wouldn't otherwise be.
-
-- 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
-  - @atlaspack/graph@3.5.1
-  - @atlaspack/utils@2.14.11
-  - @atlaspack/plugin@2.14.11
-
 ## 3.0.1
 
 ### Patch Changes

package/lib/bundleMerge.js

@@ -25,13 +25,6 @@ function _graph() {
   };
   return data;
 }
-function _utils() {
-  const data = require("@atlaspack/utils");
-  _utils = function () {
-    return data;
-  };
-  return data;
-}
 var _memoize = require("./memoize");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function getBundlesForBundleGroup(bundleGraph, bundleGroupId) {
@@ -44,16 +37,16 @@ function getBundlesForBundleGroup(bundleGraph, bundleGroupId) {
   }, bundleGroupId);
   return count;
 }
-let getBundleOverlap = (sourceBundlesA, sourceBundlesB) => {
-  let allSourceBundles = (0, _utils().setUnion)(sourceBundlesA, sourceBundlesB);
-  let sharedSourceBundles = (0, _utils().setIntersectStatic)(sourceBundlesA, sourceBundlesB);
-  return sharedSourceBundles.size / allSourceBundles.size;
+let getBundleOverlapBitSet = (sourceBundlesA, sourceBundlesB) => {
+  let allSourceBundles = _graph().BitSet.union(sourceBundlesA, sourceBundlesB);
+  let sharedSourceBundles = _graph().BitSet.intersect(sourceBundlesA, sourceBundlesB);
+  return sharedSourceBundles.size() / allSourceBundles.size();
 };
 
 // Returns a decimal showing the proportion source bundles are common to
 // both bundles versus the total number of source bundles.
 function checkBundleThreshold(bundleA, bundleB, threshold) {
-  return getBundleOverlap(bundleA.bundle.sourceBundles, bundleB.bundle.sourceBundles) >= threshold;
+  return getBundleOverlapBitSet(bundleA.sourceBundleBitSet, bundleB.sourceBundleBitSet) >= threshold;
 }
 let checkSharedSourceBundles = (0, _memoize.memoize)((bundle, importantAncestorBundles) => {
   return importantAncestorBundles.every(ancestorId => bundle.sourceBundles.has(ancestorId));
@@ -107,9 +100,14 @@ function getPossibleMergeCandidates(bundleGraph, bundles) {
   let mergeCandidates = bundles.map(bundleId => {
     let bundle = bundleGraph.getNode(bundleId);
     (0, _assert().default)(bundle && bundle !== 'root', 'Bundle should exist');
+    let sourceBundleBitSet = new (_graph().BitSet)(bundleGraph.nodes.length);
+    for (let sourceBundle of bundle.sourceBundles) {
+      sourceBundleBitSet.add(sourceBundle);
+    }
     return {
       id: bundleId,
       bundle,
+      sourceBundleBitSet,
       contentKey: bundleId.toString()
     };
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/bundler-default",
-  "version": "2.14.5-dev.1c70d50f9.99+1c70d50f9",
+  "version": "2.14.5-dev.69+67cb517ae",
   "license": "(MIT OR Apache-2.0)",
   "type": "commonjs",
   "publishConfig": {
@@ -16,14 +16,14 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-dev.1c70d50f9.167+1c70d50f9",
-    "@atlaspack/feature-flags": "2.14.1-dev.1c70d50f9.167+1c70d50f9",
-    "@atlaspack/graph": "3.4.1-dev.1c70d50f9.167+1c70d50f9",
-    "@atlaspack/plugin": "2.14.5-dev.1c70d50f9.99+1c70d50f9",
-    "@atlaspack/rust": "3.2.1-dev.1c70d50f9.99+1c70d50f9",
-    "@atlaspack/utils": "2.14.5-dev.1c70d50f9.99+1c70d50f9",
+    "@atlaspack/diagnostic": "2.14.1-dev.137+67cb517ae",
+    "@atlaspack/feature-flags": "2.14.1-dev.137+67cb517ae",
+    "@atlaspack/graph": "3.4.1-dev.137+67cb517ae",
+    "@atlaspack/plugin": "2.14.5-dev.69+67cb517ae",
+    "@atlaspack/rust": "3.2.1-dev.69+67cb517ae",
+    "@atlaspack/utils": "2.14.5-dev.69+67cb517ae",
     "many-keys-map": "^1.0.3",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "1c70d50f914cb662515b0b61053e51a06f3af234"
+  "gitHead": "67cb517ae793046fb5a0d2ef02ba74510fefccf3"
 }

package/src/bundleMerge.js

@@ -2,9 +2,8 @@
 
 import invariant from 'assert';
 import nullthrows from 'nullthrows';
-import {ContentGraph} from '@atlaspack/graph';
+import {ContentGraph, BitSet} from '@atlaspack/graph';
 import type {NodeId} from '@atlaspack/graph';
-import {setUnion, setIntersectStatic} from '@atlaspack/utils';
 import type {Bundle, IdealBundleGraph} from './idealGraph';
 import {memoize, clearCaches} from './memoize';
 
@@ -21,14 +20,14 @@ function getBundlesForBundleGroup(
   return count;
 }
 
-let getBundleOverlap = (
-  sourceBundlesA: Set<NodeId>,
-  sourceBundlesB: Set<NodeId>,
+let getBundleOverlapBitSet = (
+  sourceBundlesA: BitSet,
+  sourceBundlesB: BitSet,
 ): number => {
-  let allSourceBundles = setUnion(sourceBundlesA, sourceBundlesB);
-  let sharedSourceBundles = setIntersectStatic(sourceBundlesA, sourceBundlesB);
+  let allSourceBundles = BitSet.union(sourceBundlesA, sourceBundlesB);
+  let sharedSourceBundles = BitSet.intersect(sourceBundlesA, sourceBundlesB);
 
-  return sharedSourceBundles.size / allSourceBundles.size;
+  return sharedSourceBundles.size() / allSourceBundles.size();
 };
 
 // Returns a decimal showing the proportion source bundles are common to
@@ -39,9 +38,9 @@ function checkBundleThreshold(
   threshold: number,
 ): boolean {
   return (
-    getBundleOverlap(
-      bundleA.bundle.sourceBundles,
-      bundleB.bundle.sourceBundles,
+    getBundleOverlapBitSet(
+      bundleA.sourceBundleBitSet,
+      bundleB.sourceBundleBitSet,
     ) >= threshold
   );
 }
@@ -148,6 +147,7 @@ function getMergeClusters(
 type MergeCandidate = {|
   bundle: Bundle,
   id: NodeId,
+  sourceBundleBitSet: BitSet,
   contentKey: string,
 |};
 function getPossibleMergeCandidates(
@@ -158,9 +158,15 @@ function getPossibleMergeCandidates(
     let bundle = bundleGraph.getNode(bundleId);
     invariant(bundle && bundle !== 'root', 'Bundle should exist');
 
+    let sourceBundleBitSet = new BitSet(bundleGraph.nodes.length);
+    for (let sourceBundle of bundle.sourceBundles) {
+      sourceBundleBitSet.add(sourceBundle);
+    }
+
     return {
       id: bundleId,
       bundle,
+      sourceBundleBitSet,
       contentKey: bundleId.toString(),
     };
   });