@atlaspack/packager-js 2.23.1 → 2.23.2

package/lib/ScopeHoistingPackager.js

@@ -97,13 +97,13 @@ const OUTPUT_FORMATS = {
   global: _GlobalOutputFormat.GlobalOutputFormat
 };
 class ScopeHoistingPackager {
-  // @ts-expect-error TS2564
-
+  assetOutputs = new Map();
   exportedSymbols = new Map();
   externals = new Map();
   topLevelNames = new Map();
   seenAssets = new Set();
   wrappedAssets = new Set();
+  constantAssets = new Set();
   hoistedRequires = new Map();
   seenHoistedRequires = new Set();
   needsPrelude = false;
@@ -124,10 +124,7 @@ class ScopeHoistingPackager {
   }
   async package() {
     var _sourceMap;
-    let {
-      wrapped: wrappedAssets,
-      constant: constantAssets
-    } = await this.loadAssets();
+    await this.loadAssets();
     this.buildExportedSymbols();
 
     // If building a library, the target is actually another bundler rather
@@ -144,14 +141,12 @@ class ScopeHoistingPackager {
     }
     let res = '';
     let lineCount = 0;
-    // @ts-expect-error TS7034
     let sourceMap = null;
     let processAsset = asset => {
       this.seenHoistedRequires.clear();
       let [content, map, lines] = this.visitAsset(asset);
-
-      // @ts-expect-error TS7005
       if (sourceMap && map) {
+        // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
         sourceMap.addSourceMap(map, lineCount);
       } else if (this.bundle.env.sourceMap) {
         sourceMap = map;
@@ -161,8 +156,8 @@ class ScopeHoistingPackager {
     };
     if ((0, _featureFlags().getFeatureFlag)('inlineConstOptimisationFix') || this.useBothScopeHoistingImprovements) {
       // Write out all constant modules used by this bundle
-      for (let asset of constantAssets) {
-        if (!this.seenAssets.has(asset.id)) {
+      for (let asset of this.constantAssets) {
+        if (!this.seenAssets.has(asset)) {
           processAsset(asset);
         }
       }
@@ -170,8 +165,8 @@ class ScopeHoistingPackager {
 
     // Hoist wrapped asset to the top of the bundle to ensure that they are registered
     // before they are used.
-    for (let asset of wrappedAssets) {
-      if (!this.seenAssets.has(asset.id)) {
+    for (let asset of this.wrappedAssets) {
+      if (!this.seenAssets.has(asset)) {
         processAsset(asset);
       }
     }
@@ -179,7 +174,7 @@ class ScopeHoistingPackager {
     // Add each asset that is directly connected to the bundle. Dependencies will be handled
     // by replacing `import` statements in the code.
     this.bundle.traverseAssets((asset, _, actions) => {
-      if (this.seenAssets.has(asset.id)) {
+      if (this.seenAssets.has(asset)) {
         actions.skipChildren();
         return;
       }
@@ -189,7 +184,7 @@ class ScopeHoistingPackager {
     let [prelude, preludeLines] = this.buildBundlePrelude();
     res = prelude + res;
     lineCount += preludeLines;
-    // @ts-expect-error TS2339
+    // @ts-expect-error TS2339 - offsetLines method exists but missing from @parcel/source-map type definitions
     (_sourceMap = sourceMap) === null || _sourceMap === void 0 || _sourceMap.offsetLines(1, preludeLines);
     let entries = this.bundle.getEntryAssets();
     let mainEntry = this.bundle.getMainEntry();
@@ -217,7 +212,7 @@ class ScopeHoistingPackager {
 
     // If any of the entry assets are wrapped, call parcelRequire so they are executed.
     for (let entry of entries) {
-      if (this.wrappedAssets.has(entry.id) && !this.isScriptEntry(entry)) {
+      if (this.wrappedAssets.has(entry) && !this.isScriptEntry(entry)) {
         var _entry$symbols$get;
         let parcelRequire = `parcelRequire(${JSON.stringify(this.bundleGraph.getAssetPublicId(entry))});\n`;
         let entryExports = (_entry$symbols$get = entry.symbols.get('*')) === null || _entry$symbols$get === void 0 ? void 0 : _entry$symbols$get.local;
@@ -247,14 +242,14 @@ class ScopeHoistingPackager {
       let {
         code,
         map: mapBuffer
-      } = (0, _nullthrows().default)(this.assetOutputs.get(mainEntry.id));
+      } = (0, _nullthrows().default)(this.assetOutputs.get(mainEntry));
       let map;
       if (mapBuffer) {
         map = new (_sourceMap2().default)(this.options.projectRoot, mapBuffer);
       }
       res += (0, _utils2.replaceScriptDependencies)(this.bundleGraph, this.bundle, code, map, this.parcelRequireName);
       if (sourceMap && map) {
-        // @ts-expect-error TS2339
+        // @ts-expect-error TS2339 - addSourceMap method exists but missing from @parcel/source-map type definitions
         sourceMap.addSourceMap(map, lineCount);
       }
     }
@@ -301,12 +296,10 @@ class ScopeHoistingPackager {
     let queue = new (_utils().PromiseQueue)({
       maxConcurrent: 32
     });
-    let wrapped = [];
-    let constant = [];
     this.bundle.traverseAssets(asset => {
       queue.add(async () => {
         let [code, map] = await Promise.all([asset.getCode(), this.bundle.env.sourceMap ? asset.getMapBuffer() : null]);
-        return [asset.id, {
+        return [asset, {
           code,
           map
         }];
@@ -314,10 +307,9 @@ class ScopeHoistingPackager {
       if (asset.meta.shouldWrap || this.bundle.env.sourceType === 'script' || this.bundleGraph.isAssetReferenced(this.bundle, asset) || this.bundleGraph.getIncomingDependencies(asset).some(dep => dep.meta.shouldWrap && dep.specifierType !== 'url')) {
         // Don't wrap constant "entry" modules _except_ if they are referenced by any lazy dependency
         if (!asset.meta.isConstantModule || this.bundleGraph.getIncomingDependencies(asset).some(dep => dep.priority === 'lazy')) {
-          this.wrappedAssets.add(asset.id);
-          wrapped.push(asset);
+          this.wrappedAssets.add(asset);
         } else if (((0, _featureFlags().getFeatureFlag)('inlineConstOptimisationFix') || this.useBothScopeHoistingImprovements) && asset.meta.isConstantModule) {
-          constant.push(asset);
+          this.constantAssets.add(asset);
         }
       }
     });
@@ -330,18 +322,20 @@ class ScopeHoistingPackager {
       if (!(0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovementV2')) {
         // Make all entry assets wrapped, to avoid any top level hoisting
         for (let entryAsset of this.bundle.getEntryAssets()) {
-          if (!this.wrappedAssets.has(entryAsset.id)) {
-            this.wrappedAssets.add(entryAsset.id);
-            wrapped.push(entryAsset);
+          if (!this.wrappedAssets.has(entryAsset)) {
+            this.wrappedAssets.add(entryAsset);
           }
         }
       }
-      let moduleGroupParents = [...wrapped];
+
+      // We need to make a new copy here so that we can add to the list and
+      // iterate the newly added items, without mutating the wrappedAssets set
+      let moduleGroupParents = [...this.wrappedAssets.values()];
       if ((0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovementV2')) {
         // The main entry needs to be check to find assets that would have gone in
         // the top level scope
         let mainEntry = this.bundle.getMainEntry();
-        if (mainEntry && !this.wrappedAssets.has(mainEntry.id)) {
+        if (mainEntry && !this.wrappedAssets.has(mainEntry)) {
           moduleGroupParents.unshift(mainEntry);
         }
       }
@@ -350,13 +344,12 @@ class ScopeHoistingPackager {
           if (asset === moduleGroupParentAsset) {
             return;
           }
-          if (this.wrappedAssets.has(asset.id)) {
+          if (this.wrappedAssets.has(asset)) {
             actions.skipChildren();
             return;
           }
           if (!asset.meta.isConstantModule && (assignedAssets.has(asset) || this.isReExported(asset))) {
-            wrapped.push(asset);
-            this.wrappedAssets.add(asset.id);
+            this.wrappedAssets.add(asset);
 
             // This also needs to be added to the traversal so that we iterate
             // it during this check.
@@ -368,29 +361,22 @@ class ScopeHoistingPackager {
         }, moduleGroupParentAsset);
       }
     } else {
-      for (let wrappedAssetRoot of [...wrapped]) {
+      for (let wrappedAssetRoot of this.wrappedAssets) {
         this.bundle.traverseAssets((asset, _, actions) => {
           if (asset === wrappedAssetRoot) {
             return;
           }
-          if (this.wrappedAssets.has(asset.id)) {
+          if (this.wrappedAssets.has(asset)) {
             actions.skipChildren();
             return;
           }
           if (!asset.meta.isConstantModule) {
-            this.wrappedAssets.add(asset.id);
-            wrapped.push(asset);
+            this.wrappedAssets.add(asset);
           }
         }, wrappedAssetRoot);
       }
     }
-
-    // @ts-expect-error TS2769
     this.assetOutputs = new Map(await queue.run());
-    return {
-      wrapped,
-      constant
-    };
   }
   isReExported(asset) {
     let parentSymbols = this.bundleGraph.getIncomingDependencies(asset).map(dep => this.bundleGraph.getAssetWithDependency(dep)).flatMap(parent => {
@@ -409,7 +395,7 @@ class ScopeHoistingPackager {
 
     // TODO: handle ESM exports of wrapped entry assets...
     let entry = this.bundle.getMainEntry();
-    if (entry && !this.wrappedAssets.has(entry.id)) {
+    if (entry && !this.wrappedAssets.has(entry)) {
       let hasNamespace = entry.symbols.hasExportSymbol('*');
       for (let {
         asset,
@@ -478,19 +464,19 @@ class ScopeHoistingPackager {
     return `${obj}[${JSON.stringify(property)}]`;
   }
   visitAsset(asset) {
-    (0, _assert().default)(!this.seenAssets.has(asset.id), 'Already visited asset');
-    this.seenAssets.add(asset.id);
+    (0, _assert().default)(!this.seenAssets.has(asset), 'Already visited asset');
+    this.seenAssets.add(asset);
     let {
       code,
       map
-    } = (0, _nullthrows().default)(this.assetOutputs.get(asset.id));
+    } = (0, _nullthrows().default)(this.assetOutputs.get(asset));
     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 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;
 
@@ -510,14 +496,21 @@ class ScopeHoistingPackager {
           }
           continue;
         }
-        if (this.bundle.hasAsset(resolved) && !this.seenAssets.has(resolved.id)) {
-          let [code, map, lines] = this.visitAsset(resolved);
-          depCode += code + '\n';
-          if (sourceMap && map) {
-            // @ts-expect-error TS2551
-            sourceMap.addSourceMap(map, lineCount);
+        if (this.bundle.hasAsset(resolved) && !this.seenAssets.has(resolved)) {
+          if (this.useBothScopeHoistingImprovements && this.wrappedAssets.has(resolved)) {
+            // When the dep is wrapped then we just need to drop a side effect
+            // require instead of inlining
+            depCode += `parcelRequire("${this.bundleGraph.getAssetPublicId(resolved)}");\n`;
+            lineCount += 1;
+          } else {
+            let [code, map, lines] = this.visitAsset(resolved);
+            depCode += code + '\n';
+            if (sourceMap && map) {
+              // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
+              sourceMap.addSourceMap(map, lineCount);
+            }
+            lineCount += lines + 1;
           }
-          lineCount += lines + 1;
         }
       }
       return [depCode, sourceMap, lineCount];
@@ -540,7 +533,6 @@ class ScopeHoistingPackager {
     }
     code += append;
     let lineCount = 0;
-    // @ts-expect-error TS2552
     let depContent = [];
     if (depMap.size === 0 && replacements.size === 0) {
       // If there are no dependencies or replacements, use a simple function to count the number of lines.
@@ -584,13 +576,13 @@ class ScopeHoistingPackager {
               if (!(0, _featureFlags().getFeatureFlag)('applyScopeHoistingImprovementV2')) {
                 [res, lines] = this.getHoistedParcelRequires(asset, dep, resolved);
               }
-              if (this.bundle.hasAsset(resolved) && !this.seenAssets.has(resolved.id)) {
+              if (this.bundle.hasAsset(resolved) && !this.seenAssets.has(resolved)) {
                 // If this asset is wrapped, we need to hoist the code for the dependency
                 // outside our parcelRequire.register wrapper. This is safe because all
                 // assets referenced by this asset will also be wrapped. Otherwise, inline the
                 // asset content where the import statement was.
                 if (this.useBothScopeHoistingImprovements) {
-                  if (!resolved.meta.isConstantModule && !this.wrappedAssets.has(resolved.id)) {
+                  if (!resolved.meta.isConstantModule && !this.wrappedAssets.has(resolved)) {
                     let [depCode, depMap, depLines] = this.visitAsset(resolved);
                     if (_utils().debugTools['asset-file-names-in-output']) {
                       let resolvedPath = this.getAssetFilePath(resolved);
@@ -633,7 +625,7 @@ class ScopeHoistingPackager {
                   sourceMap.offsetLines(lineCount + 1, lines);
                 }
                 if (map) {
-                  // @ts-expect-error TS2551
+                  // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
                   sourceMap.addSourceMap(map, lineCount);
                 }
               }
@@ -678,7 +670,7 @@ ${code}
         if (!depCode) continue;
         code += depCode + '\n';
         if (sourceMap && map) {
-          // @ts-expect-error TS2551
+          // @ts-expect-error TS2551 - addSourceMap method exists but missing from @parcel/source-map type definitions
           sourceMap.addSourceMap(map, lineCount);
         }
         lineCount += lines + 1;
@@ -747,7 +739,7 @@ ${code}
 
     // If this asset is wrapped, we need to replace the exports namespace with `module.exports`,
     // which will be provided to us by the wrapper.
-    if (this.wrappedAssets.has(asset.id) || this.bundle.env.outputFormat === 'commonjs' && asset === this.bundle.getMainEntry()) {
+    if (this.wrappedAssets.has(asset) || this.bundle.env.outputFormat === 'commonjs' && asset === this.bundle.getMainEntry()) {
       var _asset$symbols$get;
       let exportsName = ((_asset$symbols$get = asset.symbols.get('*')) === null || _asset$symbols$get === void 0 ? void 0 : _asset$symbols$get.local) || `$${assetId}$exports`;
       replacements.set(exportsName, 'module.exports');
@@ -845,9 +837,7 @@ ${code}
                 continue;
               }
             }
-
-            // @ts-expect-error TS2322
-            renamed = this.bundleGraph.getSymbolResolution(entry, imported, this.bundle).symbol;
+            renamed = this.bundleGraph.getSymbolResolution(entry, imported, this.bundle).symbol || undefined;
           }
         }
 
@@ -888,7 +878,7 @@ ${code}
       }
       return false;
     }
-    return !this.bundle.hasAsset(resolved) && !this.externalAssets.has(resolved) || this.wrappedAssets.has(resolved.id) && resolved !== parentAsset;
+    return !this.bundle.hasAsset(resolved) && !this.externalAssets.has(resolved) || this.wrappedAssets.has(resolved) && resolved !== parentAsset;
   }
   getSymbolResolution(parentAsset, resolved, imported, dep, replacements) {
     let {
@@ -915,12 +905,12 @@ ${code}
     // Only do this if the asset is part of a different bundle (so it was definitely
     // parcelRequire.register'ed there), or if it is indeed registered in this bundle.
     !this.bundle.hasAsset(resolvedAsset) || !this.shouldSkipAsset(resolvedAsset))) {
-      let hoisted = this.hoistedRequires.get(dep.id);
+      let hoisted = this.hoistedRequires.get(dep);
       if (!hoisted) {
         hoisted = new Map();
-        this.hoistedRequires.set(dep.id, hoisted);
+        this.hoistedRequires.set(dep, hoisted);
       }
-      hoisted.set(resolvedAsset.id, `var $${publicId} = parcelRequire(${JSON.stringify(publicId)});`);
+      hoisted.set(resolvedAsset, `var $${publicId} = parcelRequire(${JSON.stringify(publicId)});`);
     }
     if (isWrapped) {
       this.needsPrelude = true;
@@ -949,7 +939,7 @@ ${code}
     }
     if (imported === '*' || exportSymbol === '*' || isDefaultInterop) {
       // Resolve to the namespace object if requested or this is a CJS default interop reqiure.
-      if (parentAsset === resolvedAsset && this.wrappedAssets.has(resolvedAsset.id)) {
+      if (parentAsset === resolvedAsset && this.wrappedAssets.has(resolvedAsset)) {
         // Directly use module.exports for wrapped assets importing themselves.
         return 'module.exports';
       } else {
@@ -977,7 +967,7 @@ ${code}
     if (resolved.type !== 'js') {
       return ['', 0];
     }
-    let hoisted = this.hoistedRequires.get(dep.id);
+    let hoisted = this.hoistedRequires.get(dep);
     let res = '';
     let lineCount = 0;
     let isWrapped = this.isWrapped(resolved, parentAsset);
@@ -986,7 +976,7 @@ ${code}
     // we need to run side effects when this asset runs. If the resolved asset is not
     // the first one in the hoisted requires, we need to insert a parcelRequire here
     // so it runs first.
-    if (isWrapped && !dep.meta.shouldWrap && (!hoisted || hoisted.keys().next().value !== resolved.id) && !this.bundleGraph.isDependencySkipped(dep) && !this.shouldSkipAsset(resolved)) {
+    if (isWrapped && !dep.meta.shouldWrap && (!hoisted || hoisted.keys().next().value !== resolved) && !this.bundleGraph.isDependencySkipped(dep) && !this.shouldSkipAsset(resolved)) {
       this.needsPrelude = true;
       res += `parcelRequire(${JSON.stringify(this.bundleGraph.getAssetPublicId(resolved))});`;
     }
@@ -1010,7 +1000,7 @@ ${code}
     let prepend = '';
     let prependLineCount = 0;
     let append = '';
-    let shouldWrap = this.wrappedAssets.has(asset.id);
+    let shouldWrap = this.wrappedAssets.has(asset);
     let usedSymbols = (0, _nullthrows().default)(this.bundleGraph.getUsedSymbols(asset));
     let assetId = asset.meta.id;
     (0, _assert().default)(typeof assetId === 'string');
@@ -1188,10 +1178,8 @@ ${code}
       this.usedHelpers.add('$parcel$global');
     }
     for (let helper of this.usedHelpers) {
-      // @ts-expect-error TS7053
       let currentHelper = _helpers.helpers[helper];
       if (typeof currentHelper === 'function') {
-        // @ts-expect-error TS7053
         currentHelper = _helpers.helpers[helper](this.bundle.env);
       }
       res += currentHelper;

package/lib/types/ScopeHoistingPackager.d.ts

@@ -13,7 +13,7 @@ export declare class ScopeHoistingPackager {
     outputFormat: OutputFormat;
     isAsyncBundle: boolean;
     globalNames: ReadonlySet<string>;
-    assetOutputs: Map<string, {
+    assetOutputs: Map<Asset, {
         code: string;
         map: Buffer | null | undefined;
     }>;
@@ -25,9 +25,10 @@ export declare class ScopeHoistingPackager {
     }>;
     externals: Map<string, Map<string, string>>;
     topLevelNames: Map<string, number>;
-    seenAssets: Set<string>;
-    wrappedAssets: Set<string>;
-    hoistedRequires: Map<string, Map<string, string>>;
+    seenAssets: Set<Asset>;
+    wrappedAssets: Set<Asset>;
+    constantAssets: Set<Asset>;
+    hoistedRequires: Map<Dependency, Map<Asset, string>>;
     seenHoistedRequires: Set<string>;
     needsPrelude: boolean;
     usedHelpers: Set<string>;
@@ -41,10 +42,7 @@ export declare class ScopeHoistingPackager {
     }>;
     shouldBundleQueue(bundle: NamedBundle): boolean;
     runWhenReady(bundle: NamedBundle, codeToRun: string): string;
-    loadAssets(): Promise<{
-        wrapped: Array<Asset>;
-        constant: Array<Asset>;
-    }>;
+    loadAssets(): Promise<void>;
     isReExported(asset: Asset): boolean;
     buildExportedSymbols(): void;
     getTopLevelName(name: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-js",
-  "version": "2.23.1",
+  "version": "2.23.2",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -17,19 +17,18 @@
   },
   "dependencies": {
     "@atlaspack/diagnostic": "2.14.4",
-    "@atlaspack/feature-flags": "2.25.1",
-    "@atlaspack/plugin": "2.14.31",
-    "@atlaspack/rust": "3.8.1",
+    "@atlaspack/feature-flags": "2.25.2",
+    "@atlaspack/plugin": "2.14.32",
+    "@atlaspack/rust": "3.8.2",
     "@parcel/source-map": "^2.1.1",
-    "@atlaspack/types": "2.15.21",
-    "@atlaspack/utils": "2.19.3",
+    "@atlaspack/types": "2.15.22",
+    "@atlaspack/utils": "3.0.0",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1",
     "outdent": "^0.8.0"
   },
   "type": "commonjs",
   "scripts": {
-    "check-ts": "tsc --emitDeclarationOnly --rootDir src",
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   }
 }

package/src/ESMOutputFormat.ts

@@ -83,7 +83,7 @@ export class ESMOutputFormat implements OutputFormat {
       local,
       exportAs,
     } of this.packager.exportedSymbols.values()) {
-      if (this.packager.wrappedAssets.has(asset.id)) {
+      if (this.packager.wrappedAssets.has(asset)) {
         let obj = `parcelRequire("${this.packager.bundleGraph.getAssetPublicId(
           asset,
         )}")`;