@atlaspack/packager-js 2.23.2-dev-ts-project-refs-d30e9754f.0 → 2.23.3

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atlaspack/packager-js
 
+## 2.23.3
+
+### Patch Changes
+
+- Updated dependencies [[`236e546`](https://github.com/atlassian-labs/atlaspack/commit/236e5465863dca6044a7191e05260a5b924c342e), [`f07351a`](https://github.com/atlassian-labs/atlaspack/commit/f07351a2398b6a8e5155a2daad77e69b7dcb2b4b)]:
+  - @atlaspack/utils@3.0.1
+  - @atlaspack/feature-flags@2.25.3
+  - @atlaspack/types@2.15.23
+  - @atlaspack/plugin@2.14.33
+
+## 2.23.2
+
+### Patch Changes
+
+- [#796](https://github.com/atlassian-labs/atlaspack/pull/796) [`0e967b0`](https://github.com/atlassian-labs/atlaspack/commit/0e967b0cf0fbd885588b81476ec1f25a507ffa94) Thanks [@benjervis](https://github.com/benjervis)! - Minor refactor of the internals of the scope hoisting packager. Some of the internal objects are now keyed on Assets rather than string asset IDs.
+
+- [#801](https://github.com/atlassian-labs/atlaspack/pull/801) [`b104fd8`](https://github.com/atlassian-labs/atlaspack/commit/b104fd846ea17c583e68ddc6b309c5e1edee6938) Thanks [@mattcompiles](https://github.com/mattcompiles)! - Fix incorrect output with skipped assets with scope hoisting improvements
+
+- Updated dependencies [[`0207171`](https://github.com/atlassian-labs/atlaspack/commit/0207171e59e985c51e105aec2e0a99de174374bd), [`10ee3fa`](https://github.com/atlassian-labs/atlaspack/commit/10ee3fa5b75a92acde8973673d9b3c5b6f3958e5), [`bbe4e28`](https://github.com/atlassian-labs/atlaspack/commit/bbe4e28c89e5e9284bd730075d4d6f2a3cb37b21), [`1180103`](https://github.com/atlassian-labs/atlaspack/commit/118010351ed444f8178988afb3f77807154dd933), [`2bc93b1`](https://github.com/atlassian-labs/atlaspack/commit/2bc93b17cea07fd7cbb68acec84d8471345a22b4)]:
+  - @atlaspack/feature-flags@2.25.2
+  - @atlaspack/rust@3.8.2
+  - @atlaspack/utils@3.0.0
+  - @atlaspack/plugin@2.14.32
+  - @atlaspack/types@2.15.22
+
 ## 2.23.1
 
 ### Patch Changes

package/dist/ESMOutputFormat.js

@@ -70,7 +70,7 @@ class ESMOutputFormat {
         let lines = 0;
         let exportSpecifiers = [];
         for (let { asset, exportSymbol, 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)}")`;
                 res += `\nvar ${local} = ${this.packager.getPropertyAccess(obj, exportSymbol)};`;
                 lines++;

package/dist/ScopeHoistingPackager.js

@@ -81,11 +81,13 @@ const OUTPUT_FORMATS = {
 };
 class ScopeHoistingPackager {
     constructor(options, bundleGraph, bundle, parcelRequireName, useAsyncBundleRuntime, logger) {
+        this.assetOutputs = new Map();
         this.exportedSymbols = new Map();
         this.externals = new Map();
         this.topLevelNames = new Map();
         this.seenAssets = new Set();
         this.wrappedAssets = new Set();
+        this.constantAssets = new Set();
         this.hoistedRequires = new Map();
         this.seenHoistedRequires = new Set();
         this.needsPrelude = false;
@@ -109,7 +111,7 @@ class ScopeHoistingPackager {
         this.globalNames = GLOBALS_BY_CONTEXT[bundle.env.context];
     }
     async package() {
-        let { wrapped: wrappedAssets, constant: constantAssets } = await this.loadAssets();
+        await this.loadAssets();
         this.buildExportedSymbols();
         // If building a library, the target is actually another bundler rather
         // than the final output that could be loaded in a browser. So, loader
@@ -126,13 +128,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) {
@@ -144,23 +145,23 @@ class ScopeHoistingPackager {
         if ((0, feature_flags_1.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);
                 }
             }
         }
         // 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);
             }
         }
         // 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;
             }
@@ -170,7 +171,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?.offsetLines(1, preludeLines);
         let entries = this.bundle.getEntryAssets();
         let mainEntry = this.bundle.getMainEntry();
@@ -193,7 +194,7 @@ class ScopeHoistingPackager {
         let needsBundleQueue = this.shouldBundleQueue(this.bundle);
         // 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`;
                 let entryExports = entry.symbols.get('*')?.local;
                 if (entryExports &&
@@ -222,14 +223,14 @@ class ScopeHoistingPackager {
             res += '\n';
             lineCount++;
             let mainEntry = (0, nullthrows_1.default)(this.bundle.getMainEntry());
-            let { code, map: mapBuffer } = (0, nullthrows_1.default)(this.assetOutputs.get(mainEntry.id));
+            let { code, map: mapBuffer } = (0, nullthrows_1.default)(this.assetOutputs.get(mainEntry));
             let map;
             if (mapBuffer) {
                 map = new source_map_1.default(this.options.projectRoot, mapBuffer);
             }
             res += (0, utils_2.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);
             }
         }
@@ -295,16 +296,16 @@ class ScopeHoistingPackager {
         return `$parcel$global.rwr(${params.join(', ')});`;
     }
     async loadAssets() {
-        let queue = new utils_1.PromiseQueue({ maxConcurrent: 32 });
-        let wrapped = [];
-        let constant = [];
+        let queue = new utils_1.PromiseQueue({
+            maxConcurrent: 32,
+        });
         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, { code, map }];
+                return [asset, { code, map }];
             });
             if (asset.meta.shouldWrap ||
                 this.bundle.env.sourceType === 'script' ||
@@ -317,13 +318,12 @@ class ScopeHoistingPackager {
                     this.bundleGraph
                         .getIncomingDependencies(asset)
                         .some((dep) => dep.priority === 'lazy')) {
-                    this.wrappedAssets.add(asset.id);
-                    wrapped.push(asset);
+                    this.wrappedAssets.add(asset);
                 }
                 else if (((0, feature_flags_1.getFeatureFlag)('inlineConstOptimisationFix') ||
                     this.useBothScopeHoistingImprovements) &&
                     asset.meta.isConstantModule) {
-                    constant.push(asset);
+                    this.constantAssets.add(asset);
                 }
             }
         });
@@ -335,18 +335,19 @@ class ScopeHoistingPackager {
             if (!(0, feature_flags_1.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, feature_flags_1.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);
                 }
             }
@@ -355,14 +356,13 @@ 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.
                         moduleGroupParents.push(asset);
@@ -374,25 +374,22 @@ class ScopeHoistingPackager {
             }
         }
         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
@@ -414,7 +411,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, exportAs, symbol, exportSymbol, } of this.bundleGraph.getExportedSymbols(entry)) {
                 if (typeof symbol === 'string') {
@@ -479,16 +476,16 @@ class ScopeHoistingPackager {
         return `${obj}[${JSON.stringify(property)}]`;
     }
     visitAsset(asset) {
-        (0, assert_1.default)(!this.seenAssets.has(asset.id), 'Already visited asset');
-        this.seenAssets.add(asset.id);
-        let { code, map } = (0, nullthrows_1.default)(this.assetOutputs.get(asset.id));
+        (0, assert_1.default)(!this.seenAssets.has(asset), 'Already visited asset');
+        this.seenAssets.add(asset);
+        let { code, map } = (0, nullthrows_1.default)(this.assetOutputs.get(asset));
         return this.buildAsset(asset, code, map);
     }
     getAssetFilePath(asset) {
         return path_1.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 source_map_1.default(this.options.projectRoot, map)
@@ -509,15 +506,23 @@ 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];
@@ -539,7 +544,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.
@@ -585,14 +589,14 @@ class ScopeHoistingPackager {
                                 [res, lines] = this.getHoistedParcelRequires(asset, dep, resolved);
                             }
                             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
                                 // 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)) {
+                                        !this.wrappedAssets.has(resolved)) {
                                         let [depCode, depMap, depLines] = this.visitAsset(resolved);
                                         if (utils_1.debugTools['asset-file-names-in-output']) {
                                             let resolvedPath = this.getAssetFilePath(resolved);
@@ -637,7 +641,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);
                                 }
                             }
@@ -681,7 +685,7 @@ ${code}
                     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;
@@ -759,7 +763,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) ||
+        if (this.wrappedAssets.has(asset) ||
             (this.bundle.env.outputFormat === 'commonjs' &&
                 asset === this.bundle.getMainEntry())) {
             let exportsName = asset.symbols.get('*')?.local || `$${assetId}$exports`;
@@ -867,8 +871,9 @@ ${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;
                     }
                 }
                 // Rename the specifier so that multiple local imports of the same imported specifier
@@ -913,7 +918,7 @@ ${code}
             return false;
         }
         return ((!this.bundle.hasAsset(resolved) && !this.externalAssets.has(resolved)) ||
-            (this.wrappedAssets.has(resolved.id) && resolved !== parentAsset));
+            (this.wrappedAssets.has(resolved) && resolved !== parentAsset));
     }
     getSymbolResolution(parentAsset, resolved, imported, dep, replacements) {
         let { asset: resolvedAsset, exportSymbol, symbol, } = this.bundleGraph.getSymbolResolution(resolved, imported, this.bundle);
@@ -942,12 +947,12 @@ ${code}
             // 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;
@@ -982,7 +987,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)) {
+                this.wrappedAssets.has(resolvedAsset)) {
                 // Directly use module.exports for wrapped assets importing themselves.
                 return 'module.exports';
             }
@@ -1019,7 +1024,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);
@@ -1029,7 +1034,7 @@ ${code}
         // so it runs first.
         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)) {
             this.needsPrelude = true;
@@ -1056,7 +1061,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_1.default)(this.bundleGraph.getUsedSymbols(asset));
         let assetId = asset.meta.id;
         (0, assert_1.default)(typeof assetId === 'string');
@@ -1252,10 +1257,8 @@ ${code}
             this.usedHelpers.add('$parcel$global');
         }
         for (let helper of this.usedHelpers) {
-            // @ts-expect-error TS7053
             let currentHelper = helpers_1.helpers[helper];
             if (typeof currentHelper === 'function') {
-                // @ts-expect-error TS7053
                 currentHelper = helpers_1.helpers[helper](this.bundle.env);
             }
             res += currentHelper;

package/lib/ESMOutputFormat.js

@@ -75,7 +75,7 @@ class ESMOutputFormat {
       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)}")`;
         res += `\nvar ${local} = ${this.packager.getPropertyAccess(obj, exportSymbol)};`;
         lines++;