@atlaspack/packager-js 2.14.5-canary.97 → 2.14.5-canary.99

package/lib/ScopeHoistingPackager.js

@@ -60,6 +60,13 @@ function _featureFlags() {
   };
   return data;
 }
+function _outdent() {
+  const data = require("outdent");
+  _outdent = function () {
+    return data;
+  };
+  return data;
+}
 var _ESMOutputFormat = require("./ESMOutputFormat");
 var _CJSOutputFormat = require("./CJSOutputFormat");
 var _GlobalOutputFormat = require("./GlobalOutputFormat");
@@ -431,6 +438,9 @@ class ScopeHoistingPackager {
     } = (0, _nullthrows().default)(this.assetOutputs.get(asset.id));
     return this.buildAsset(asset, code, map);
   }
+  getAssetFilePath(asset) {
+    return _path().default.relative(this.options.projectRoot, asset.filePath);
+  }
   buildAsset(asset, code, map) {
     let shouldWrap = this.wrappedAssets.has(asset.id);
     let deps = this.bundleGraph.getDependencies(asset);
@@ -528,8 +538,19 @@ class ScopeHoistingPackager {
                 if ((0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovement')) {
                   if (!resolved.meta.isConstantModule && !this.wrappedAssets.has(resolved.id)) {
                     let [depCode, depMap, depLines] = this.visitAsset(resolved);
-                    res = depCode + '\n' + res;
-                    lines += 1 + depLines;
+                    if (_utils().debugTools['asset-file-names-in-output']) {
+                      let resolvedPath = this.getAssetFilePath(resolved);
+                      res = (0, _outdent().outdent)`
+                          /* Scope hoisted asset: ${resolvedPath} */
+                          ${depCode}
+                          /* End: ${resolvedPath} */
+                          ${res}
+                        `;
+                      lines += 3 + depLines;
+                    } else {
+                      res = depCode + '\n' + res;
+                      lines += 1 + depLines;
+                    }
                     map = depMap;
                   }
                 } else {
@@ -587,6 +608,10 @@ ${code}
 });
 `;
       lineCount += 2;
+      if (_utils().debugTools['asset-file-names-in-output']) {
+        code = `/* ${this.getAssetFilePath(asset)} */\n` + code;
+        lineCount += 1;
+      }
       for (let [depCode, map, lines] of depContent) {
         if (!depCode) continue;
         code += depCode + '\n';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-js",
-  "version": "2.14.5-canary.97+c843081cc",
+  "version": "2.14.5-canary.99+30ee2cfcd",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -15,16 +15,17 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.165+c843081cc",
-    "@atlaspack/feature-flags": "2.14.1-canary.165+c843081cc",
-    "@atlaspack/plugin": "2.14.5-canary.97+c843081cc",
-    "@atlaspack/rust": "3.2.1-canary.97+c843081cc",
-    "@atlaspack/types": "2.14.5-canary.97+c843081cc",
-    "@atlaspack/utils": "2.14.5-canary.97+c843081cc",
+    "@atlaspack/diagnostic": "2.14.1-canary.167+30ee2cfcd",
+    "@atlaspack/feature-flags": "2.14.1-canary.167+30ee2cfcd",
+    "@atlaspack/plugin": "2.14.5-canary.99+30ee2cfcd",
+    "@atlaspack/rust": "3.2.1-canary.99+30ee2cfcd",
+    "@atlaspack/types": "2.14.5-canary.99+30ee2cfcd",
+    "@atlaspack/utils": "2.14.5-canary.99+30ee2cfcd",
     "@parcel/source-map": "^2.1.1",
     "globals": "^13.2.0",
-    "nullthrows": "^1.1.1"
+    "nullthrows": "^1.1.1",
+    "outdent": "^0.8.0"
   },
   "type": "commonjs",
-  "gitHead": "c843081cc495d8870e4b047fa827817eef71727c"
+  "gitHead": "30ee2cfcd34cf2646ded0eda13fdb80a2a5de529"
 }

package/src/ScopeHoistingPackager.js

@@ -15,6 +15,7 @@ import {
   relativeBundlePath,
   countLines,
   normalizeSeparators,
+  debugTools,
 } from '@atlaspack/utils';
 import SourceMap from '@parcel/source-map';
 import nullthrows from 'nullthrows';
@@ -25,6 +26,7 @@ import ThrowableDiagnostic, {
 import globals from 'globals';
 import path from 'path';
 import {getFeatureFlag} from '@atlaspack/feature-flags';
+import {outdent} from 'outdent';
 
 import {ESMOutputFormat} from './ESMOutputFormat';
 import {CJSOutputFormat} from './CJSOutputFormat';
@@ -579,6 +581,10 @@ export class ScopeHoistingPackager {
     return this.buildAsset(asset, code, map);
   }
 
+  getAssetFilePath(asset: Asset): string {
+    return path.relative(this.options.projectRoot, asset.filePath);
+  }
+
   buildAsset(
     asset: Asset,
     code: string,
@@ -720,8 +726,19 @@ export class ScopeHoistingPackager {
                     ) {
                       let [depCode, depMap, depLines] =
                         this.visitAsset(resolved);
-                      res = depCode + '\n' + res;
-                      lines += 1 + depLines;
+                      if (debugTools['asset-file-names-in-output']) {
+                        let resolvedPath = this.getAssetFilePath(resolved);
+                        res = outdent`
+                          /* Scope hoisted asset: ${resolvedPath} */
+                          ${depCode}
+                          /* End: ${resolvedPath} */
+                          ${res}
+                        `;
+                        lines += 3 + depLines;
+                      } else {
+                        res = depCode + '\n' + res;
+                        lines += 1 + depLines;
+                      }
                       map = depMap;
                     }
                   } else {
@@ -792,6 +809,11 @@ ${code}
 
       lineCount += 2;
 
+      if (debugTools['asset-file-names-in-output']) {
+        code = `/* ${this.getAssetFilePath(asset)} */\n` + code;
+        lineCount += 1;
+      }
+
       for (let [depCode, map, lines] of depContent) {
         if (!depCode) continue;
         code += depCode + '\n';