@atlaspack/packager-js 2.25.9 → 2.25.11-dev-fix-sourcemaps-50acc1acf.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaspack/packager-js
 
+## 2.25.10
+
+### Patch Changes
+
+- [#1107](https://github.com/atlassian-labs/atlaspack/pull/1107) [`6fde8ea`](https://github.com/atlassian-labs/atlaspack/commit/6fde8ea2e32d79b7f99008ca6645128663de09aa) Thanks [@at-nathan](https://github.com/at-nathan)! - Fix scope hoisting source map for CSS modules
+
 ## 2.25.9
 
 ### Patch Changes

package/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright (c) 2024 Atlassian US., Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/dist/ScopeHoistingPackager.js

@@ -37,6 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScopeHoistingPackager = void 0;
+exports.appendHoistedValues = appendHoistedValues;
 const utils_1 = require("@atlaspack/utils");
 const source_map_1 = __importDefault(require("@atlaspack/source-map"));
 const nullthrows_1 = __importDefault(require("nullthrows"));
@@ -57,6 +58,25 @@ const utils_2 = require("./utils");
 const REPLACEMENT_RE_CONDITIONAL = /\n|import\s+"([0-9a-f]{16,20}:.+?)";|(?:\$[0-9a-f]{16,20}\$exports)|(?:\$[0-9a-f]{16,20}\$(?:import|importAsync|require|importCond)\$[0-9a-f]+(?:\$[0-9a-f]+)?)/g;
 const REPLACEMENT_RE = /\n|import\s+"([0-9a-f]{16,20}:.+?)";|(?:\$[0-9a-f]{16,20}\$exports)|(?:\$[0-9a-f]{16,20}\$(?:import|importAsync|require)\$[0-9a-f]+(?:\$[0-9a-f]+)?)/g;
 const BUILTINS = Object.keys(globals_1.default.builtin);
+/**
+ * Joins filtered hoisted parcelRequire values into the bundle output,
+ * returning the text to append and the number of newlines it adds.
+ *
+ * Returns `{text: '', lineCount: 0}` when there are no values, to avoid
+ * emitting a stray leading `\n` (which would over-count lineCount and
+ * desynchronise the bundle source-map offset bookkeeping).
+ *
+ * Exported for direct unit testing of the lineCount bookkeeping.
+ */
+function appendHoistedValues(values) {
+    if (values.length === 0) {
+        return { text: '', lineCount: 0 };
+    }
+    return {
+        text: '\n' + values.join('\n'),
+        lineCount: values.length,
+    };
+}
 const GLOBALS_BY_CONTEXT = {
     browser: new Set([...BUILTINS, ...Object.keys(globals_1.default.browser)]),
     'web-worker': new Set([...BUILTINS, ...Object.keys(globals_1.default.worker)]),
@@ -136,10 +156,14 @@ class ScopeHoistingPackager {
             this.seenHoistedRequires.clear();
             let [content, map, lines] = this.visitAsset(asset);
             if (sourceMap && map) {
+                this.addAssetBoundaryMarker(sourceMap, asset, lineCount);
                 sourceMap.addSourceMap(map, lineCount);
             }
             else if (this.bundle.env.sourceMap) {
                 sourceMap = map;
+                if (sourceMap) {
+                    this.addAssetBoundaryMarker(sourceMap, asset, lineCount);
+                }
             }
             res += content + '\n';
             lineCount += lines + 1;
@@ -240,6 +264,7 @@ class ScopeHoistingPackager {
             }
             res += (0, utils_2.replaceScriptDependencies)(this.bundleGraph, this.bundle, code, map, this.parcelRequireName);
             if (sourceMap && map) {
+                this.addAssetBoundaryMarker(sourceMap, mainEntry, lineCount);
                 // @ts-expect-error TS2339 - addSourceMap method exists but missing from @parcel/source-map type definitions
                 sourceMap.addSourceMap(map, lineCount);
             }
@@ -516,6 +541,30 @@ class ScopeHoistingPackager {
         let { code, map } = (0, nullthrows_1.default)(this.assetOutputs.get(asset));
         return this.buildAsset(asset, code, map);
     }
+    /**
+     * Insert a single "boundary marker" mapping at the start of the line where
+     * `asset`'s source map is about to be appended. Without this marker, source
+     * map consumers (and downstream optimizers such as swc that need to compose
+     * via nearest-neighbour lookups) will attribute the columns at the start of
+     * this asset's region to the *previous* asset's last mapping, because there
+     * is no mapping anchoring the start of the new asset. This is especially
+     * visible for assets with sparse maps (e.g. codegen'd `.graphql.ts` files
+     * from Relay) whose first mapping may be hundreds of columns into the line.
+     *
+     * The marker points at `(asset.filePath, 1, 0)`. Any mapping the asset's
+     * own map provides at the same generated position will override this one
+     * (last-write-wins inside `parcel_sourcemap`).
+     */
+    addAssetBoundaryMarker(sourceMap, asset, lineOffset) {
+        if (!sourceMap)
+            return;
+        let source = this.getAssetFilePath(asset);
+        sourceMap.addIndexedMapping({
+            generated: { line: lineOffset + 1, column: 0 },
+            original: { line: 1, column: 0 },
+            source,
+        });
+    }
     getAssetFilePath(asset) {
         return path_1.default.relative(this.options.projectRoot, asset.filePath);
     }
@@ -525,6 +574,13 @@ class ScopeHoistingPackager {
         let sourceMap = this.bundle.env.sourceMap && map
             ? new source_map_1.default(this.options.projectRoot, map)
             : null;
+        // Anchor the start of this asset's region with a boundary marker so the
+        // first columns of the asset don't fall back to a previous asset's
+        // mapping during downstream source-map composition. See the
+        // addAssetBoundaryMarker JSDoc for the full rationale.
+        if (sourceMap) {
+            this.addAssetBoundaryMarker(sourceMap, asset, 0);
+        }
         // If this asset is skipped, just add dependencies and not the asset's content.
         if (this.shouldSkipAsset(asset)) {
             let depCode = '';
@@ -558,6 +614,7 @@ class ScopeHoistingPackager {
                         let [code, map, lines] = this.visitAsset(resolved);
                         depCode += code + '\n';
                         if (sourceMap && map) {
+                            this.addAssetBoundaryMarker(sourceMap, resolved, lineCount);
                             sourceMap.addSourceMap(map, lineCount);
                         }
                         lineCount += lines + 1;
@@ -656,7 +713,13 @@ class ScopeHoistingPackager {
                                 }
                                 else {
                                     if (shouldWrap) {
-                                        depContent.push(this.visitAsset(resolved));
+                                        let visited = this.visitAsset(resolved);
+                                        depContent.push([
+                                            visited[0],
+                                            visited[1],
+                                            visited[2],
+                                            resolved,
+                                        ]);
                                     }
                                     else {
                                         let [depCode, depMap, depLines] = this.visitAsset(resolved);
@@ -680,6 +743,7 @@ class ScopeHoistingPackager {
                                     sourceMap.offsetLines(lineCount + 1, lines);
                                 }
                                 if (map) {
+                                    this.addAssetBoundaryMarker(sourceMap, resolved, lineCount);
                                     sourceMap.addSourceMap(map, lineCount);
                                 }
                             }
@@ -719,11 +783,14 @@ ${code}
                 code = `/* ${this.getAssetFilePath(asset)} */\n` + code;
                 lineCount += 1;
             }
-            for (let [depCode, map, lines] of depContent) {
+            for (let [depCode, map, lines, depAsset] of depContent) {
                 if (!depCode)
                     continue;
                 code += depCode + '\n';
                 if (sourceMap && map) {
+                    if (depAsset) {
+                        this.addAssetBoundaryMarker(sourceMap, depAsset, lineCount);
+                    }
                     sourceMap.addSourceMap(map, lineCount);
                 }
                 lineCount += lines + 1;
@@ -1089,8 +1156,13 @@ ${code}
                 for (let val of hoistedValues) {
                     this.seenHoistedRequires.add(val);
                 }
-                res += '\n' + hoistedValues.join('\n');
-                lineCount += hoisted.size;
+                // Only emit the leading `\n` and bump the line count when we
+                // actually have values to write. Otherwise `res += '\n' + ''` would
+                // emit a stray blank line and the line count would over-count by
+                // `hoisted.size` (which includes the now-filtered entries).
+                let appended = appendHoistedValues(hoistedValues);
+                res += appended.text;
+                lineCount += appended.lineCount;
             }
             else {
                 res += '\n' + [...hoisted.values()].join('\n');
@@ -1268,7 +1340,7 @@ ${code}
                             : '';
                         prepend += `$parcel$export($${assetId}$exports, ${JSON.stringify(exp)}, ${get}${set});\n`;
                         this.usedHelpers.add('$parcel$export');
-                        prependLineCount += 1 + usedExports.length;
+                        prependLineCount += 1;
                     }
                 }
             }

package/lib/ScopeHoistingPackager.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ScopeHoistingPackager = void 0;
+exports.appendHoistedValues = appendHoistedValues;
 function _utils() {
   const data = require("@atlaspack/utils");
   _utils = function () {
@@ -80,6 +81,29 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const REPLACEMENT_RE_CONDITIONAL = /\n|import\s+"([0-9a-f]{16,20}:.+?)";|(?:\$[0-9a-f]{16,20}\$exports)|(?:\$[0-9a-f]{16,20}\$(?:import|importAsync|require|importCond)\$[0-9a-f]+(?:\$[0-9a-f]+)?)/g;
 const REPLACEMENT_RE = /\n|import\s+"([0-9a-f]{16,20}:.+?)";|(?:\$[0-9a-f]{16,20}\$exports)|(?:\$[0-9a-f]{16,20}\$(?:import|importAsync|require)\$[0-9a-f]+(?:\$[0-9a-f]+)?)/g;
 const BUILTINS = Object.keys(_globals().default.builtin);
+
+/**
+ * Joins filtered hoisted parcelRequire values into the bundle output,
+ * returning the text to append and the number of newlines it adds.
+ *
+ * Returns `{text: '', lineCount: 0}` when there are no values, to avoid
+ * emitting a stray leading `\n` (which would over-count lineCount and
+ * desynchronise the bundle source-map offset bookkeeping).
+ *
+ * Exported for direct unit testing of the lineCount bookkeeping.
+ */
+function appendHoistedValues(values) {
+  if (values.length === 0) {
+    return {
+      text: '',
+      lineCount: 0
+    };
+  }
+  return {
+    text: '\n' + values.join('\n'),
+    lineCount: values.length
+  };
+}
 const GLOBALS_BY_CONTEXT = {
   browser: new Set([...BUILTINS, ...Object.keys(_globals().default.browser)]),
   'web-worker': new Set([...BUILTINS, ...Object.keys(_globals().default.worker)]),
@@ -147,9 +171,13 @@ class ScopeHoistingPackager {
       this.seenHoistedRequires.clear();
       let [content, map, lines] = this.visitAsset(asset);
       if (sourceMap && map) {
+        this.addAssetBoundaryMarker(sourceMap, asset, lineCount);
         sourceMap.addSourceMap(map, lineCount);
       } else if (this.bundle.env.sourceMap) {
         sourceMap = map;
+        if (sourceMap) {
+          this.addAssetBoundaryMarker(sourceMap, asset, lineCount);
+        }
       }
       res += content + '\n';
       lineCount += lines + 1;
@@ -257,6 +285,7 @@ class ScopeHoistingPackager {
       }
       res += (0, _utils2.replaceScriptDependencies)(this.bundleGraph, this.bundle, code, map, this.parcelRequireName);
       if (sourceMap && map) {
+        this.addAssetBoundaryMarker(sourceMap, mainEntry, lineCount);
         // @ts-expect-error TS2339 - addSourceMap method exists but missing from @parcel/source-map type definitions
         sourceMap.addSourceMap(map, lineCount);
       }
@@ -513,6 +542,36 @@ class ScopeHoistingPackager {
     } = (0, _nullthrows().default)(this.assetOutputs.get(asset));
     return this.buildAsset(asset, code, map);
   }
+
+  /**
+   * Insert a single "boundary marker" mapping at the start of the line where
+   * `asset`'s source map is about to be appended. Without this marker, source
+   * map consumers (and downstream optimizers such as swc that need to compose
+   * via nearest-neighbour lookups) will attribute the columns at the start of
+   * this asset's region to the *previous* asset's last mapping, because there
+   * is no mapping anchoring the start of the new asset. This is especially
+   * visible for assets with sparse maps (e.g. codegen'd `.graphql.ts` files
+   * from Relay) whose first mapping may be hundreds of columns into the line.
+   *
+   * The marker points at `(asset.filePath, 1, 0)`. Any mapping the asset's
+   * own map provides at the same generated position will override this one
+   * (last-write-wins inside `parcel_sourcemap`).
+   */
+  addAssetBoundaryMarker(sourceMap, asset, lineOffset) {
+    if (!sourceMap) return;
+    let source = this.getAssetFilePath(asset);
+    sourceMap.addIndexedMapping({
+      generated: {
+        line: lineOffset + 1,
+        column: 0
+      },
+      original: {
+        line: 1,
+        column: 0
+      },
+      source
+    });
+  }
   getAssetFilePath(asset) {
     return _path().default.relative(this.options.projectRoot, asset.filePath);
   }
@@ -520,6 +579,13 @@ class ScopeHoistingPackager {
     let shouldWrap = this.wrappedAssets.has(asset);
     let deps = this.bundleGraph.getDependencies(asset);
     let sourceMap = this.bundle.env.sourceMap && map ? new (_sourceMap2().default)(this.options.projectRoot, map) : null;
+    // Anchor the start of this asset's region with a boundary marker so the
+    // first columns of the asset don't fall back to a previous asset's
+    // mapping during downstream source-map composition. See the
+    // addAssetBoundaryMarker JSDoc for the full rationale.
+    if (sourceMap) {
+      this.addAssetBoundaryMarker(sourceMap, asset, 0);
+    }
 
     // If this asset is skipped, just add dependencies and not the asset's content.
     if (this.shouldSkipAsset(asset)) {
@@ -553,6 +619,7 @@ class ScopeHoistingPackager {
             let [code, map, lines] = this.visitAsset(resolved);
             depCode += code + '\n';
             if (sourceMap && map) {
+              this.addAssetBoundaryMarker(sourceMap, resolved, lineCount);
               sourceMap.addSourceMap(map, lineCount);
             }
             lineCount += lines + 1;
@@ -647,7 +714,8 @@ class ScopeHoistingPackager {
                   }
                 } else {
                   if (shouldWrap) {
-                    depContent.push(this.visitAsset(resolved));
+                    let visited = this.visitAsset(resolved);
+                    depContent.push([visited[0], visited[1], visited[2], resolved]);
                   } else {
                     let [depCode, depMap, depLines] = this.visitAsset(resolved);
                     res = depCode + '\n' + res;
@@ -671,6 +739,7 @@ class ScopeHoistingPackager {
                   sourceMap.offsetLines(lineCount + 1, lines);
                 }
                 if (map) {
+                  this.addAssetBoundaryMarker(sourceMap, resolved, lineCount);
                   sourceMap.addSourceMap(map, lineCount);
                 }
               }
@@ -712,10 +781,13 @@ ${code}
         code = `/* ${this.getAssetFilePath(asset)} */\n` + code;
         lineCount += 1;
       }
-      for (let [depCode, map, lines] of depContent) {
+      for (let [depCode, map, lines, depAsset] of depContent) {
         if (!depCode) continue;
         code += depCode + '\n';
         if (sourceMap && map) {
+          if (depAsset) {
+            this.addAssetBoundaryMarker(sourceMap, depAsset, lineCount);
+          }
           sourceMap.addSourceMap(map, lineCount);
         }
         lineCount += lines + 1;
@@ -1034,8 +1106,14 @@ ${code}
         for (let val of hoistedValues) {
           this.seenHoistedRequires.add(val);
         }
-        res += '\n' + hoistedValues.join('\n');
-        lineCount += hoisted.size;
+
+        // Only emit the leading `\n` and bump the line count when we
+        // actually have values to write. Otherwise `res += '\n' + ''` would
+        // emit a stray blank line and the line count would over-count by
+        // `hoisted.size` (which includes the now-filtered entries).
+        let appended = appendHoistedValues(hoistedValues);
+        res += appended.text;
+        lineCount += appended.lineCount;
       } else {
         res += '\n' + [...hoisted.values()].join('\n');
         lineCount += hoisted.size;
@@ -1192,7 +1270,7 @@ ${code}
             let set = !isEsmExport && asset.meta.hasCJSExports ? ', ' + this.buildFunctionExpression(['v'], `${resolved} = v`) : '';
             prepend += `$parcel$export($${assetId}$exports, ${JSON.stringify(exp)}, ${get}${set});\n`;
             this.usedHelpers.add('$parcel$export');
-            prependLineCount += 1 + usedExports.length;
+            prependLineCount += 1;
           }
         }
       }

package/lib/types/ScopeHoistingPackager.d.ts

@@ -1,5 +1,19 @@
 import type { Asset, BundleGraph, Dependency, PluginOptions, NamedBundle, PluginLogger } from '@atlaspack/types';
 import SourceMap from '@atlaspack/source-map';
+/**
+ * Joins filtered hoisted parcelRequire values into the bundle output,
+ * returning the text to append and the number of newlines it adds.
+ *
+ * Returns `{text: '', lineCount: 0}` when there are no values, to avoid
+ * emitting a stray leading `\n` (which would over-count lineCount and
+ * desynchronise the bundle source-map offset bookkeeping).
+ *
+ * Exported for direct unit testing of the lineCount bookkeeping.
+ */
+export declare function appendHoistedValues(values: ReadonlyArray<string>): {
+    text: string;
+    lineCount: number;
+};
 export interface OutputFormat {
     buildBundlePrelude(): [string, number];
     buildBundlePostlude(): [string, number];
@@ -56,6 +70,21 @@ export declare class ScopeHoistingPackager {
     getTopLevelName(name: string): string;
     getPropertyAccess(obj: string, property: string): string;
     visitAsset(asset: Asset): [string, SourceMap | null | undefined, number];
+    /**
+     * Insert a single "boundary marker" mapping at the start of the line where
+     * `asset`'s source map is about to be appended. Without this marker, source
+     * map consumers (and downstream optimizers such as swc that need to compose
+     * via nearest-neighbour lookups) will attribute the columns at the start of
+     * this asset's region to the *previous* asset's last mapping, because there
+     * is no mapping anchoring the start of the new asset. This is especially
+     * visible for assets with sparse maps (e.g. codegen'd `.graphql.ts` files
+     * from Relay) whose first mapping may be hundreds of columns into the line.
+     *
+     * The marker points at `(asset.filePath, 1, 0)`. Any mapping the asset's
+     * own map provides at the same generated position will override this one
+     * (last-write-wins inside `parcel_sourcemap`).
+     */
+    addAssetBoundaryMarker(sourceMap: SourceMap, asset: Asset, lineOffset: number): void;
     getAssetFilePath(asset: Asset): string;
     buildAsset(asset: Asset, code: string, map?: Buffer | null): [string, SourceMap | null | undefined, number];
     buildReplacements(asset: Asset, deps: Array<Dependency>): [Map<string, Array<Dependency>>, Map<string, string>];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-js",
-  "version": "2.25.9",
+  "version": "2.25.11-dev-fix-sourcemaps-50acc1acf.0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -16,20 +16,23 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.4",
-    "@atlaspack/feature-flags": "2.31.3",
-    "@atlaspack/logger": "2.14.55",
-    "@atlaspack/plugin": "2.14.63",
-    "@atlaspack/rust": "3.29.2",
-    "@atlaspack/source-map": "3.3.7",
-    "@atlaspack/types": "2.15.53",
-    "@atlaspack/utils": "3.4.5",
+    "@atlaspack/diagnostic": "2.14.5-dev-fix-sourcemaps-50acc1acf.0",
+    "@atlaspack/feature-flags": "2.31.4-dev-fix-sourcemaps-50acc1acf.0",
+    "@atlaspack/logger": "2.14.56-dev-fix-sourcemaps-50acc1acf.0",
+    "@atlaspack/plugin": "2.14.64-dev-fix-sourcemaps-50acc1acf.0",
+    "@atlaspack/rust": "3.29.3-dev-fix-sourcemaps-50acc1acf.0",
+    "@atlaspack/source-map": "3.3.8-dev-fix-sourcemaps-50acc1acf.0",
+    "@atlaspack/types": "2.15.54-dev-fix-sourcemaps-50acc1acf.0",
+    "@atlaspack/utils": "3.4.6-dev-fix-sourcemaps-50acc1acf.0",
     "globals": "^15.15.0",
     "nullthrows": "^1.1.1",
     "outdent": "^0.7.1"
   },
   "type": "commonjs",
   "scripts": {
+    "test": "mocha",
+    "test-ci": "mocha",
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
-  }
+  },
+  "gitHead": "50acc1acf31d5c8415a8154841a8ed09264e665a"
 }