@atlaspack/packager-js 2.14.5-canary.201 → 2.14.5-canary.203

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/packager-js",
-  "version": "2.14.5-canary.201+da73a0aa7",
+  "version": "2.14.5-canary.203+0e967b0cf",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -16,12 +16,12 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.269+da73a0aa7",
-    "@atlaspack/feature-flags": "2.14.1-canary.269+da73a0aa7",
-    "@atlaspack/plugin": "2.14.5-canary.201+da73a0aa7",
-    "@atlaspack/rust": "3.2.1-canary.201+da73a0aa7",
-    "@atlaspack/types": "2.14.5-canary.201+da73a0aa7",
-    "@atlaspack/utils": "2.14.5-canary.201+da73a0aa7",
+    "@atlaspack/diagnostic": "2.14.1-canary.271+0e967b0cf",
+    "@atlaspack/feature-flags": "2.14.1-canary.271+0e967b0cf",
+    "@atlaspack/plugin": "2.14.5-canary.203+0e967b0cf",
+    "@atlaspack/rust": "3.2.1-canary.203+0e967b0cf",
+    "@atlaspack/types": "2.14.5-canary.203+0e967b0cf",
+    "@atlaspack/utils": "2.14.5-canary.203+0e967b0cf",
     "@parcel/source-map": "^2.1.1",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1",
@@ -31,5 +31,5 @@
   "scripts": {
     "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
   },
-  "gitHead": "da73a0aa77fb942fd6b9b2f9c8765531db04fdd8"
+  "gitHead": "0e967b0cf0fbd885588b81476ec1f25a507ffa94"
 }

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,
         )}")`;

package/src/ScopeHoistingPackager.ts

@@ -92,7 +92,7 @@ export class ScopeHoistingPackager {
   globalNames: ReadonlySet<string>;
   // @ts-expect-error TS2564
   assetOutputs: Map<
-    string,
+    Asset,
     {
       code: string;
       map: Buffer | null | undefined;
@@ -109,9 +109,10 @@ export class ScopeHoistingPackager {
   > = new Map();
   externals: Map<string, Map<string, string>> = new Map();
   topLevelNames: Map<string, number> = new Map();
-  seenAssets: Set<string> = new Set();
-  wrappedAssets: Set<string> = new Set();
-  hoistedRequires: Map<string, Map<string, string>> = new Map();
+  seenAssets: Set<Asset> = new Set();
+  wrappedAssets: Set<Asset> = new Set();
+  constantAssets: Set<Asset> = new Set();
+  hoistedRequires: Map<Dependency, Map<Asset, string>> = new Map();
   seenHoistedRequires: Set<string> = new Set();
   needsPrelude: boolean = false;
   usedHelpers: Set<string> = new Set();
@@ -152,8 +153,7 @@ export class ScopeHoistingPackager {
     contents: string;
     map: SourceMap | null | undefined;
   }> {
-    let {wrapped: wrappedAssets, constant: constantAssets} =
-      await this.loadAssets();
+    await this.loadAssets();
     this.buildExportedSymbols();
 
     // If building a library, the target is actually another bundler rather
@@ -196,8 +196,8 @@ export class ScopeHoistingPackager {
       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);
         }
       }
@@ -205,8 +205,8 @@ export 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);
       }
     }
@@ -214,7 +214,7 @@ export 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;
       }
@@ -255,7 +255,7 @@ export 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)) {
         let parcelRequire = `parcelRequire(${JSON.stringify(
           this.bundleGraph.getAssetPublicId(entry),
         )});\n`;
@@ -299,9 +299,7 @@ export class ScopeHoistingPackager {
       lineCount++;
 
       let mainEntry = nullthrows(this.bundle.getMainEntry());
-      let {code, map: mapBuffer} = nullthrows(
-        this.assetOutputs.get(mainEntry.id),
-      );
+      let {code, map: mapBuffer} = nullthrows(this.assetOutputs.get(mainEntry));
       let map;
       if (mapBuffer) {
         map = new SourceMap(this.options.projectRoot, mapBuffer);
@@ -399,13 +397,11 @@ export class ScopeHoistingPackager {
     return `$parcel$global.rwr(${params.join(', ')});`;
   }
 
-  async loadAssets(): Promise<{
-    wrapped: Array<Asset>;
-    constant: Array<Asset>;
-  }> {
-    let queue = new PromiseQueue({maxConcurrent: 32});
-    let wrapped: Array<Asset> = [];
-    let constant: Array<Asset> = [];
+  async loadAssets() {
+    type QueueItem = [Asset, {code: string; map: Buffer | undefined | null}];
+    let queue = new PromiseQueue<QueueItem>({
+      maxConcurrent: 32,
+    });
 
     this.bundle.traverseAssets((asset) => {
       queue.add(async () => {
@@ -414,7 +410,7 @@ export class ScopeHoistingPackager {
           this.bundle.env.sourceMap ? asset.getMapBuffer() : null,
         ]);
 
-        return [asset.id, {code, map}];
+        return [asset, {code, map}];
       });
 
       if (
@@ -432,14 +428,13 @@ export class ScopeHoistingPackager {
             .getIncomingDependencies(asset)
             .some((dep) => dep.priority === 'lazy')
         ) {
-          this.wrappedAssets.add(asset.id);
-          wrapped.push(asset);
+          this.wrappedAssets.add(asset);
         } else if (
           (getFeatureFlag('inlineConstOptimisationFix') ||
             this.useBothScopeHoistingImprovements) &&
           asset.meta.isConstantModule
         ) {
-          constant.push(asset);
+          this.constantAssets.add(asset);
         }
       }
     });
@@ -453,20 +448,21 @@ export class ScopeHoistingPackager {
       if (!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 (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);
         }
       }
@@ -477,7 +473,7 @@ export class ScopeHoistingPackager {
             return;
           }
 
-          if (this.wrappedAssets.has(asset.id)) {
+          if (this.wrappedAssets.has(asset)) {
             actions.skipChildren();
             return;
           }
@@ -486,8 +482,7 @@ export class ScopeHoistingPackager {
             !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.
@@ -501,28 +496,25 @@ export 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: Asset): boolean {
@@ -555,7 +547,7 @@ export 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 {
@@ -637,10 +629,10 @@ export class ScopeHoistingPackager {
   }
 
   visitAsset(asset: Asset): [string, SourceMap | null | undefined, number] {
-    invariant(!this.seenAssets.has(asset.id), 'Already visited asset');
-    this.seenAssets.add(asset.id);
+    invariant(!this.seenAssets.has(asset), 'Already visited asset');
+    this.seenAssets.add(asset);
 
-    let {code, map} = nullthrows(this.assetOutputs.get(asset.id));
+    let {code, map} = nullthrows(this.assetOutputs.get(asset));
     return this.buildAsset(asset, code, map);
   }
 
@@ -653,7 +645,7 @@ export class ScopeHoistingPackager {
     code: string,
     map?: Buffer | null,
   ): [string, SourceMap | null | undefined, number] {
-    let shouldWrap = this.wrappedAssets.has(asset.id);
+    let shouldWrap = this.wrappedAssets.has(asset);
     let deps = this.bundleGraph.getDependencies(asset);
 
     let sourceMap =
@@ -680,10 +672,7 @@ export class ScopeHoistingPackager {
           continue;
         }
 
-        if (
-          this.bundle.hasAsset(resolved) &&
-          !this.seenAssets.has(resolved.id)
-        ) {
+        if (this.bundle.hasAsset(resolved) && !this.seenAssets.has(resolved)) {
           let [code, map, lines] = this.visitAsset(resolved);
           depCode += code + '\n';
           if (sourceMap && map) {
@@ -785,7 +774,7 @@ export class ScopeHoistingPackager {
 
                 if (
                   this.bundle.hasAsset(resolved) &&
-                  !this.seenAssets.has(resolved.id)
+                  !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
@@ -794,7 +783,7 @@ export class ScopeHoistingPackager {
                   if (this.useBothScopeHoistingImprovements) {
                     if (
                       !resolved.meta.isConstantModule &&
-                      !this.wrappedAssets.has(resolved.id)
+                      !this.wrappedAssets.has(resolved)
                     ) {
                       let [depCode, depMap, depLines] =
                         this.visitAsset(resolved);
@@ -1020,7 +1009,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.wrappedAssets.has(asset) ||
       (this.bundle.env.outputFormat === 'commonjs' &&
         asset === this.bundle.getMainEntry())
     ) {
@@ -1210,7 +1199,7 @@ ${code}
     }
     return (
       (!this.bundle.hasAsset(resolved) && !this.externalAssets.has(resolved)) ||
-      (this.wrappedAssets.has(resolved.id) && resolved !== parentAsset)
+      (this.wrappedAssets.has(resolved) && resolved !== parentAsset)
     );
   }
 
@@ -1260,14 +1249,14 @@ ${code}
       (!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,
+        resolvedAsset,
         `var $${publicId} = parcelRequire(${JSON.stringify(publicId)});`,
       );
     }
@@ -1309,7 +1298,7 @@ ${code}
       // Resolve to the namespace object if requested or this is a CJS default interop reqiure.
       if (
         parentAsset === resolvedAsset &&
-        this.wrappedAssets.has(resolvedAsset.id)
+        this.wrappedAssets.has(resolvedAsset)
       ) {
         // Directly use module.exports for wrapped assets importing themselves.
         return 'module.exports';
@@ -1352,7 +1341,7 @@ ${code}
       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);
@@ -1364,7 +1353,7 @@ ${code}
     if (
       isWrapped &&
       !dep.meta.shouldWrap &&
-      (!hoisted || hoisted.keys().next().value !== resolved.id) &&
+      (!hoisted || hoisted.keys().next().value !== resolved) &&
       !this.bundleGraph.isDependencySkipped(dep) &&
       !this.shouldSkipAsset(resolved)
     ) {
@@ -1406,7 +1395,7 @@ ${code}
     let prependLineCount = 0;
     let append = '';
 
-    let shouldWrap = this.wrappedAssets.has(asset.id);
+    let shouldWrap = this.wrappedAssets.has(asset);
     let usedSymbols = nullthrows(this.bundleGraph.getUsedSymbols(asset));
     let assetId = asset.meta.id;
     invariant(typeof assetId === 'string');