@atlaspack/core 2.12.1-canary.3549 → 2.12.1-canary.3553

package/lib/BundleGraph.js

@@ -74,7 +74,10 @@ const bundleGraphEdgeTypes = exports.bundleGraphEdgeTypes = {
   references: 4,
   // Signals that the dependency is internally resolvable via the bundle's ancestry,
   // and that the bundle connected to the dependency is not necessary for the source bundle.
-  internal_async: 5
+  internal_async: 5,
+  // This type is used to mark an edge between a bundle and a conditional bundle.
+  // This allows efficient discovery of conditional bundles in packaging
+  conditional: 5
 };
 function makeReadOnlySet(set) {
   return new Proxy(set, {
@@ -760,6 +763,9 @@ class BundleGraph {
   createBundleReference(from, to) {
     this._graph.addEdge(this._graph.getNodeIdByContentKey(from.id), this._graph.getNodeIdByContentKey(to.id), bundleGraphEdgeTypes.references);
   }
+  createBundleConditionalReference(from, to) {
+    this._graph.addEdge(this._graph.getNodeIdByContentKey(from.id), this._graph.getNodeIdByContentKey(to.id), bundleGraphEdgeTypes.conditional);
+  }
   getBundlesWithAsset(asset) {
     return this._graph.getNodeIdsConnectedTo(this._graph.getNodeIdByContentKey(asset.id), bundleGraphEdgeTypes.contains).map(id => (0, _nullthrows().default)(this._graph.getNode(id))).filter(node => node.type === 'bundle').map(node => {
       (0, _assert().default)(node.type === 'bundle');
@@ -1495,5 +1501,20 @@ class BundleGraph {
     this._targetEntryRoots.set(target.distDir, root);
     return root;
   }
+  getReferencedConditionalBundles(bundle) {
+    let referencedBundles = new Set();
+    this._graph.dfs({
+      visit: nodeId => {
+        let node = (0, _nullthrows().default)(this._graph.getNode(nodeId));
+        if (node.type !== 'bundle' || node.value.id === bundle.id) {
+          return;
+        }
+        referencedBundles.add(node.value);
+      },
+      startNodeId: this._graph.getNodeIdByContentKey(bundle.id),
+      getChildren: nodeId => this._graph.getNodeIdsConnectedFrom(nodeId, bundleGraphEdgeTypes.conditional)
+    });
+    return [...referencedBundles];
+  }
 }
 exports.default = BundleGraph;

package/lib/public/BundleGraph.js

@@ -270,5 +270,8 @@ class BundleGraph {
     }
     return bundleConditions;
   }
+  getReferencedConditionalBundles(bundle) {
+    return this.#graph.getReferencedConditionalBundles((0, _Bundle.bundleToInternalBundle)(bundle)).map(result => this.#createBundle(result, this.#graph, this.#options));
+  }
 }
 exports.default = BundleGraph;

package/lib/public/MutableBundleGraph.js

@@ -162,6 +162,9 @@ class MutableBundleGraph extends _BundleGraph.default {
   createBundleReference(from, to) {
     return this.#graph.createBundleReference((0, _Bundle.bundleToInternalBundle)(from), (0, _Bundle.bundleToInternalBundle)(to));
   }
+  createBundleConditionalReference(from, to) {
+    return this.#graph.createBundleConditionalReference((0, _Bundle.bundleToInternalBundle)(from), (0, _Bundle.bundleToInternalBundle)(to));
+  }
   getDependencyAssets(dependency) {
     return this.#graph.getDependencyAssets((0, _Dependency.dependencyToInternalDependency)(dependency)).map(asset => (0, _Asset.assetFromValue)(asset, this.#options));
   }

package/lib/requests/AssetGraphRequestRust.js

@@ -191,11 +191,7 @@ function getAssetGraph(serializedGraph, options) {
       deps.set(id, dependency);
       dependency.id = id;
       dependency.env.id = getEnvId(dependency.env);
-
-      // Dependency.symbols are always set to an empty map when scope hoisting
-      // is enabled. Some tests will fail if this is not the case. We should
-      // make this consistant when we re-visit packaging.
-      if (dependency.symbols != null || dependency.env.shouldScopeHoist) {
+      if (dependency.symbols != null) {
         var _dependency$symbols;
         dependency.symbols = new Map((_dependency$symbols = dependency.symbols) === null || _dependency$symbols === void 0 ? void 0 : _dependency$symbols.map(mapSymbols));
       }

package/lib/requests/BundleGraphRequest.js

@@ -392,7 +392,7 @@ class BundlerRunner {
   validateBundles(bundleGraph) {
     let bundles = bundleGraph.getBundles();
     let bundleNames = bundles.map(b => (0, _projectPath.joinProjectPath)(b.target.distDir, (0, _nullthrows().default)(b.name)));
-    _assert().default.deepEqual(bundleNames, (0, _utils().unique)(bundleNames), 'Bundles must have unique name. Conflicting names: ' + [...(0, _utils().setDifference)(new Set(bundleNames), new Set((0, _utils().unique)(bundleNames)))].join());
+    _assert().default.deepEqual(bundleNames, (0, _utils().unique)(bundleNames), 'Bundles must have unique name. Conflicting names: ' + [...(0, _utils().setSymmetricDifference)(new Set(bundleNames), new Set((0, _utils().unique)(bundleNames)))].join());
   }
   async nameBundle(namers, internalBundle, internalBundleGraph) {
     let bundle = _Bundle.Bundle.get(internalBundle, internalBundleGraph, this.options);

package/lib/requests/asset-graph-diff.js

@@ -120,7 +120,7 @@ function assetGraphDiff(jsAssetGraph, rustAssetGraph) {
     '$.value.outputHash',
     // ignore correspondingRequest from all nodes
     '$.correspondingRequest'];
-    console.log((0, _jestDiff().diff)(compactDeep(rustNode, ignoredPatterns), compactDeep(jsNode, ignoredPatterns)));
+    console.log((0, _jestDiff().diff)(compactDeep(jsNode, ignoredPatterns), compactDeep(rustNode, ignoredPatterns)));
   }
   console.log('Missing', missing);
   console.log('Extra', extra);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.12.1-canary.3549+fd6025d77",
+  "version": "2.12.1-canary.3553+bb17a2994",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -20,21 +20,21 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.12.1-canary.3549+fd6025d77",
-    "@atlaspack/cache": "2.12.1-canary.3549+fd6025d77",
-    "@atlaspack/diagnostic": "2.12.1-canary.3549+fd6025d77",
-    "@atlaspack/events": "2.12.1-canary.3549+fd6025d77",
-    "@atlaspack/feature-flags": "2.12.1-canary.3549+fd6025d77",
-    "@atlaspack/fs": "2.12.1-canary.3549+fd6025d77",
-    "@atlaspack/graph": "3.2.1-canary.3549+fd6025d77",
-    "@atlaspack/logger": "2.12.1-canary.3549+fd6025d77",
-    "@atlaspack/package-manager": "2.12.1-canary.3549+fd6025d77",
-    "@atlaspack/plugin": "2.12.1-canary.3549+fd6025d77",
-    "@atlaspack/profiler": "2.12.1-canary.3549+fd6025d77",
-    "@atlaspack/rust": "2.12.1-canary.3549+fd6025d77",
-    "@atlaspack/types": "2.12.1-canary.3549+fd6025d77",
-    "@atlaspack/utils": "2.12.1-canary.3549+fd6025d77",
-    "@atlaspack/workers": "2.12.1-canary.3549+fd6025d77",
+    "@atlaspack/build-cache": "2.12.1-canary.3553+bb17a2994",
+    "@atlaspack/cache": "2.12.1-canary.3553+bb17a2994",
+    "@atlaspack/diagnostic": "2.12.1-canary.3553+bb17a2994",
+    "@atlaspack/events": "2.12.1-canary.3553+bb17a2994",
+    "@atlaspack/feature-flags": "2.12.1-canary.3553+bb17a2994",
+    "@atlaspack/fs": "2.12.1-canary.3553+bb17a2994",
+    "@atlaspack/graph": "3.2.1-canary.3553+bb17a2994",
+    "@atlaspack/logger": "2.12.1-canary.3553+bb17a2994",
+    "@atlaspack/package-manager": "2.12.1-canary.3553+bb17a2994",
+    "@atlaspack/plugin": "2.12.1-canary.3553+bb17a2994",
+    "@atlaspack/profiler": "2.12.1-canary.3553+bb17a2994",
+    "@atlaspack/rust": "2.12.1-canary.3553+bb17a2994",
+    "@atlaspack/types": "2.12.1-canary.3553+bb17a2994",
+    "@atlaspack/utils": "2.12.1-canary.3553+bb17a2994",
+    "@atlaspack/workers": "2.12.1-canary.3553+bb17a2994",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -66,5 +66,5 @@
   "browser": {
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
-  "gitHead": "fd6025d7711d18151da07d6aa5229ab021097674"
+  "gitHead": "bb17a299464827110c52faaca0807fa38f302457"
 }

package/src/BundleGraph.js

@@ -73,6 +73,9 @@ export const bundleGraphEdgeTypes = {
   // Signals that the dependency is internally resolvable via the bundle's ancestry,
   // and that the bundle connected to the dependency is not necessary for the source bundle.
   internal_async: 5,
+  // This type is used to mark an edge between a bundle and a conditional bundle.
+  // This allows efficient discovery of conditional bundles in packaging
+  conditional: 5,
 };
 
 export type BundleGraphEdgeType = $Values<typeof bundleGraphEdgeTypes>;
@@ -1176,6 +1179,14 @@ export default class BundleGraph {
     );
   }
 
+  createBundleConditionalReference(from: Bundle, to: Bundle): void {
+    this._graph.addEdge(
+      this._graph.getNodeIdByContentKey(from.id),
+      this._graph.getNodeIdByContentKey(to.id),
+      bundleGraphEdgeTypes.conditional,
+    );
+  }
+
   getBundlesWithAsset(asset: Asset): Array<Bundle> {
     return this._graph
       .getNodeIdsConnectedTo(
@@ -2272,4 +2283,26 @@ export default class BundleGraph {
     this._targetEntryRoots.set(target.distDir, root);
     return root;
   }
+
+  getReferencedConditionalBundles(bundle: Bundle): Array<Bundle> {
+    let referencedBundles = new Set();
+    this._graph.dfs({
+      visit: (nodeId) => {
+        let node = nullthrows(this._graph.getNode(nodeId));
+        if (node.type !== 'bundle' || node.value.id === bundle.id) {
+          return;
+        }
+
+        referencedBundles.add(node.value);
+      },
+      startNodeId: this._graph.getNodeIdByContentKey(bundle.id),
+      getChildren: (nodeId) =>
+        this._graph.getNodeIdsConnectedFrom(
+          nodeId,
+          bundleGraphEdgeTypes.conditional,
+        ),
+    });
+
+    return [...referencedBundles];
+  }
 }

package/src/public/BundleGraph.js

@@ -494,4 +494,10 @@ export default class BundleGraph<TBundle: IBundle>
 
     return bundleConditions;
   }
+
+  getReferencedConditionalBundles(bundle: IBundle): Array<TBundle> {
+    return this.#graph
+      .getReferencedConditionalBundles(bundleToInternalBundle(bundle))
+      .map((result) => this.#createBundle(result, this.#graph, this.#options));
+  }
 }

package/src/public/MutableBundleGraph.js

@@ -280,6 +280,13 @@ export default class MutableBundleGraph
     );
   }
 
+  createBundleConditionalReference(from: IBundle, to: IBundle): void {
+    return this.#graph.createBundleConditionalReference(
+      bundleToInternalBundle(from),
+      bundleToInternalBundle(to),
+    );
+  }
+
   getDependencyAssets(dependency: IDependency): Array<IAsset> {
     return this.#graph
       .getDependencyAssets(dependencyToInternalDependency(dependency))

package/src/requests/AssetGraphRequestRust.js

@@ -221,10 +221,7 @@ function getAssetGraph(serializedGraph, options) {
       dependency.id = id;
       dependency.env.id = getEnvId(dependency.env);
 
-      // Dependency.symbols are always set to an empty map when scope hoisting
-      // is enabled. Some tests will fail if this is not the case. We should
-      // make this consistant when we re-visit packaging.
-      if (dependency.symbols != null || dependency.env.shouldScopeHoist) {
+      if (dependency.symbols != null) {
         dependency.symbols = new Map(dependency.symbols?.map(mapSymbols));
       }
 

package/src/requests/BundleGraphRequest.js

@@ -27,7 +27,7 @@ import MutableBundleGraph from '../public/MutableBundleGraph';
 import {Bundle, NamedBundle} from '../public/Bundle';
 import {report} from '../ReporterRunner';
 import dumpGraphToGraphViz from '../dumpGraphToGraphViz';
-import {unique, setDifference} from '@atlaspack/utils';
+import {unique, setSymmetricDifference} from '@atlaspack/utils';
 import {hashString} from '@atlaspack/rust';
 import PluginOptions from '../public/PluginOptions';
 import applyRuntimes from '../applyRuntimes';
@@ -511,7 +511,10 @@ class BundlerRunner {
       unique(bundleNames),
       'Bundles must have unique name. Conflicting names: ' +
         [
-          ...setDifference(new Set(bundleNames), new Set(unique(bundleNames))),
+          ...setSymmetricDifference(
+            new Set(bundleNames),
+            new Set(unique(bundleNames)),
+          ),
         ].join(),
     );
   }

package/src/requests/asset-graph-diff.js

@@ -130,10 +130,11 @@ function assetGraphDiff(jsAssetGraph: AssetGraph, rustAssetGraph: AssetGraph) {
       // ignore correspondingRequest from all nodes
       '$.correspondingRequest',
     ];
+
     console.log(
       diff(
-        compactDeep(rustNode, ignoredPatterns),
         compactDeep(jsNode, ignoredPatterns),
+        compactDeep(rustNode, ignoredPatterns),
       ),
     );
   }