@atlaspack/core 2.35.0 → 2.36.0

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atlaspack/core
 
+## 2.36.0
+
+### Minor Changes
+
+- [#1047](https://github.com/atlassian-labs/atlaspack/pull/1047) [`de388ff`](https://github.com/atlassian-labs/atlaspack/commit/de388ff76d39dece97ad475fcccdb6efb6283bfc) Thanks [@marcins](https://github.com/marcins)! - Change approach to source map offset for hashRefs - use a streaming approach to avoid loading large sourcemaps into memory.
+
+### Patch Changes
+
+- [#1025](https://github.com/atlassian-labs/atlaspack/pull/1025) [`f7878b2`](https://github.com/atlassian-labs/atlaspack/commit/f7878b2f19a0a3bbd0e79d0b4a4e1479646043b7) Thanks [@mattcompiles](https://github.com/mattcompiles)! - Add native ideal graph bundling algorithm behind nativeBundling feature flag
+
+- Updated dependencies [[`f7878b2`](https://github.com/atlassian-labs/atlaspack/commit/f7878b2f19a0a3bbd0e79d0b4a4e1479646043b7), [`22bb49c`](https://github.com/atlassian-labs/atlaspack/commit/22bb49c5708798d259f98c8b5c10850b2f4f5f1b), [`bddd21a`](https://github.com/atlassian-labs/atlaspack/commit/bddd21a5313974ca333c02b2da1c6f85d1afaaea), [`de388ff`](https://github.com/atlassian-labs/atlaspack/commit/de388ff76d39dece97ad475fcccdb6efb6283bfc)]:
+  - @atlaspack/rust@3.24.1
+  - @atlaspack/source-map@3.3.0
+  - @atlaspack/cache@3.2.51
+  - @atlaspack/fs@2.15.51
+  - @atlaspack/logger@2.14.48
+  - @atlaspack/utils@3.3.8
+  - @atlaspack/package-manager@2.14.56
+  - @atlaspack/profiler@2.15.17
+  - @atlaspack/workers@2.14.56
+  - @atlaspack/graph@3.6.18
+  - @atlaspack/plugin@2.14.56
+  - @atlaspack/types@2.15.46
+
 ## 2.35.0
 
 ### Minor Changes

package/dist/requests/BundleGraphRequest.js

@@ -263,14 +263,17 @@ class BundlerRunner {
                     measurement = tracer.createMeasurement(plugin.name, 'bundling:bundle', measurementFilename);
                 }
                 // this the normal bundle workflow (bundle, optimizing, run-times, naming)
-                await bundler.bundle({
-                    bundleGraph: mutableBundleGraph,
-                    config: this.configs.get(plugin.name)?.result,
-                    options: this.pluginOptions,
-                    logger,
-                    tracer,
+                await (0, logger_1.instrumentAsync)('bundle (V2)', async () => {
+                    await bundler.bundle({
+                        bundleGraph: mutableBundleGraph,
+                        config: this.configs.get(plugin.name)?.result,
+                        options: this.pluginOptions,
+                        logger,
+                        tracer,
+                    });
                 });
                 measurement && measurement.end();
+                (0, BundleGraphRequestUtils_1.dumpBundleGraphSnapshot)(internalBundleGraph, 'js');
                 if (this.pluginOptions.mode === 'production') {
                     let optimizeMeasurement;
                     try {

package/dist/requests/BundleGraphRequestRust.js

@@ -71,6 +71,7 @@ function createBundleGraphRequestRust(input) {
             }
             // Don’t reuse previous JS result yet; we just rebuild from scratch.
             let { bundleGraph, changedAssets } = (0, logger_1.instrument)('atlaspack_v3_getBundleGraph', () => getBundleGraph(serializedBundleGraph));
+            (0, BundleGraphRequestUtils_1.dumpBundleGraphSnapshot)(bundleGraph, 'rust');
             const runner = new NativeBundlerRunner({ api, options }, input.optionsRef);
             await runner.loadConfigs();
             // Name all bundles

package/dist/requests/BundleGraphRequestUtils.js

@@ -37,15 +37,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateBundles = validateBundles;
+exports.dumpBundleGraphSnapshot = dumpBundleGraphSnapshot;
 exports.nameBundle = nameBundle;
 exports.loadPluginConfigWithDevDeps = loadPluginConfigWithDevDeps;
 exports.runDevDepRequest = runDevDepRequest;
 const assert_1 = __importDefault(require("assert"));
+const fs_1 = __importDefault(require("fs"));
 const nullthrows_1 = __importDefault(require("nullthrows"));
+const path_1 = __importDefault(require("path"));
 const logger_1 = require("@atlaspack/logger");
 const diagnostic_1 = __importStar(require("@atlaspack/diagnostic"));
 const utils_1 = require("@atlaspack/utils");
-const BundleGraph_1 = __importDefault(require("../public/BundleGraph"));
+const BundleGraph_1 = require("../BundleGraph");
+const BundleGraph_2 = __importDefault(require("../public/BundleGraph"));
 const Bundle_1 = require("../public/Bundle");
 const InternalConfig_1 = require("../InternalConfig");
 const DevDepRequest_1 = require("./DevDepRequest");
@@ -64,12 +68,139 @@ function validateBundles(bundleGraph) {
             ...(0, utils_1.setSymmetricDifference)(new Set(bundleNames), new Set((0, utils_1.unique)(bundleNames))),
         ].join());
 }
+/**
+ * Dump a canonical JSON snapshot of the bundle graph for parity comparison.
+ * Gated by ATLASPACK_DUMP_BUNDLE_GRAPH environment variable which specifies the output directory.
+ * The snapshot captures bundle identity, type, contained assets, and bundle group structure
+ * in a deterministic, sorted format suitable for diffing.
+ */
+function dumpBundleGraphSnapshot(bundleGraph, variant) {
+    let outDir = process.env.ATLASPACK_DUMP_BUNDLE_GRAPH;
+    if (!outDir)
+        return;
+    let filename = variant === 'js' ? 'bundle-graph-js.json' : 'bundle-graph-rust.json';
+    let outPath = path_1.default.join(outDir, filename);
+    fs_1.default.mkdirSync(outDir, { recursive: true });
+    let bundles = bundleGraph.getBundles();
+    let bundlesSnapshot = bundles
+        .map((bundle) => {
+        let bundleNodeId = bundleGraph._graph.getNodeIdByContentKey(bundle.id);
+        let containedAssetNodeIds = bundleGraph._graph.getNodeIdsConnectedFrom(bundleNodeId, BundleGraph_1.bundleGraphEdgeTypes.contains);
+        let containedAssets = containedAssetNodeIds
+            .map((nodeId) => bundleGraph._graph.getNode(nodeId))
+            .flatMap((node) => {
+            if (node?.type !== 'asset')
+                return [];
+            return [
+                {
+                    id: node.value.id,
+                    filePath: (0, projectPath_1.fromProjectPathRelative)(node.value.filePath),
+                },
+            ];
+        })
+            .sort((a, b) => a.filePath.localeCompare(b.filePath));
+        // Resolve mainEntry and entry asset file paths
+        let mainEntryPath = null;
+        let entryAssetPaths = [];
+        if (bundle.mainEntryId) {
+            let mainEntryNodeId = bundleGraph._graph.getNodeIdByContentKey(bundle.mainEntryId);
+            let mainEntryNode = bundleGraph._graph.getNode(mainEntryNodeId);
+            if (mainEntryNode?.type === 'asset') {
+                mainEntryPath = (0, projectPath_1.fromProjectPathRelative)(mainEntryNode.value.filePath);
+            }
+        }
+        for (let entryId of bundle.entryAssetIds) {
+            let entryNodeId = bundleGraph._graph.getNodeIdByContentKey(entryId);
+            let entryNode = bundleGraph._graph.getNode(entryNodeId);
+            if (entryNode?.type === 'asset') {
+                entryAssetPaths.push((0, projectPath_1.fromProjectPathRelative)(entryNode.value.filePath));
+            }
+        }
+        entryAssetPaths.sort();
+        return {
+            id: bundle.id,
+            type: bundle.type,
+            bundleBehavior: bundle.bundleBehavior ?? null,
+            needsStableName: bundle.needsStableName,
+            isSplittable: bundle.isSplittable,
+            isPlaceholder: bundle.isPlaceholder,
+            mainEntryPath,
+            entryAssetPaths,
+            assets: containedAssets.map((a) => a.filePath),
+        };
+    })
+        .sort((a, b) => {
+        // Sort by mainEntryPath first, then by sorted assets as tiebreaker
+        let aKey = a.mainEntryPath || a.assets.join(',');
+        let bKey = b.mainEntryPath || b.assets.join(',');
+        return aKey.localeCompare(bKey);
+    });
+    let bundleGroupsSnapshot = bundleGraph._graph.nodes
+        .flatMap((node) => {
+        if (node?.type !== 'bundle_group')
+            return [];
+        let bundleGroup = node.value;
+        // Resolve entry asset file path
+        let entryAssetPath = null;
+        try {
+            let entryNodeId = bundleGraph._graph.getNodeIdByContentKey(bundleGroup.entryAssetId);
+            let entryNode = bundleGraph._graph.getNode(entryNodeId);
+            if (entryNode?.type === 'asset') {
+                entryAssetPath = (0, projectPath_1.fromProjectPathRelative)(entryNode.value.filePath);
+            }
+        }
+        catch {
+            // Content key not found
+        }
+        let bundlesInGroup = bundleGraph.getBundlesInBundleGroup(bundleGroup);
+        let bundlePaths = bundlesInGroup
+            .map((b) => {
+            // Use mainEntry file path if available, otherwise bundle id as fallback
+            if (b.mainEntryId) {
+                try {
+                    let nodeId = bundleGraph._graph.getNodeIdByContentKey(b.mainEntryId);
+                    let node = bundleGraph._graph.getNode(nodeId);
+                    if (node?.type === 'asset') {
+                        return (0, projectPath_1.fromProjectPathRelative)(node.value.filePath);
+                    }
+                }
+                catch {
+                    // fallback
+                }
+            }
+            return `[bundle:${b.id}]`;
+        })
+            .sort();
+        return [
+            {
+                entryAssetPath: entryAssetPath ?? `[unknown:${bundleGroup.entryAssetId}]`,
+                bundlePaths,
+            },
+        ];
+    })
+        .sort((a, b) => a.entryAssetPath.localeCompare(b.entryAssetPath));
+    let totalAssets = bundleGraph._graph.nodes.filter((node) => node?.type === 'asset').length;
+    let snapshot = {
+        version: 1,
+        variant,
+        stats: {
+            totalBundles: bundlesSnapshot.length,
+            totalBundleGroups: bundleGroupsSnapshot.length,
+            totalAssets,
+        },
+        bundles: bundlesSnapshot,
+        bundleGroups: bundleGroupsSnapshot,
+    };
+    fs_1.default.writeFileSync(outPath, JSON.stringify(snapshot, null, 2), 'utf8');
+    // eslint-disable-next-line no-console
+    console.log(`[BundleGraphSnapshot] Wrote ${variant} snapshot to ${outPath}`);
+}
 /**
  * Names a bundle by running through the configured namers until one returns a name.
  */
 async function nameBundle(namers, internalBundle, internalBundleGraph, options, pluginOptions, configs) {
     const bundle = Bundle_1.Bundle.get(internalBundle, internalBundleGraph, options);
-    const bundleGraph = new BundleGraph_1.default(internalBundleGraph, Bundle_1.NamedBundle.get.bind(Bundle_1.NamedBundle), options);
+    const bundleGraph = new BundleGraph_2.default(internalBundleGraph, Bundle_1.NamedBundle.get.bind(Bundle_1.NamedBundle), options);
     for (const namer of namers) {
         let measurement;
         try {

package/dist/requests/WriteBundleRequest.js

@@ -36,8 +36,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.SourceMapHashRefRewriteStream = void 0;
 exports.default = createWriteBundleRequest;
 exports.applyReplacementsToSourceMap = applyReplacementsToSourceMap;
+exports.applyReplacementsToVLQMappings = applyReplacementsToVLQMappings;
 exports.computeSourceMapRoot = computeSourceMapRoot;
 const constants_1 = require("../constants");
 const nullthrows_1 = __importDefault(require("nullthrows"));
@@ -56,10 +58,12 @@ const profiler_1 = require("@atlaspack/profiler");
 const RequestTracker_1 = require("../RequestTracker");
 const feature_flags_1 = require("@atlaspack/feature-flags");
 const EnvironmentManager_1 = require("../EnvironmentManager");
-const source_map_1 = __importDefault(require("@atlaspack/source-map"));
+const source_map_1 = require("@atlaspack/source-map");
 const HASH_REF_PREFIX_LEN = constants_1.HASH_REF_PREFIX.length;
 const BOUNDARY_LENGTH = constants_1.HASH_REF_PREFIX.length + 32 - 1;
 const HASH_REF_PLACEHOLDER_LEN = HASH_REF_PREFIX_LEN + constants_1.HASH_REF_HASH_LEN;
+// The JSON key prefix we scan for in the source map stream.
+const MAPPINGS_KEY_BUF = Buffer.from('"mappings":"');
 /**
  * Writes a bundle to the dist directory, replacing hash references with the final content hashes.
  */
@@ -136,28 +140,14 @@ async function run({ input, options, api }) {
     await writeFiles(contentStream, info, hashRefToNameHash, options, config, outputFS, filePath, writeOptions, devDeps, api, bundleReplacements);
     const hasSourceMap = await options.cache.has(mapKey);
     if (mapKey && env.sourceMap && !env.sourceMap.inline && hasSourceMap) {
+        const mapEntry = await options.cache.getBlob(mapKey);
         let mapStream;
         if ((0, feature_flags_1.getFeatureFlag)('fixSourceMapHashRefs') &&
             bundleReplacements &&
             bundleReplacements.length > 0) {
-            const mapEntry = await options.cache.getBlob(mapKey);
-            const mapBuffer = Buffer.isBuffer(mapEntry)
-                ? mapEntry
-                : Buffer.from(mapEntry);
-            const projectRoot = typeof options.projectRoot === 'string'
-                ? options.projectRoot
-                : String(options.projectRoot);
-            const sourceMap = new source_map_1.default(projectRoot, mapBuffer);
-            applyReplacementsToSourceMap(sourceMap, bundleReplacements);
-            const mapJson = await sourceMap.stringify({
-                format: 'string',
-                file: name,
-                sourceRoot: computeSourceMapRoot(bundle, options),
-            });
-            mapStream = (0, utils_1.blobToStream)(Buffer.from(typeof mapJson === 'string' ? mapJson : JSON.stringify(mapJson), 'utf8'));
+            mapStream = (0, utils_1.blobToStream)(mapEntry).pipe(new SourceMapHashRefRewriteStream(bundleReplacements));
         }
         else {
-            const mapEntry = await options.cache.getBlob(mapKey);
             mapStream = (0, utils_1.blobToStream)(mapEntry);
         }
         await writeFiles(mapStream, info, hashRefToNameHash, options, config, outputFS, (0, projectPath_1.toProjectPathUnsafe)((0, projectPath_1.fromProjectPathRelative)(filePath) + '.map'), writeOptions, devDeps, api);
@@ -192,6 +182,167 @@ function applyReplacementsToSourceMap(sourceMap, replacements) {
         }
     }
 }
+/**
+ * Applies hash-ref replacement column offsets directly to a VLQ mappings
+ * string without deserializing the full source map into a native struct.
+ *
+ * Each replacement r describes a hash-ref that was substituted in the output
+ * file.  r.column is in the progressively-shifted post-replacement coordinate
+ * space (matching the already-shifted source map state after all previous
+ * offsetColumns calls), so thresholds are applied sequentially against the
+ * running absCol values exactly as the native offsetColumns implementation does.
+ */
+function applyReplacementsToVLQMappings(mappings, replacements) {
+    if (replacements.length === 0)
+        return mappings;
+    // Group replacements by line (0-indexed), sorted by column ascending.
+    const byLine = new Map();
+    for (const r of replacements) {
+        let arr = byLine.get(r.line);
+        if (!arr) {
+            arr = [];
+            byLine.set(r.line, arr);
+        }
+        arr.push(r);
+    }
+    for (const arr of byLine.values()) {
+        arr.sort((a, b) => a.column - b.column);
+    }
+    const lines = mappings.split(';');
+    const resultLines = [];
+    for (let lineIdx = 0; lineIdx < lines.length; lineIdx++) {
+        const lineReps = byLine.get(lineIdx);
+        if (!lineReps || lineReps.length === 0) {
+            resultLines.push(lines[lineIdx]);
+            continue;
+        }
+        const line = lines[lineIdx];
+        if (!line) {
+            resultLines.push('');
+            continue;
+        }
+        // Decode segment column deltas to absolute columns.
+        const segments = line.split(',');
+        const colVlqEnds = [];
+        const absCols = [];
+        let absCol = 0;
+        for (const seg of segments) {
+            const { value: colDelta, nextPos } = (0, source_map_1.decodeVLQ)(seg, 0);
+            absCol += colDelta;
+            colVlqEnds.push(nextPos);
+            absCols.push(absCol);
+        }
+        // Apply each replacement's column shift sequentially against the
+        // current absCol values (which have already been adjusted by previous
+        // replacements on this line), mirroring the sequential offsetColumns calls.
+        for (const r of lineReps) {
+            const delta = r.newLength - r.originalLength;
+            if (delta === 0)
+                continue;
+            const threshold = r.column + r.originalLength;
+            for (let i = 0; i < absCols.length; i++) {
+                if (absCols[i] >= threshold) {
+                    absCols[i] += delta;
+                }
+            }
+        }
+        // Re-encode with updated absolute columns; only the leading column VLQ
+        // field of each segment changes – the tail bytes are sliced unchanged.
+        const resultSegments = [];
+        let prevAbsCol = 0;
+        for (let i = 0; i < segments.length; i++) {
+            const newDelta = absCols[i] - prevAbsCol;
+            prevAbsCol = absCols[i];
+            resultSegments.push((0, source_map_1.encodeVLQ)(newDelta) + segments[i].slice(colVlqEnds[i]));
+        }
+        resultLines.push(resultSegments.join(','));
+    }
+    return resultLines.join(';');
+}
+/**
+ * A Transform stream that rewrites the "mappings" VLQ field of a source map
+ * JSON to account for hash-ref replacements, without ever loading the full
+ * JSON object or the native Rust SourceMapInner into memory.
+ *
+ * Field order in cached source maps (from partialVlqMapToSourceMap / toVLQ):
+ *   mappings → sources → sourcesContent → names → version → file → sourceRoot
+ *
+ * "mappings" is the very first field, so we scan only a tiny header before
+ * switching to zero-copy passthrough for the bulk sourcesContent bytes.
+ */
+class SourceMapHashRefRewriteStream extends stream_1.Transform {
+    constructor(replacements) {
+        super();
+        this.replacements = replacements;
+        this.state = 'scanning';
+        this.scanBuf = Buffer.alloc(0);
+        this.mappingsBufs = [];
+    }
+    // @ts-expect-error TS7006
+    _transform(chunk, _encoding, cb) {
+        if (this.state === 'passthrough') {
+            this.push(chunk);
+            cb();
+            return;
+        }
+        if (this.state === 'scanning') {
+            const combined = Buffer.concat([this.scanBuf, chunk]);
+            const idx = combined.indexOf(MAPPINGS_KEY_BUF);
+            if (idx === -1) {
+                // Key not yet found – hold back enough bytes to handle a split key.
+                const keepLen = Math.min(combined.length, MAPPINGS_KEY_BUF.length - 1);
+                if (combined.length > keepLen) {
+                    this.push(combined.slice(0, combined.length - keepLen));
+                }
+                this.scanBuf = combined.slice(combined.length - keepLen);
+                cb();
+                return;
+            }
+            // Emit everything up to and including the key.
+            const keyEnd = idx + MAPPINGS_KEY_BUF.length;
+            this.push(combined.slice(0, keyEnd));
+            this.scanBuf = Buffer.alloc(0);
+            this.state = 'buffering';
+            this._bufferingTransform(combined.slice(keyEnd), cb);
+            return;
+        }
+        // state === 'buffering'
+        this._bufferingTransform(chunk, cb);
+    }
+    // @ts-expect-error TS7006
+    _bufferingTransform(chunk, cb) {
+        // Mappings values contain only base64 chars, ';', and ',' – no escaping –
+        // so scanning for the closing '"' (0x22) is safe.
+        const closeIdx = chunk.indexOf(0x22);
+        if (closeIdx === -1) {
+            this.mappingsBufs.push(chunk);
+            cb();
+            return;
+        }
+        this.mappingsBufs.push(chunk.slice(0, closeIdx));
+        // VLQ chars are all ASCII (<128), so latin1 round-trips without loss.
+        const mappingsStr = Buffer.concat(this.mappingsBufs).toString('latin1');
+        const rewritten = applyReplacementsToVLQMappings(mappingsStr, this.replacements);
+        this.push(Buffer.from(rewritten, 'latin1'));
+        // Emit the closing '"' and everything remaining in one push.
+        this.push(chunk.slice(closeIdx));
+        this.state = 'passthrough';
+        this.mappingsBufs = [];
+        cb();
+    }
+    // @ts-expect-error TS7006
+    _flush(cb) {
+        if (this.state === 'scanning' && this.scanBuf.length > 0) {
+            this.push(this.scanBuf);
+        }
+        else if (this.state === 'buffering') {
+            // Malformed JSON – flush whatever we buffered as-is.
+            this.push(Buffer.concat(this.mappingsBufs));
+        }
+        cb();
+    }
+}
+exports.SourceMapHashRefRewriteStream = SourceMapHashRefRewriteStream;
 /**
  * Computes the sourceRoot for a source map file. This is the relative path from
  * the output directory back to the project root, so that source paths (stored

package/lib/requests/BundleGraphRequest.js

@@ -293,7 +293,6 @@ class BundlerRunner {
         }
         didIncrementallyBundle = true;
       } else {
-        var _this$configs$get;
         internalBundleGraph = _BundleGraph.default.fromAssetGraph(graph, this.options.mode === 'production');
         (0, _assert().default)(internalBundleGraph != null); // ensures the graph was created
 
@@ -309,14 +308,18 @@ class BundlerRunner {
         }
 
         // this the normal bundle workflow (bundle, optimizing, run-times, naming)
-        await bundler.bundle({
-          bundleGraph: mutableBundleGraph,
-          config: (_this$configs$get = this.configs.get(plugin.name)) === null || _this$configs$get === void 0 ? void 0 : _this$configs$get.result,
-          options: this.pluginOptions,
-          logger,
-          tracer
+        await (0, _logger().instrumentAsync)('bundle (V2)', async () => {
+          var _this$configs$get;
+          await bundler.bundle({
+            bundleGraph: mutableBundleGraph,
+            config: (_this$configs$get = this.configs.get(plugin.name)) === null || _this$configs$get === void 0 ? void 0 : _this$configs$get.result,
+            options: this.pluginOptions,
+            logger,
+            tracer
+          });
         });
         measurement && measurement.end();
+        (0, _BundleGraphRequestUtils.dumpBundleGraphSnapshot)(internalBundleGraph, 'js');
         if (this.pluginOptions.mode === 'production') {
           let optimizeMeasurement;
           try {

package/lib/requests/BundleGraphRequestRust.js

@@ -96,6 +96,7 @@ function createBundleGraphRequestRust(input) {
         bundleGraph,
         changedAssets
       } = (0, _logger().instrument)('atlaspack_v3_getBundleGraph', () => getBundleGraph(serializedBundleGraph));
+      (0, _BundleGraphRequestUtils.dumpBundleGraphSnapshot)(bundleGraph, 'rust');
       const runner = new NativeBundlerRunner({
         api,
         options

package/lib/requests/BundleGraphRequestUtils.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.dumpBundleGraphSnapshot = dumpBundleGraphSnapshot;
 exports.loadPluginConfigWithDevDeps = loadPluginConfigWithDevDeps;
 exports.nameBundle = nameBundle;
 exports.runDevDepRequest = runDevDepRequest;
@@ -14,6 +15,13 @@ function _assert() {
   };
   return data;
 }
+function _fs() {
+  const data = _interopRequireDefault(require("fs"));
+  _fs = function () {
+    return data;
+  };
+  return data;
+}
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
   _nullthrows = function () {
@@ -21,6 +29,13 @@ function _nullthrows() {
   };
   return data;
 }
+function _path() {
+  const data = _interopRequireDefault(require("path"));
+  _path = function () {
+    return data;
+  };
+  return data;
+}
 function _logger() {
   const data = require("@atlaspack/logger");
   _logger = function () {
@@ -42,7 +57,8 @@ function _utils() {
   };
   return data;
 }
-var _BundleGraph = _interopRequireDefault(require("../public/BundleGraph"));
+var _BundleGraph = require("../BundleGraph");
+var _BundleGraph2 = _interopRequireDefault(require("../public/BundleGraph"));
 var _Bundle = require("../public/Bundle");
 var _InternalConfig = require("../InternalConfig");
 var _DevDepRequest = require("./DevDepRequest");
@@ -75,12 +91,126 @@ function validateBundles(bundleGraph) {
   _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());
 }
 
+/**
+ * Dump a canonical JSON snapshot of the bundle graph for parity comparison.
+ * Gated by ATLASPACK_DUMP_BUNDLE_GRAPH environment variable which specifies the output directory.
+ * The snapshot captures bundle identity, type, contained assets, and bundle group structure
+ * in a deterministic, sorted format suitable for diffing.
+ */
+function dumpBundleGraphSnapshot(bundleGraph, variant) {
+  let outDir = process.env.ATLASPACK_DUMP_BUNDLE_GRAPH;
+  if (!outDir) return;
+  let filename = variant === 'js' ? 'bundle-graph-js.json' : 'bundle-graph-rust.json';
+  let outPath = _path().default.join(outDir, filename);
+  _fs().default.mkdirSync(outDir, {
+    recursive: true
+  });
+  let bundles = bundleGraph.getBundles();
+  let bundlesSnapshot = bundles.map(bundle => {
+    let bundleNodeId = bundleGraph._graph.getNodeIdByContentKey(bundle.id);
+    let containedAssetNodeIds = bundleGraph._graph.getNodeIdsConnectedFrom(bundleNodeId, _BundleGraph.bundleGraphEdgeTypes.contains);
+    let containedAssets = containedAssetNodeIds.map(nodeId => bundleGraph._graph.getNode(nodeId)).flatMap(node => {
+      if ((node === null || node === void 0 ? void 0 : node.type) !== 'asset') return [];
+      return [{
+        id: node.value.id,
+        filePath: (0, _projectPath.fromProjectPathRelative)(node.value.filePath)
+      }];
+    }).sort((a, b) => a.filePath.localeCompare(b.filePath));
+
+    // Resolve mainEntry and entry asset file paths
+    let mainEntryPath = null;
+    let entryAssetPaths = [];
+    if (bundle.mainEntryId) {
+      let mainEntryNodeId = bundleGraph._graph.getNodeIdByContentKey(bundle.mainEntryId);
+      let mainEntryNode = bundleGraph._graph.getNode(mainEntryNodeId);
+      if ((mainEntryNode === null || mainEntryNode === void 0 ? void 0 : mainEntryNode.type) === 'asset') {
+        mainEntryPath = (0, _projectPath.fromProjectPathRelative)(mainEntryNode.value.filePath);
+      }
+    }
+    for (let entryId of bundle.entryAssetIds) {
+      let entryNodeId = bundleGraph._graph.getNodeIdByContentKey(entryId);
+      let entryNode = bundleGraph._graph.getNode(entryNodeId);
+      if ((entryNode === null || entryNode === void 0 ? void 0 : entryNode.type) === 'asset') {
+        entryAssetPaths.push((0, _projectPath.fromProjectPathRelative)(entryNode.value.filePath));
+      }
+    }
+    entryAssetPaths.sort();
+    return {
+      id: bundle.id,
+      type: bundle.type,
+      bundleBehavior: bundle.bundleBehavior ?? null,
+      needsStableName: bundle.needsStableName,
+      isSplittable: bundle.isSplittable,
+      isPlaceholder: bundle.isPlaceholder,
+      mainEntryPath,
+      entryAssetPaths,
+      assets: containedAssets.map(a => a.filePath)
+    };
+  }).sort((a, b) => {
+    // Sort by mainEntryPath first, then by sorted assets as tiebreaker
+    let aKey = a.mainEntryPath || a.assets.join(',');
+    let bKey = b.mainEntryPath || b.assets.join(',');
+    return aKey.localeCompare(bKey);
+  });
+  let bundleGroupsSnapshot = bundleGraph._graph.nodes.flatMap(node => {
+    if ((node === null || node === void 0 ? void 0 : node.type) !== 'bundle_group') return [];
+    let bundleGroup = node.value;
+
+    // Resolve entry asset file path
+    let entryAssetPath = null;
+    try {
+      let entryNodeId = bundleGraph._graph.getNodeIdByContentKey(bundleGroup.entryAssetId);
+      let entryNode = bundleGraph._graph.getNode(entryNodeId);
+      if ((entryNode === null || entryNode === void 0 ? void 0 : entryNode.type) === 'asset') {
+        entryAssetPath = (0, _projectPath.fromProjectPathRelative)(entryNode.value.filePath);
+      }
+    } catch {
+      // Content key not found
+    }
+    let bundlesInGroup = bundleGraph.getBundlesInBundleGroup(bundleGroup);
+    let bundlePaths = bundlesInGroup.map(b => {
+      // Use mainEntry file path if available, otherwise bundle id as fallback
+      if (b.mainEntryId) {
+        try {
+          let nodeId = bundleGraph._graph.getNodeIdByContentKey(b.mainEntryId);
+          let node = bundleGraph._graph.getNode(nodeId);
+          if ((node === null || node === void 0 ? void 0 : node.type) === 'asset') {
+            return (0, _projectPath.fromProjectPathRelative)(node.value.filePath);
+          }
+        } catch {
+          // fallback
+        }
+      }
+      return `[bundle:${b.id}]`;
+    }).sort();
+    return [{
+      entryAssetPath: entryAssetPath ?? `[unknown:${bundleGroup.entryAssetId}]`,
+      bundlePaths
+    }];
+  }).sort((a, b) => a.entryAssetPath.localeCompare(b.entryAssetPath));
+  let totalAssets = bundleGraph._graph.nodes.filter(node => (node === null || node === void 0 ? void 0 : node.type) === 'asset').length;
+  let snapshot = {
+    version: 1,
+    variant,
+    stats: {
+      totalBundles: bundlesSnapshot.length,
+      totalBundleGroups: bundleGroupsSnapshot.length,
+      totalAssets
+    },
+    bundles: bundlesSnapshot,
+    bundleGroups: bundleGroupsSnapshot
+  };
+  _fs().default.writeFileSync(outPath, JSON.stringify(snapshot, null, 2), 'utf8');
+  // eslint-disable-next-line no-console
+  console.log(`[BundleGraphSnapshot] Wrote ${variant} snapshot to ${outPath}`);
+}
+
 /**
  * Names a bundle by running through the configured namers until one returns a name.
  */
 async function nameBundle(namers, internalBundle, internalBundleGraph, options, pluginOptions, configs) {
   const bundle = _Bundle.Bundle.get(internalBundle, internalBundleGraph, options);
-  const bundleGraph = new _BundleGraph.default(internalBundleGraph, _Bundle.NamedBundle.get.bind(_Bundle.NamedBundle), options);
+  const bundleGraph = new _BundleGraph2.default(internalBundleGraph, _Bundle.NamedBundle.get.bind(_Bundle.NamedBundle), options);
   for (const namer of namers) {
     let measurement;
     try {