@atlaspack/core 2.35.0 → 2.36.0

package/lib/requests/WriteBundleRequest.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.SourceMapHashRefRewriteStream = void 0;
 exports.applyReplacementsToSourceMap = applyReplacementsToSourceMap;
+exports.applyReplacementsToVLQMappings = applyReplacementsToVLQMappings;
 exports.computeSourceMapRoot = computeSourceMapRoot;
 exports.default = createWriteBundleRequest;
 var _constants = require("../constants");
@@ -78,7 +80,7 @@ function _featureFlags() {
 }
 var _EnvironmentManager = require("../EnvironmentManager");
 function _sourceMap() {
-  const data = _interopRequireDefault(require("@atlaspack/source-map"));
+  const data = require("@atlaspack/source-map");
   _sourceMap = function () {
     return data;
   };
@@ -90,6 +92,9 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const HASH_REF_PREFIX_LEN = _constants.HASH_REF_PREFIX.length;
 const BOUNDARY_LENGTH = _constants.HASH_REF_PREFIX.length + 32 - 1;
 const HASH_REF_PLACEHOLDER_LEN = HASH_REF_PREFIX_LEN + _constants.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.
  */
@@ -179,21 +184,11 @@ async function run({
   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, _featureFlags().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 (_sourceMap().default)(projectRoot, mapBuffer);
-      applyReplacementsToSourceMap(sourceMap, bundleReplacements);
-      const mapJson = await sourceMap.stringify({
-        format: 'string',
-        file: name,
-        sourceRoot: computeSourceMapRoot(bundle, options)
-      });
-      mapStream = (0, _utils().blobToStream)(Buffer.from(typeof mapJson === 'string' ? mapJson : JSON.stringify(mapJson), 'utf8'));
+      mapStream = (0, _utils().blobToStream)(mapEntry).pipe(new SourceMapHashRefRewriteStream(bundleReplacements));
     } else {
-      const mapEntry = await options.cache.getBlob(mapKey);
       mapStream = (0, _utils().blobToStream)(mapEntry);
     }
     await writeFiles(mapStream, info, hashRefToNameHash, options, config, outputFS, (0, _projectPath.toProjectPathUnsafe)((0, _projectPath.fromProjectPathRelative)(filePath) + '.map'), writeOptions, devDeps, api);
@@ -228,6 +223,178 @@ 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, _sourceMap().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, _sourceMap().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().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();
+  }
+}
+
 /**
  * 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
@@ -238,6 +405,7 @@ function applyReplacementsToSourceMap(sourceMap, replacements) {
  *
  * This logic must stay in sync with PackagerRunner.generateSourceMap.
  */
+exports.SourceMapHashRefRewriteStream = SourceMapHashRefRewriteStream;
 function computeSourceMapRoot(bundle, options) {
   let name = (0, _nullthrows().default)(bundle.name);
   let filePath = (0, _projectPath.joinProjectPath)(bundle.target.distDir, name);

package/lib/types/requests/BundleGraphRequestUtils.d.ts

@@ -17,6 +17,13 @@ import type { BundleGraphResult } from './BundleGraphRequest';
  * Throws an assertion error if duplicate bundle names are found.
  */
 export declare function validateBundles(bundleGraph: InternalBundleGraph): void;
+/**
+ * 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.
+ */
+export declare function dumpBundleGraphSnapshot(bundleGraph: InternalBundleGraph, variant: 'js' | 'rust'): void;
 /**
  * Names a bundle by running through the configured namers until one returns a name.
  */

package/lib/types/requests/WriteBundleRequest.d.ts

@@ -4,6 +4,7 @@ import type { StaticRunOpts } from '../RequestTracker';
 import type { Bundle, PackagedBundleInfo, AtlaspackOptions } from '../types';
 import type BundleGraph from '../BundleGraph';
 import type { BundleInfo } from '../PackagerRunner';
+import { Transform } from 'stream';
 import { requestTypes } from '../RequestTracker';
 import SourceMap from '@atlaspack/source-map';
 export type HashRefReplacement = {
@@ -33,6 +34,38 @@ export type WriteBundleRequest = {
  */
 export default function createWriteBundleRequest(input: WriteBundleRequestInput): WriteBundleRequest;
 export declare function applyReplacementsToSourceMap(sourceMap: SourceMap, replacements: HashRefReplacement[]): void;
+/**
+ * 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.
+ */
+export declare function applyReplacementsToVLQMappings(mappings: string, replacements: HashRefReplacement[]): string;
+/**
+ * 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.
+ */
+export declare class SourceMapHashRefRewriteStream extends Transform {
+    private replacements;
+    private state;
+    private scanBuf;
+    private mappingsBufs;
+    constructor(replacements: HashRefReplacement[]);
+    _transform(chunk: Buffer, _encoding: string, cb: any): void;
+    private _bufferingTransform;
+    _flush(cb: any): void;
+}
 /**
  * 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.35.0",
+  "version": "2.36.0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -24,21 +24,21 @@
   "dependencies": {
     "@mischnic/json-sourcemap": "^0.1.0",
     "@atlaspack/build-cache": "2.13.13",
-    "@atlaspack/cache": "3.2.50",
+    "@atlaspack/cache": "3.2.51",
     "@atlaspack/diagnostic": "2.14.4",
     "@atlaspack/events": "2.14.4",
     "@atlaspack/feature-flags": "2.30.1",
-    "@atlaspack/fs": "2.15.50",
-    "@atlaspack/graph": "3.6.17",
-    "@atlaspack/logger": "2.14.47",
-    "@atlaspack/package-manager": "2.14.55",
-    "@atlaspack/plugin": "2.14.55",
-    "@atlaspack/profiler": "2.15.16",
-    "@atlaspack/rust": "3.24.0",
-    "@atlaspack/types": "2.15.45",
-    "@atlaspack/utils": "3.3.7",
-    "@atlaspack/workers": "2.14.55",
-    "@atlaspack/source-map": "3.2.10",
+    "@atlaspack/fs": "2.15.51",
+    "@atlaspack/graph": "3.6.18",
+    "@atlaspack/logger": "2.14.48",
+    "@atlaspack/package-manager": "2.14.56",
+    "@atlaspack/plugin": "2.14.56",
+    "@atlaspack/profiler": "2.15.17",
+    "@atlaspack/rust": "3.24.1",
+    "@atlaspack/types": "2.15.46",
+    "@atlaspack/utils": "3.3.8",
+    "@atlaspack/workers": "2.14.56",
+    "@atlaspack/source-map": "3.3.0",
     "base-x": "^3.0.8",
     "browserslist": "^4.6.6",
     "clone": "^2.1.1",

package/src/requests/BundleGraphRequest.ts

@@ -43,6 +43,7 @@ import {
   nameBundle,
   loadPluginConfigWithDevDeps,
   runDevDepRequest as runDevDepRequestShared,
+  dumpBundleGraphSnapshot,
 } from './BundleGraphRequestUtils';
 import createAssetGraphRequestJS from './AssetGraphRequest';
 import {createAssetGraphRequestRust} from './AssetGraphRequestRust';
@@ -396,16 +397,20 @@ class BundlerRunner {
         }
 
         // 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 instrumentAsync('bundle (V2)', async () => {
+          await bundler.bundle({
+            bundleGraph: mutableBundleGraph,
+            config: this.configs.get(plugin.name)?.result,
+            options: this.pluginOptions,
+            logger,
+            tracer,
+          });
         });
 
         measurement && measurement.end();
 
+        dumpBundleGraphSnapshot(internalBundleGraph, 'js');
+
         if (this.pluginOptions.mode === 'production') {
           let optimizeMeasurement;
           try {

package/src/requests/BundleGraphRequestRust.ts

@@ -32,6 +32,7 @@ import {
   nameBundle,
   loadPluginConfigWithDevDeps,
   runDevDepRequest,
+  dumpBundleGraphSnapshot,
 } from './BundleGraphRequestUtils';
 import {toEnvironmentRef} from '../EnvironmentManager';
 import {getEnvironmentHash} from '../Environment';
@@ -109,6 +110,8 @@ export default function createBundleGraphRequestRust(
         () => getBundleGraph(serializedBundleGraph),
       );
 
+      dumpBundleGraphSnapshot(bundleGraph, 'rust');
+
       const runner = new NativeBundlerRunner(
         {api, options} as any,
         input.optionsRef,

package/src/requests/BundleGraphRequestUtils.ts

@@ -17,11 +17,13 @@ import type {
 } from '../types';
 
 import assert from 'assert';
+import fs from 'fs';
 import nullthrows from 'nullthrows';
+import path from 'path';
 import {PluginLogger} from '@atlaspack/logger';
 import ThrowableDiagnostic, {errorToDiagnostic} from '@atlaspack/diagnostic';
 import {unique, setSymmetricDifference} from '@atlaspack/utils';
-import InternalBundleGraph from '../BundleGraph';
+import InternalBundleGraph, {bundleGraphEdgeTypes} from '../BundleGraph';
 import BundleGraph from '../public/BundleGraph';
 import {Bundle, NamedBundle} from '../public/Bundle';
 import PluginOptions from '../public/PluginOptions';
@@ -66,6 +68,160 @@ export function validateBundles(bundleGraph: InternalBundleGraph): void {
   );
 }
 
+/**
+ * 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.
+ */
+export function dumpBundleGraphSnapshot(
+  bundleGraph: InternalBundleGraph,
+  variant: 'js' | 'rust',
+): void {
+  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.join(outDir, filename);
+
+  fs.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,
+        bundleGraphEdgeTypes.contains,
+      );
+      let containedAssets = containedAssetNodeIds
+        .map((nodeId) => bundleGraph._graph.getNode(nodeId))
+        .flatMap((node) => {
+          if (node?.type !== 'asset') return [];
+          return [
+            {
+              id: node.value.id,
+              filePath: fromProjectPathRelative(node.value.filePath),
+            },
+          ];
+        })
+        .sort((a, b) => a.filePath.localeCompare(b.filePath));
+
+      // Resolve mainEntry and entry asset file paths
+      let mainEntryPath: string | null = null;
+      let entryAssetPaths: string[] = [];
+      if (bundle.mainEntryId) {
+        let mainEntryNodeId = bundleGraph._graph.getNodeIdByContentKey(
+          bundle.mainEntryId,
+        );
+        let mainEntryNode = bundleGraph._graph.getNode(mainEntryNodeId);
+        if (mainEntryNode?.type === 'asset') {
+          mainEntryPath = 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(
+            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: string | null = null;
+      try {
+        let entryNodeId = bundleGraph._graph.getNodeIdByContentKey(
+          bundleGroup.entryAssetId,
+        );
+        let entryNode = bundleGraph._graph.getNode(entryNodeId);
+        if (entryNode?.type === 'asset') {
+          entryAssetPath = 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 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.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.
  */