@atlaspack/packager-js 2.18.3-typescript-bc4459c37.0 → 2.19.0

package/src/{ScopeHoistingPackager.ts → ScopeHoistingPackager.js}

@@ -1,3 +1,5 @@
+// @flow
+
 import type {
   Asset,
   BundleGraph,
@@ -39,6 +41,7 @@ import {
 
 // General regex used to replace imports with the resolved code, references with resolutions,
 // and count the number of newlines in the file for source maps.
+//
 // For conditional bundling the only difference in this regex is adding `importCond` where we have `importAsync` etc..
 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;
@@ -61,13 +64,13 @@ const GLOBALS_BY_CONTEXT = {
     ...Object.keys(globals.node),
     ...Object.keys(globals.browser),
   ]),
-} as const;
+};
 
 const OUTPUT_FORMATS = {
   esmodule: ESMOutputFormat,
   commonjs: CJSOutputFormat,
   global: GlobalOutputFormat,
-} as const;
+};
 
 export interface OutputFormat {
   buildBundlePrelude(): [string, number];
@@ -82,23 +85,16 @@ export class ScopeHoistingPackager {
   useAsyncBundleRuntime: boolean;
   outputFormat: OutputFormat;
   isAsyncBundle: boolean;
-  globalNames: ReadonlySet<string>;
-  // @ts-expect-error TS2564
-  assetOutputs: Map<
-    string,
-    {
-      code: string;
-      map: Buffer | null | undefined;
-    }
-  >;
+  globalNames: $ReadOnlySet<string>;
+  assetOutputs: Map<string, {|code: string, map: ?Buffer|}>;
   exportedSymbols: Map<
     string,
-    {
-      asset: Asset;
-      exportSymbol: string;
-      local: string;
-      exportAs: Array<string>;
-    }
+    {|
+      asset: Asset,
+      exportSymbol: string,
+      local: string,
+      exportAs: Array<string>,
+    |},
   > = new Map();
   externals: Map<string, Map<string, string>> = new Map();
   topLevelNames: Map<string, number> = new Map();
@@ -136,10 +132,7 @@ export class ScopeHoistingPackager {
     this.globalNames = GLOBALS_BY_CONTEXT[bundle.env.context];
   }
 
-  async package(): Promise<{
-    contents: string;
-    map: SourceMap | null | undefined;
-  }> {
+  async package(): Promise<{|contents: string, map: ?SourceMap|}> {
     let {wrapped: wrappedAssets, constant: constantAssets} =
       await this.loadAssets();
     this.buildExportedSymbols();
@@ -162,11 +155,9 @@ export class ScopeHoistingPackager {
 
     let res = '';
     let lineCount = 0;
-    // @ts-expect-error TS7034
     let sourceMap = null;
-    let processAsset = (asset: Asset) => {
+    let processAsset = (asset) => {
       let [content, map, lines] = this.visitAsset(asset);
-      // @ts-expect-error TS7005
       if (sourceMap && map) {
         sourceMap.addSourceMap(map, lineCount);
       } else if (this.bundle.env.sourceMap) {
@@ -212,7 +203,6 @@ export class ScopeHoistingPackager {
     let [prelude, preludeLines] = this.buildBundlePrelude();
     res = prelude + res;
     lineCount += preludeLines;
-    // @ts-expect-error TS2339
     sourceMap?.offsetLines(1, preludeLines);
 
     let entries = this.bundle.getEntryAssets();
@@ -220,7 +210,11 @@ export class ScopeHoistingPackager {
     if (this.isAsyncBundle) {
       // In async bundles we don't want the main entry to execute until we require it
       // as there might be dependencies in a sibling bundle that hasn't loaded yet.
-      entries = entries.filter((a) => a.id !== mainEntry?.id);
+      if (getFeatureFlag('supportWebpackChunkName')) {
+        entries = [];
+      } else {
+        entries = entries.filter((a) => a.id !== mainEntry?.id);
+      }
       mainEntry = null;
     }
 
@@ -233,20 +227,17 @@ export class ScopeHoistingPackager {
           this.bundleGraph.getAssetPublicId(entry),
         )});\n`;
 
-        // @ts-expect-error TS2345
         let entryExports = entry.symbols.get('*')?.local;
 
         if (
           entryExports &&
           entry === mainEntry &&
-          // @ts-expect-error TS2345
           this.exportedSymbols.has(entryExports)
         ) {
           invariant(
             !needsBundleQueue,
             'Entry exports are not yet compaitble with async bundles',
           );
-          // @ts-expect-error TS2731
           res += `\nvar ${entryExports} = ${parcelRequire}`;
         } else {
           if (needsBundleQueue) {
@@ -290,7 +281,6 @@ export class ScopeHoistingPackager {
         this.parcelRequireName,
       );
       if (sourceMap && map) {
-        // @ts-expect-error TS2339
         sourceMap.addSourceMap(map, lineCount);
       }
     }
@@ -332,7 +322,7 @@ export class ScopeHoistingPackager {
       .filter((b) => this.shouldBundleQueue(b))
       .map((b) => b.publicId);
 
-    const conditions: Array<string> = [];
+    const conditions = [];
     if (getFeatureFlag('conditionalBundlingApi')) {
       const conditionSet = this.bundleGraph
         .getConditionalBundleMapping()
@@ -374,13 +364,13 @@ export class ScopeHoistingPackager {
     return `$parcel$global.rwr(${params.join(', ')});`;
   }
 
-  async loadAssets(): Promise<{
-    wrapped: Array<Asset>;
-    constant: Array<Asset>;
-  }> {
+  async loadAssets(): Promise<{|
+    wrapped: Array<Asset>,
+    constant: Array<Asset>,
+  |}> {
     let queue = new PromiseQueue({maxConcurrent: 32});
-    let wrapped: Array<Asset> = [];
-    let constant: Array<Asset> = [];
+    let wrapped = [];
+    let constant = [];
     this.bundle.traverseAssets((asset) => {
       queue.add(async () => {
         let [code, map] = await Promise.all([
@@ -467,7 +457,6 @@ export class ScopeHoistingPackager {
       }
     }
 
-    // @ts-expect-error TS2769
     this.assetOutputs = new Map(await queue.run());
     return {wrapped, constant};
   }
@@ -503,7 +492,6 @@ export class ScopeHoistingPackager {
     // TODO: handle ESM exports of wrapped entry assets...
     let entry = this.bundle.getMainEntry();
     if (entry && !this.wrappedAssets.has(entry.id)) {
-      // @ts-expect-error TS2345
       let hasNamespace = entry.symbols.hasExportSymbol('*');
 
       for (let {
@@ -521,7 +509,6 @@ export class ScopeHoistingPackager {
           }
 
           let symbols = this.exportedSymbols.get(
-            // @ts-expect-error TS2345
             symbol === '*' ? nullthrows(entry.symbols.get('*')?.local) : symbol,
           )?.exportAs;
 
@@ -529,7 +516,6 @@ export class ScopeHoistingPackager {
             symbols = [];
             this.exportedSymbols.set(symbol, {
               asset,
-              // @ts-expect-error TS2322
               exportSymbol,
               local: symbol,
               exportAs: symbols,
@@ -540,7 +526,6 @@ export class ScopeHoistingPackager {
             exportAs = 'default';
           }
 
-          // @ts-expect-error TS2345
           symbols.push(exportAs);
         } else if (symbol === null) {
           // TODO `meta.exportsIdentifier[exportSymbol]` should be exported
@@ -586,7 +571,7 @@ export class ScopeHoistingPackager {
     return `${obj}[${JSON.stringify(property)}]`;
   }
 
-  visitAsset(asset: Asset): [string, SourceMap | null | undefined, number] {
+  visitAsset(asset: Asset): [string, ?SourceMap, number] {
     invariant(!this.seenAssets.has(asset.id), 'Already visited asset');
     this.seenAssets.add(asset.id);
 
@@ -601,8 +586,8 @@ export class ScopeHoistingPackager {
   buildAsset(
     asset: Asset,
     code: string,
-    map?: Buffer | null,
-  ): [string, SourceMap | null | undefined, number] {
+    map: ?Buffer,
+  ): [string, ?SourceMap, number] {
     let shouldWrap = this.wrappedAssets.has(asset.id);
     let deps = this.bundleGraph.getDependencies(asset);
 
@@ -637,7 +622,6 @@ export class ScopeHoistingPackager {
           let [code, map, lines] = this.visitAsset(resolved);
           depCode += code + '\n';
           if (sourceMap && map) {
-            // @ts-expect-error TS2551
             sourceMap.addSourceMap(map, lineCount);
           }
           lineCount += lines + 1;
@@ -674,9 +658,7 @@ export class ScopeHoistingPackager {
     code += append;
 
     let lineCount = 0;
-    // @ts-expect-error TS2552
-    let depContent: Array<[string, NodeSourceMap | null | undefined, number]> =
-      [];
+    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.
       lineCount = countLines(code) - 1;
@@ -778,7 +760,6 @@ export class ScopeHoistingPackager {
                   }
 
                   if (map) {
-                    // @ts-expect-error TS2551
                     sourceMap.addSourceMap(map, lineCount);
                   }
                 }
@@ -835,7 +816,6 @@ ${code}
         if (!depCode) continue;
         code += depCode + '\n';
         if (sourceMap && map) {
-          // @ts-expect-error TS2551
           sourceMap.addSourceMap(map, lineCount);
         }
         lineCount += lines + 1;
@@ -918,12 +898,10 @@ ${code}
       }
 
       for (let [imported, {local}] of dep.symbols) {
-        // @ts-expect-error TS2367
         if (local === '*') {
           continue;
         }
 
-        // @ts-expect-error TS2345
         let symbol = this.getSymbolResolution(asset, resolved, imported, dep);
         replacements.set(
           local,
@@ -960,7 +938,6 @@ ${code}
       (this.bundle.env.outputFormat === 'commonjs' &&
         asset === this.bundle.getMainEntry())
     ) {
-      // @ts-expect-error TS2345
       let exportsName = asset.symbols.get('*')?.local || `$${assetId}$exports`;
       replacements.set(exportsName, 'module.exports');
     }
@@ -1004,11 +981,8 @@ ${code}
 
     for (let [imported, {local}] of dep.symbols) {
       // If already imported, just add the already renamed variable to the mapping.
-      // @ts-expect-error TS2345
       let renamed = external.get(imported);
-      // @ts-expect-error TS2367
       if (renamed && local !== '*' && replacements) {
-        // @ts-expect-error TS2345
         replacements.set(local, renamed);
         continue;
       }
@@ -1020,9 +994,7 @@ ${code}
         if (!renamed) {
           if (referencedBundle) {
             let entry = nullthrows(referencedBundle.getMainEntry());
-            // @ts-expect-error TS2322
             renamed =
-              // @ts-expect-error TS2345
               entry.symbols.get('*')?.local ??
               `$${String(entry.meta.id)}$exports`;
           } else {
@@ -1031,17 +1003,13 @@ ${code}
             );
           }
 
-          // @ts-expect-error TS2345
           external.set('*', renamed);
         }
 
-        // @ts-expect-error TS2367
         if (local !== '*' && replacements) {
           let replacement;
-          // @ts-expect-error TS2367
           if (imported === '*') {
             replacement = renamed;
-            // @ts-expect-error TS2367
           } else if (imported === 'default') {
             let needsDefaultInterop = true;
             if (referencedBundle) {
@@ -1055,44 +1023,36 @@ ${code}
               replacement = `${renamed}.default`;
             }
           } else {
-            // @ts-expect-error TS2345
             replacement = this.getPropertyAccess(renamed, imported);
           }
 
-          // @ts-expect-error TS2345
           replacements.set(local, replacement);
         }
       } else {
         let property;
         if (referencedBundle) {
           let entry = nullthrows(referencedBundle.getMainEntry());
-          // @ts-expect-error TS2345
           if (entry.symbols.hasExportSymbol('*')) {
             // If importing * and the referenced module has a * export (e.g. CJS), use default instead.
             // This mirrors the logic in buildExportedSymbols.
             property = imported;
-            // @ts-expect-error TS2322
             imported =
               referencedBundle?.env.outputFormat === 'esmodule'
                 ? 'default'
                 : '*';
           } else {
-            // @ts-expect-error TS2367
             if (imported === '*') {
               let exportedSymbols = this.bundleGraph.getExportedSymbols(entry);
-              // @ts-expect-error TS2367
               if (local === '*') {
                 // Re-export all symbols.
                 for (let exported of exportedSymbols) {
                   if (exported.symbol) {
-                    // @ts-expect-error TS2345
                     external.set(exported.exportSymbol, exported.symbol);
                   }
                 }
                 continue;
               }
             }
-            // @ts-expect-error TS2322
             renamed = this.bundleGraph.getSymbolResolution(
               entry,
               imported,
@@ -1105,40 +1065,30 @@ ${code}
         // are deduplicated. We have to prefix the imported name with the bundle id so that
         // local variables do not shadow it.
         if (!renamed) {
-          // @ts-expect-error TS2345
           if (this.exportedSymbols.has(local)) {
-            // @ts-expect-error TS2322
             renamed = local;
-            // @ts-expect-error TS2367
           } else if (imported === 'default' || imported === '*') {
             renamed = this.getTopLevelName(
               `$${this.bundle.publicId}$${specifier}`,
             );
           } else {
             renamed = this.getTopLevelName(
-              // @ts-expect-error TS2731
               `$${this.bundle.publicId}$${imported}`,
             );
           }
         }
 
-        // @ts-expect-error TS2345
         external.set(imported, renamed);
-        // @ts-expect-error TS2367
         if (local !== '*' && replacements) {
           let replacement = renamed;
-          // @ts-expect-error TS2367
           if (property === '*') {
             replacement = renamed;
-            // @ts-expect-error TS2367
           } else if (property === 'default') {
             replacement = `($parcel$interopDefault(${renamed}))`;
             this.usedHelpers.add('$parcel$interopDefault');
           } else if (property) {
-            // @ts-expect-error TS2345
             replacement = this.getPropertyAccess(renamed, property);
           }
-          // @ts-expect-error TS2345
           replacements.set(local, replacement);
         }
       }
@@ -1177,7 +1127,6 @@ ${code}
       asset: resolvedAsset,
       exportSymbol,
       symbol,
-      // @ts-expect-error TS2345
     } = this.bundleGraph.getSymbolResolution(resolved, imported, this.bundle);
 
     if (
@@ -1236,11 +1185,8 @@ ${code}
       staticExports &&
       !isWrapped &&
       (dep?.meta.kind === 'Import' || dep?.meta.kind === 'Export') &&
-      // @ts-expect-error TS2345
       resolvedAsset.symbols.hasExportSymbol('*') &&
-      // @ts-expect-error TS2345
       resolvedAsset.symbols.hasExportSymbol('default') &&
-      // @ts-expect-error TS2345
       !resolvedAsset.symbols.hasExportSymbol('__esModule');
 
     // Find the namespace object for the resolved module. If wrapped and this
@@ -1256,9 +1202,7 @@ ${code}
     } else if (isWrapped && dep) {
       obj = `$${publicId}`;
     } else {
-      // @ts-expect-error TS2345
       obj = resolvedAsset.symbols.get('*')?.local || `$${assetId}$exports`;
-      // @ts-expect-error TS2345
       obj = replacements?.get(obj) || obj;
     }
 
@@ -1271,7 +1215,6 @@ ${code}
         // Directly use module.exports for wrapped assets importing themselves.
         return 'module.exports';
       } else {
-        // @ts-expect-error TS2322
         return obj;
       }
     } else if (
@@ -1286,21 +1229,17 @@ ${code}
       if (
         (!dep || kind === 'Import' || kind === 'Export') &&
         exportSymbol === 'default' &&
-        // @ts-expect-error TS2345
         resolvedAsset.symbols.hasExportSymbol('*') &&
         this.needsDefaultInterop(resolvedAsset)
       ) {
         this.usedHelpers.add('$parcel$interopDefault');
-        // @ts-expect-error TS2731
         return `(/*@__PURE__*/$parcel$interopDefault(${obj}))`;
       } else {
-        // @ts-expect-error TS2345
         return this.getPropertyAccess(obj, exportSymbol);
       }
     } else if (!symbol) {
       invariant(false, 'Asset was skipped or not found.');
     } else {
-      // @ts-expect-error TS2322
       return replacements?.get(symbol) || symbol;
     }
   }
@@ -1363,11 +1302,8 @@ ${code}
     // If there's no __esModule flag, and default is a used symbol, we need
     // to insert an interop helper.
     let defaultInterop =
-      // @ts-expect-error TS2345
       asset.symbols.hasExportSymbol('*') &&
-      // @ts-expect-error TS2345
       usedSymbols.has('default') &&
-      // @ts-expect-error TS2345
       !asset.symbols.hasExportSymbol('__esModule');
 
     let usedNamespace;
@@ -1376,33 +1312,33 @@ ${code}
       asset.meta.isConstantModule
     ) {
       // Only set usedNamespace if there is an incoming dependency in the current bundle that uses '*'
-      usedNamespace = this.bundleGraph.getIncomingDependencies(asset).some(
-        (dep) =>
-          this.bundle.hasDependency(dep) &&
-          // @ts-expect-error TS2345
-          nullthrows(this.bundleGraph.getUsedSymbols(dep)).has('*'),
-      );
+      usedNamespace = this.bundleGraph
+        .getIncomingDependencies(asset)
+        .some(
+          (dep) =>
+            this.bundle.hasDependency(dep) &&
+            nullthrows(this.bundleGraph.getUsedSymbols(dep)).has('*'),
+        );
     } else {
       usedNamespace =
         // If the asset has * in its used symbols, we might need the exports namespace.
         // The one case where this isn't true is in ESM library entries, where the only
         // dependency on * is the entry dependency. In this case, we will use ESM exports
         // instead of the namespace object.
-        // @ts-expect-error TS2345
         (usedSymbols.has('*') &&
           (this.bundle.env.outputFormat !== 'esmodule' ||
             !this.bundle.env.isLibrary ||
             asset !== this.bundle.getMainEntry() ||
-            this.bundleGraph.getIncomingDependencies(asset).some(
-              (dep) =>
-                !dep.isEntry &&
-                this.bundle.hasDependency(dep) &&
-                // @ts-expect-error TS2345
-                nullthrows(this.bundleGraph.getUsedSymbols(dep)).has('*'),
-            ))) ||
+            this.bundleGraph
+              .getIncomingDependencies(asset)
+              .some(
+                (dep) =>
+                  !dep.isEntry &&
+                  this.bundle.hasDependency(dep) &&
+                  nullthrows(this.bundleGraph.getUsedSymbols(dep)).has('*'),
+              ))) ||
         // If a symbol is imported (used) from a CJS asset but isn't listed in the symbols,
         // we fallback on the namespace object.
-        // @ts-expect-error TS2345
         (asset.symbols.hasExportSymbol('*') &&
           [...usedSymbols].some((s) => !asset.symbols.hasExportSymbol(s))) ||
         // If the exports has this asset's namespace (e.g. ESM output from CJS input),
@@ -1439,7 +1375,6 @@ ${code}
       // Insert the __esModule interop flag for this module if it has a `default` export
       // and the namespace symbol is used.
       // TODO: only if required by CJS?
-      // @ts-expect-error TS2345
       if (asset.symbols.hasExportSymbol('default') && usedSymbols.has('*')) {
         prepend += `\n$parcel$defineInteropFlag($${assetId}$exports);\n`;
         prependLineCount += 2;
@@ -1458,7 +1393,6 @@ ${code}
         let isWrapped = resolved && resolved.meta.shouldWrap;
 
         for (let [imported, {local}] of dep.symbols) {
-          // @ts-expect-error TS2367
           if (imported === '*' && local === '*') {
             if (!resolved) {
               // Re-exporting an external module. This should have already been handled in buildReplacements.
@@ -1476,11 +1410,9 @@ ${code}
             if (
               isWrapped ||
               resolved.meta.staticExports === false ||
-              // @ts-expect-error TS2345
               nullthrows(this.bundleGraph.getUsedSymbols(resolved)).has('*') ||
               // an empty asset
               (!resolved.meta.hasCJSExports &&
-                // @ts-expect-error TS2345
                 resolved.symbols.hasExportSymbol('*'))
             ) {
               let obj = this.getSymbolResolution(
@@ -1497,9 +1429,7 @@ ${code}
                 this.bundleGraph.getUsedSymbols(dep),
               )) {
                 if (
-                  // @ts-expect-error TS2367
                   symbol === 'default' || // `export * as ...` does not include the default export
-                  // @ts-expect-error TS2367
                   symbol === '__esModule'
                 ) {
                   continue;
@@ -1508,7 +1438,6 @@ ${code}
                 let resolvedSymbol = this.getSymbolResolution(
                   asset,
                   resolved,
-                  // @ts-expect-error TS2345
                   symbol,
                   undefined,
                   replacements,
@@ -1534,7 +1463,6 @@ ${code}
       // re-exported symbols rather than only symbols declared in this asset.
       let incomingDeps = this.bundleGraph.getIncomingDependencies(asset);
       let usedExports = [...asset.symbols.exportSymbols()].filter((symbol) => {
-        // @ts-expect-error TS2367
         if (symbol === '*') {
           return false;
         }
@@ -1551,7 +1479,6 @@ ${code}
           // No used symbols available for the asset, make sure we keep all of them
           if (!symbols) return false;
 
-          // @ts-expect-error TS2345
           return !symbols.has(symbol) && !symbols.has('*');
         });
         return !unused;
@@ -1567,7 +1494,6 @@ ${code}
             let resolved = this.getSymbolResolution(
               asset,
               asset,
-              // @ts-expect-error TS2345
               exp,
               undefined,
               replacements,
@@ -1623,10 +1549,8 @@ ${code}
     }
 
     for (let helper of this.usedHelpers) {
-      // @ts-expect-error TS7053
       let currentHelper = helpers[helper];
       if (typeof currentHelper === 'function') {
-        // @ts-expect-error TS7053
         currentHelper = helpers[helper](this.bundle.env);
       }
       res += currentHelper;
@@ -1699,9 +1623,7 @@ ${code}
 
   needsDefaultInterop(asset: Asset): boolean {
     if (
-      // @ts-expect-error TS2345
       asset.symbols.hasExportSymbol('*') &&
-      // @ts-expect-error TS2345
       !asset.symbols.hasExportSymbol('default')
     ) {
       return true;

package/src/dev-prelude.js

@@ -12,12 +12,12 @@
     typeof globalThis !== 'undefined'
       ? globalThis
       : typeof self !== 'undefined'
-        ? self
-        : typeof window !== 'undefined'
-          ? window
-          : typeof global !== 'undefined'
-            ? global
-            : {};
+      ? self
+      : typeof window !== 'undefined'
+      ? window
+      : typeof global !== 'undefined'
+      ? global
+      : {};
   /* eslint-enable no-undef */
 
   // Save the require from previous bundle to this closure if any

package/src/{helpers.ts → helpers.js}

@@ -1,3 +1,4 @@
+// @flow strict-local
 import type {Environment} from '@atlaspack/types';
 
 export const prelude = (parcelRequireName: string): string => `
@@ -165,4 +166,4 @@ export const helpers = {
   $parcel$interopDefault,
   $parcel$global,
   $parcel$defineInteropFlag,
-} as const;
+};