@parcel/packager-js 2.0.0-canary.1542 → 2.0.0-dev.1424

package/lib/ESMOutputFormat.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ESMOutputFormat = void 0;
-var _utils = require("./utils");
 class ESMOutputFormat {
   constructor(packager) {
     this.packager = packager;
@@ -23,9 +22,6 @@ class ESMOutputFormat {
           namespaceSpecifier = `* as ${symbol}`;
         } else {
           let specifier = imported;
-          if (!(0, _utils.isValidIdentifier)(specifier)) {
-            specifier = JSON.stringify(specifier);
-          }
           if (symbol !== imported) {
             specifier += ` as ${symbol}`;
           }
@@ -82,10 +78,7 @@ class ESMOutputFormat {
       }
       for (let as of exportAs) {
         let specifier = local;
-        if (as !== local) {
-          if (!(0, _utils.isValidIdentifier)(as)) {
-            as = JSON.stringify(as);
-          }
+        if (exportAs !== local) {
           specifier += ` as ${as}`;
         }
         exportSpecifiers.push(specifier);

package/lib/ScopeHoistingPackager.js

@@ -61,6 +61,11 @@ var _utils2 = require("./utils");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// https://262.ecma-international.org/6.0/#sec-names-and-keywords
+const IDENTIFIER_RE = /^[$_\p{ID_Start}][$_\u200C\u200D\p{ID_Continue}]*$/u;
+const ID_START_RE = /^[$_\p{ID_Start}]/u;
+const NON_ID_CONTINUE_RE = /[^$_\u200C\u200D\p{ID_Continue}]/gu;
+
 // 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.
 const REPLACEMENT_RE = /\n|import\s+"([0-9a-f]{16}:.+?)";|(?:\$[0-9a-f]{16}\$exports)|(?:\$[0-9a-f]{16}\$(?:import|importAsync|require)\$[0-9a-f]+(?:\$[0-9a-f]+)?)/g;
@@ -111,10 +116,23 @@ class ScopeHoistingPackager {
     // of each bundle group pointing at the sibling bundles. These can be
     // picked up by another bundler later at which point runtimes will be added.
     if (this.bundle.env.isLibrary || this.bundle.env.outputFormat === 'commonjs') {
-      for (let b of this.bundleGraph.getReferencedBundles(this.bundle, {
-        recursive: false
-      })) {
-        this.externals.set((0, _utils().relativeBundlePath)(this.bundle, b), new Map());
+      for (let b of this.bundleGraph.getReferencedBundles(this.bundle)) {
+        let entry = b.getMainEntry();
+        let symbols = new Map();
+        if (entry && !this.isAsyncBundle && entry.type === 'js') {
+          this.externalAssets.add(entry);
+          let usedSymbols = this.bundleGraph.getUsedSymbols(entry) || new Set();
+          for (let s of usedSymbols) {
+            // If the referenced bundle is ESM, and we are importing '*', use 'default' instead.
+            // This matches the logic below in buildExportedSymbols.
+            let imported = s;
+            if (imported === '*' && b.env.outputFormat === 'esmodule') {
+              imported = 'default';
+            }
+            symbols.set(imported, this.getSymbolResolution(entry, entry, s));
+          }
+        }
+        this.externals.set((0, _utils().relativeBundlePath)(this.bundle, b), symbols);
       }
     }
     let res = '';
@@ -238,7 +256,7 @@ class ScopeHoistingPackager {
           map
         }];
       });
-      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')) {
+      if (asset.meta.shouldWrap || this.isAsyncBundle || this.bundle.env.sourceType === 'script' || this.bundleGraph.isAssetReferenced(this.bundle, asset) || this.bundleGraph.getIncomingDependencies(asset).some(dep => dep.meta.shouldWrap && dep.specifierType !== 'url')) {
         if (!asset.meta.isConstantModule) {
           this.wrappedAssets.add(asset.id);
           wrapped.push(asset);
@@ -264,14 +282,13 @@ class ScopeHoistingPackager {
     return wrapped;
   }
   buildExportedSymbols() {
-    if (!this.bundle.env.isLibrary || this.bundle.env.outputFormat !== 'esmodule') {
+    if (this.isAsyncBundle || !this.bundle.env.isLibrary || this.bundle.env.outputFormat !== 'esmodule') {
       return;
     }
 
     // TODO: handle ESM exports of wrapped entry assets...
     let entry = this.bundle.getMainEntry();
     if (entry && !this.wrappedAssets.has(entry.id)) {
-      let hasNamespace = entry.symbols.hasExportSymbol('*');
       for (let {
         asset,
         exportAs,
@@ -280,12 +297,6 @@ class ScopeHoistingPackager {
       } of this.bundleGraph.getExportedSymbols(entry)) {
         if (typeof symbol === 'string') {
           var _this$exportedSymbols, _entry$symbols$get2;
-          // If the module has a namespace (e.g. commonjs), and this is not an entry, only export the namespace
-          // as default, without individual exports. This mirrors the importing logic in addExternal, avoiding
-          // extra unused exports and potential for non-identifier export names.
-          if (hasNamespace && this.isAsyncBundle && exportAs !== '*') {
-            continue;
-          }
           let symbols = (_this$exportedSymbols = this.exportedSymbols.get(symbol === '*' ? (0, _nullthrows().default)((_entry$symbols$get2 = entry.symbols.get('*')) === null || _entry$symbols$get2 === void 0 ? void 0 : _entry$symbols$get2.local) : symbol)) === null || _this$exportedSymbols === void 0 ? void 0 : _this$exportedSymbols.exportAs;
           if (!symbols) {
             symbols = [];
@@ -320,8 +331,8 @@ class ScopeHoistingPackager {
     }
   }
   getTopLevelName(name) {
-    name = (0, _utils2.makeValidIdentifier)(name);
-    if (this.globalNames.has(name)) {
+    name = name.replace(NON_ID_CONTINUE_RE, '');
+    if (!ID_START_RE.test(name) || this.globalNames.has(name)) {
       name = '_' + name;
     }
     let count = this.topLevelNames.get(name);
@@ -333,7 +344,7 @@ class ScopeHoistingPackager {
     return name + count;
   }
   getPropertyAccess(obj, property) {
-    if ((0, _utils2.isValidIdentifier)(property)) {
+    if (IDENTIFIER_RE.test(property)) {
       return `${obj}.${property}`;
     }
     return `${obj}[${JSON.stringify(property)}]`;
@@ -390,7 +401,7 @@ class ScopeHoistingPackager {
       code = code.replace('$parcel$filenameReplace', relPath);
     }
     let [depMap, replacements] = this.buildReplacements(asset, deps);
-    let [prepend, prependLines, append] = this.buildAssetPrelude(asset, deps, replacements);
+    let [prepend, prependLines, append] = this.buildAssetPrelude(asset, deps);
     if (prependLines > 0) {
       sourceMap === null || sourceMap === void 0 || sourceMap.offsetLines(1, prependLines);
       code = prepend + code;
@@ -520,7 +531,7 @@ ${code}
     let replacements = new Map();
     for (let dep of deps) {
       let specifierType = dep.specifierType === 'esm' ? `:${dep.specifierType}` : '';
-      depMap.get(`${assetId}:${(0, _utils2.getSpecifier)(dep)}${!dep.meta.placeholder ? specifierType : ''}`).push(dep);
+      depMap.get(`${assetId}:${(0, _utils2.getSpecifier)(dep)}${dep.meta.isESM ? specifierType : ''}`).push(dep);
       let asyncResolution = this.bundleGraph.resolveAsyncDependency(dep, this.bundle);
       let resolved = (asyncResolution === null || asyncResolution === void 0 ? void 0 : asyncResolution.type) === 'asset' ?
       // Prefer the underlying asset over a runtime to load it. It will
@@ -532,16 +543,6 @@ ${code}
       if (!resolved) {
         continue;
       }
-
-      // Handle imports from other bundles in libraries.
-      if (this.bundle.env.isLibrary && !this.bundle.hasAsset(resolved)) {
-        let referencedBundle = this.bundleGraph.getReferencedBundle(dep, this.bundle);
-        if (referencedBundle && referencedBundle.getMainEntry() === resolved && referencedBundle.type === 'js' && !this.bundleGraph.isAssetReferenced(referencedBundle, resolved)) {
-          this.addExternal(dep, replacements, referencedBundle);
-          this.externalAssets.add(resolved);
-          continue;
-        }
-      }
       for (let [imported, {
         local
       }] of dep.symbols) {
@@ -574,7 +575,7 @@ ${code}
     }
     return [depMap, replacements];
   }
-  addExternal(dep, replacements, referencedBundle) {
+  addExternal(dep, replacements) {
     if (this.bundle.env.outputFormat === 'global') {
       throw new (_diagnostic().default)({
         diagnostic: {
@@ -586,16 +587,12 @@ ${code}
         }
       });
     }
-    let specifier = dep.specifier;
-    if (referencedBundle) {
-      specifier = (0, _utils().relativeBundlePath)(this.bundle, referencedBundle);
-    }
 
     // Map of DependencySpecifier -> Map<ExportedSymbol, Identifier>>
-    let external = this.externals.get(specifier);
+    let external = this.externals.get(dep.specifier);
     if (!external) {
       external = new Map();
-      this.externals.set(specifier, external);
+      this.externals.set(dep.specifier, external);
     }
     for (let [imported, {
       local
@@ -612,13 +609,7 @@ ${code}
       if (this.bundle.env.outputFormat === 'commonjs') {
         renamed = external.get('*');
         if (!renamed) {
-          if (referencedBundle) {
-            var _entry$symbols$get$lo, _entry$symbols$get3;
-            let entry = (0, _nullthrows().default)(referencedBundle.getMainEntry());
-            renamed = (_entry$symbols$get$lo = (_entry$symbols$get3 = entry.symbols.get('*')) === null || _entry$symbols$get3 === void 0 ? void 0 : _entry$symbols$get3.local) !== null && _entry$symbols$get$lo !== void 0 ? _entry$symbols$get$lo : `$${String(entry.meta.id)}$exports`;
-          } else {
-            renamed = this.getTopLevelName(`$${this.bundle.publicId}$${specifier}`);
-          }
+          renamed = this.getTopLevelName(`$${this.bundle.publicId}$${dep.specifier}`);
           external.set('*', renamed);
         }
         if (local !== '*' && replacements) {
@@ -634,55 +625,19 @@ ${code}
           replacements.set(local, replacement);
         }
       } else {
-        let property;
-        if (referencedBundle) {
-          let entry = (0, _nullthrows().default)(referencedBundle.getMainEntry());
-          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;
-            imported = (referencedBundle === null || referencedBundle === void 0 ? void 0 : referencedBundle.env.outputFormat) === 'esmodule' ? 'default' : '*';
-          } else {
-            if (imported === '*') {
-              let exportedSymbols = this.bundleGraph.getExportedSymbols(entry);
-              if (local === '*') {
-                // Re-export all symbols.
-                for (let exported of exportedSymbols) {
-                  if (exported.symbol) {
-                    external.set(exported.exportSymbol, exported.symbol);
-                  }
-                }
-                continue;
-              }
-            }
-            renamed = this.bundleGraph.getSymbolResolution(entry, imported, this.bundle).symbol;
-          }
-        }
-
         // Rename the specifier so that multiple local imports of the same imported specifier
         // are deduplicated. We have to prefix the imported name with the bundle id so that
         // local variables do not shadow it.
-        if (!renamed) {
-          if (this.exportedSymbols.has(local)) {
-            renamed = local;
-          } else if (imported === 'default' || imported === '*') {
-            renamed = this.getTopLevelName(`$${this.bundle.publicId}$${specifier}`);
-          } else {
-            renamed = this.getTopLevelName(`$${this.bundle.publicId}$${imported}`);
-          }
+        if (this.exportedSymbols.has(local)) {
+          renamed = local;
+        } else if (imported === 'default' || imported === '*') {
+          renamed = this.getTopLevelName(`$${this.bundle.publicId}$${dep.specifier}`);
+        } else {
+          renamed = this.getTopLevelName(`$${this.bundle.publicId}$${imported}`);
         }
         external.set(imported, renamed);
         if (local !== '*' && replacements) {
-          let replacement = renamed;
-          if (property === '*') {
-            replacement = renamed;
-          } else if (property === 'default') {
-            replacement = `($parcel$interopDefault(${renamed}))`;
-            this.usedHelpers.add('$parcel$interopDefault');
-          } else if (property) {
-            replacement = this.getPropertyAccess(renamed, property);
-          }
-          replacements.set(local, replacement);
+          replacements.set(local, renamed);
         }
       }
     }
@@ -694,7 +649,8 @@ ${code}
     }
     return !this.bundle.hasAsset(resolved) && !this.externalAssets.has(resolved) || this.wrappedAssets.has(resolved.id) && resolved !== parentAsset;
   }
-  getSymbolResolution(parentAsset, resolved, imported, dep, replacements) {
+  getSymbolResolution(parentAsset, resolved, imported, dep) {
+    var _resolvedAsset$symbol;
     let {
       asset: resolvedAsset,
       exportSymbol,
@@ -732,7 +688,7 @@ ${code}
 
     // If this is an ESM default import of a CJS module with a `default` symbol,
     // and no __esModule flag, we need to resolve to the namespace instead.
-    let isDefaultInterop = exportSymbol === 'default' && staticExports && !isWrapped && ((dep === null || dep === void 0 ? void 0 : dep.meta.kind) === 'Import' || (dep === null || dep === void 0 ? void 0 : dep.meta.kind) === 'Export') && resolvedAsset.symbols.hasExportSymbol('*') && resolvedAsset.symbols.hasExportSymbol('default') && !resolvedAsset.symbols.hasExportSymbol('__esModule');
+    let isDefaultInterop = exportSymbol === 'default' && staticExports && !isWrapped && (dep === null || dep === void 0 ? void 0 : dep.meta.isESM) && resolvedAsset.symbols.hasExportSymbol('*') && resolvedAsset.symbols.hasExportSymbol('default') && !resolvedAsset.symbols.hasExportSymbol('__esModule');
 
     // Find the namespace object for the resolved module. If wrapped and this
     // is an inline require (not top-level), use a parcelRequire call, otherwise
@@ -740,17 +696,9 @@ ${code}
     // namespace export symbol.
     let assetId = resolvedAsset.meta.id;
     (0, _assert().default)(typeof assetId === 'string');
-    let obj;
-    if (isWrapped && (!dep || dep !== null && dep !== void 0 && dep.meta.shouldWrap)) {
-      // Wrap in extra parenthesis to not change semantics, e.g.`new (parcelRequire("..."))()`.
-      obj = `(parcelRequire(${JSON.stringify(publicId)}))`;
-    } else if (isWrapped && dep) {
-      obj = `$${publicId}`;
-    } else {
-      var _resolvedAsset$symbol;
-      obj = ((_resolvedAsset$symbol = resolvedAsset.symbols.get('*')) === null || _resolvedAsset$symbol === void 0 ? void 0 : _resolvedAsset$symbol.local) || `$${assetId}$exports`;
-      obj = (replacements === null || replacements === void 0 ? void 0 : replacements.get(obj)) || obj;
-    }
+    let obj = isWrapped && (!dep || dep !== null && dep !== void 0 && dep.meta.shouldWrap) ?
+    // Wrap in extra parenthesis to not change semantics, e.g.`new (parcelRequire("..."))()`.
+    `(parcelRequire(${JSON.stringify(publicId)}))` : isWrapped && dep ? `$${publicId}` : ((_resolvedAsset$symbol = resolvedAsset.symbols.get('*')) === null || _resolvedAsset$symbol === void 0 ? void 0 : _resolvedAsset$symbol.local) || `$${assetId}$exports`;
     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)) {
@@ -760,12 +708,12 @@ ${code}
         return obj;
       }
     } else if ((!staticExports || isWrapped || !symbol || isExternalCommonJS) && resolvedAsset !== parentAsset) {
+      var _dep$meta;
       // If the resolved asset is wrapped or has non-static exports,
       // we need to use a member access off the namespace object rather
       // than a direct reference. If importing default from a CJS module,
       // use a helper to check the __esModule flag at runtime.
-      let kind = dep === null || dep === void 0 ? void 0 : dep.meta.kind;
-      if ((!dep || kind === 'Import' || kind === 'Export') && exportSymbol === 'default' && resolvedAsset.symbols.hasExportSymbol('*') && this.needsDefaultInterop(resolvedAsset)) {
+      if ((!dep || (_dep$meta = dep.meta) !== null && _dep$meta !== void 0 && _dep$meta.isESM) && exportSymbol === 'default' && resolvedAsset.symbols.hasExportSymbol('*') && this.needsDefaultInterop(resolvedAsset)) {
         this.usedHelpers.add('$parcel$interopDefault');
         return `(/*@__PURE__*/$parcel$interopDefault(${obj}))`;
       } else {
@@ -774,7 +722,7 @@ ${code}
     } else if (!symbol) {
       (0, _assert().default)(false, 'Asset was skipped or not found.');
     } else {
-      return (replacements === null || replacements === void 0 ? void 0 : replacements.get(symbol)) || symbol;
+      return symbol;
     }
   }
   getHoistedParcelRequires(parentAsset, dep, resolved) {
@@ -801,7 +749,7 @@ ${code}
     }
     return [res, lineCount];
   }
-  buildAssetPrelude(asset, deps, replacements) {
+  buildAssetPrelude(asset, deps) {
     let prepend = '';
     let prependLineCount = 0;
     let append = '';
@@ -819,15 +767,13 @@ ${code}
     // 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.
-    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) && (0, _nullthrows().default)(this.bundleGraph.getUsedSymbols(dep)).has('*'))) ||
+    usedSymbols.has('*') && (this.bundle.env.outputFormat !== 'esmodule' || !this.bundle.env.isLibrary || asset !== this.bundle.getMainEntry() || this.bundleGraph.getIncomingDependencies(asset).some(dep => !dep.isEntry && (0, _nullthrows().default)(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.
     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),
     // include the namespace object for the default export.
-    this.exportedSymbols.has(`$${assetId}$exports`) ||
-    // CommonJS library bundle entries always need a namespace.
-    this.bundle.env.isLibrary && this.bundle.env.outputFormat === 'commonjs' && asset === this.bundle.getMainEntry();
+    this.exportedSymbols.has(`$${assetId}$exports`);
 
     // If the asset doesn't have static exports, should wrap, the namespace is used,
     // or we need default interop, then we need to synthesize a namespace object for
@@ -878,7 +824,7 @@ ${code}
             if (isWrapped || resolved.meta.staticExports === false || (0, _nullthrows().default)(this.bundleGraph.getUsedSymbols(resolved)).has('*') ||
             // an empty asset
             !resolved.meta.hasCJSExports && resolved.symbols.hasExportSymbol('*')) {
-              let obj = this.getSymbolResolution(asset, resolved, '*', dep, replacements);
+              let obj = this.getSymbolResolution(asset, resolved, '*', dep);
               append += `$parcel$exportWildcard($${assetId}$exports, ${obj});\n`;
               this.usedHelpers.add('$parcel$exportWildcard');
             } else {
@@ -888,7 +834,7 @@ ${code}
                 symbol === '__esModule') {
                   continue;
                 }
-                let resolvedSymbol = this.getSymbolResolution(asset, resolved, symbol, undefined, replacements);
+                let resolvedSymbol = this.getSymbolResolution(asset, resolved, symbol);
                 let get = this.buildFunctionExpression([], resolvedSymbol);
                 let set = asset.meta.hasCJSExports ? ', ' + this.buildFunctionExpression(['v'], `${resolvedSymbol} = v`) : '';
                 prepend += `$parcel$export($${assetId}$exports, ${JSON.stringify(symbol)}, ${get}${set});\n`;
@@ -927,7 +873,7 @@ ${code}
         // additional assignments after each mutation of the original binding.
         prepend += `\n${usedExports.map(exp => {
           var _asset$symbols$get2;
-          let resolved = this.getSymbolResolution(asset, asset, exp, undefined, replacements);
+          let resolved = this.getSymbolResolution(asset, asset, exp);
           let get = this.buildFunctionExpression([], resolved);
           let isEsmExport = !!((_asset$symbols$get2 = asset.symbols.get(exp)) !== null && _asset$symbols$get2 !== void 0 && (_asset$symbols$get2 = _asset$symbols$get2.meta) !== null && _asset$symbols$get2 !== void 0 && _asset$symbols$get2.isEsm);
           let set = !isEsmExport && asset.meta.hasCJSExports ? ', ' + this.buildFunctionExpression(['v'], `${resolved} = v`) : '';

package/lib/utils.js

@@ -4,8 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getSpecifier = getSpecifier;
-exports.isValidIdentifier = isValidIdentifier;
-exports.makeValidIdentifier = makeValidIdentifier;
 exports.replaceScriptDependencies = replaceScriptDependencies;
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
@@ -50,19 +48,4 @@ function getSpecifier(dep) {
     return dep.meta.placeholder;
   }
   return dep.specifier;
-}
-
-// https://262.ecma-international.org/6.0/#sec-names-and-keywords
-const IDENTIFIER_RE = /^[$_\p{ID_Start}][$_\u200C\u200D\p{ID_Continue}]*$/u;
-const ID_START_RE = /^[$_\p{ID_Start}]/u;
-const NON_ID_CONTINUE_RE = /[^$_\u200C\u200D\p{ID_Continue}]/gu;
-function isValidIdentifier(id) {
-  return IDENTIFIER_RE.test(id);
-}
-function makeValidIdentifier(name) {
-  name = name.replace(NON_ID_CONTINUE_RE, '');
-  if (!ID_START_RE.test(name)) {
-    name = '_' + name;
-  }
-  return name;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/packager-js",
-  "version": "2.0.0-canary.1542+b6281c770",
+  "version": "2.0.0-dev.1424+7f6b4dbbc",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -17,17 +17,17 @@
   "source": "src/index.js",
   "engines": {
     "node": ">= 12.0.0",
-    "parcel": "^2.0.0-canary.1540+b6281c770"
+    "parcel": "^2.0.0-dev.1422+7f6b4dbbc"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.0.0-canary.1542+b6281c770",
-    "@parcel/plugin": "2.0.0-canary.1542+b6281c770",
-    "@parcel/rust": "2.12.1-canary.3165+b6281c770",
+    "@parcel/diagnostic": "2.0.0-dev.1424+7f6b4dbbc",
+    "@parcel/plugin": "2.0.0-dev.1424+7f6b4dbbc",
+    "@parcel/rust": "2.12.1-dev.3238+7f6b4dbbc",
     "@parcel/source-map": "^2.1.1",
-    "@parcel/types": "2.0.0-canary.1542+b6281c770",
-    "@parcel/utils": "2.0.0-canary.1542+b6281c770",
+    "@parcel/types": "2.0.0-dev.1424+7f6b4dbbc",
+    "@parcel/utils": "2.0.0-dev.1424+7f6b4dbbc",
     "globals": "^13.2.0",
     "nullthrows": "^1.1.1"
   },
-  "gitHead": "b6281c77053015bce0e5b715b0f8d187be177479"
+  "gitHead": "7f6b4dbbc56a203e0fce8794856c03598c4f6708"
 }

package/src/ESMOutputFormat.js

@@ -3,7 +3,6 @@ import type {
   ScopeHoistingPackager,
   OutputFormat,
 } from './ScopeHoistingPackager';
-import {isValidIdentifier} from './utils';
 
 export class ESMOutputFormat implements OutputFormat {
   packager: ScopeHoistingPackager;
@@ -26,9 +25,6 @@ export class ESMOutputFormat implements OutputFormat {
           namespaceSpecifier = `* as ${symbol}`;
         } else {
           let specifier = imported;
-          if (!isValidIdentifier(specifier)) {
-            specifier = JSON.stringify(specifier);
-          }
           if (symbol !== imported) {
             specifier += ` as ${symbol}`;
           }
@@ -97,10 +93,7 @@ export class ESMOutputFormat implements OutputFormat {
 
       for (let as of exportAs) {
         let specifier = local;
-        if (as !== local) {
-          if (!isValidIdentifier(as)) {
-            as = JSON.stringify(as);
-          }
+        if (exportAs !== local) {
           specifier += ` as ${as}`;
         }
 

package/src/ScopeHoistingPackager.js

@@ -28,12 +28,12 @@ import {ESMOutputFormat} from './ESMOutputFormat';
 import {CJSOutputFormat} from './CJSOutputFormat';
 import {GlobalOutputFormat} from './GlobalOutputFormat';
 import {prelude, helpers, bundleQueuePrelude, fnExpr} from './helpers';
-import {
-  replaceScriptDependencies,
-  getSpecifier,
-  isValidIdentifier,
-  makeValidIdentifier,
-} from './utils';
+import {replaceScriptDependencies, getSpecifier} from './utils';
+
+// https://262.ecma-international.org/6.0/#sec-names-and-keywords
+const IDENTIFIER_RE = /^[$_\p{ID_Start}][$_\u200C\u200D\p{ID_Continue}]*$/u;
+const ID_START_RE = /^[$_\p{ID_Start}]/u;
+const NON_ID_CONTINUE_RE = /[^$_\u200C\u200D\p{ID_Continue}]/gu;
 
 // 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.
@@ -134,10 +134,25 @@ export class ScopeHoistingPackager {
       this.bundle.env.isLibrary ||
       this.bundle.env.outputFormat === 'commonjs'
     ) {
-      for (let b of this.bundleGraph.getReferencedBundles(this.bundle, {
-        recursive: false,
-      })) {
-        this.externals.set(relativeBundlePath(this.bundle, b), new Map());
+      for (let b of this.bundleGraph.getReferencedBundles(this.bundle)) {
+        let entry = b.getMainEntry();
+        let symbols = new Map();
+        if (entry && !this.isAsyncBundle && entry.type === 'js') {
+          this.externalAssets.add(entry);
+
+          let usedSymbols = this.bundleGraph.getUsedSymbols(entry) || new Set();
+          for (let s of usedSymbols) {
+            // If the referenced bundle is ESM, and we are importing '*', use 'default' instead.
+            // This matches the logic below in buildExportedSymbols.
+            let imported = s;
+            if (imported === '*' && b.env.outputFormat === 'esmodule') {
+              imported = 'default';
+            }
+            symbols.set(imported, this.getSymbolResolution(entry, entry, s));
+          }
+        }
+
+        this.externals.set(relativeBundlePath(this.bundle, b), symbols);
       }
     }
 
@@ -309,6 +324,7 @@ export class ScopeHoistingPackager {
 
       if (
         asset.meta.shouldWrap ||
+        this.isAsyncBundle ||
         this.bundle.env.sourceType === 'script' ||
         this.bundleGraph.isAssetReferenced(this.bundle, asset) ||
         this.bundleGraph
@@ -345,6 +361,7 @@ export class ScopeHoistingPackager {
 
   buildExportedSymbols() {
     if (
+      this.isAsyncBundle ||
       !this.bundle.env.isLibrary ||
       this.bundle.env.outputFormat !== 'esmodule'
     ) {
@@ -354,8 +371,6 @@ export class ScopeHoistingPackager {
     // TODO: handle ESM exports of wrapped entry assets...
     let entry = this.bundle.getMainEntry();
     if (entry && !this.wrappedAssets.has(entry.id)) {
-      let hasNamespace = entry.symbols.hasExportSymbol('*');
-
       for (let {
         asset,
         exportAs,
@@ -363,13 +378,6 @@ export class ScopeHoistingPackager {
         exportSymbol,
       } of this.bundleGraph.getExportedSymbols(entry)) {
         if (typeof symbol === 'string') {
-          // If the module has a namespace (e.g. commonjs), and this is not an entry, only export the namespace
-          // as default, without individual exports. This mirrors the importing logic in addExternal, avoiding
-          // extra unused exports and potential for non-identifier export names.
-          if (hasNamespace && this.isAsyncBundle && exportAs !== '*') {
-            continue;
-          }
-
           let symbols = this.exportedSymbols.get(
             symbol === '*' ? nullthrows(entry.symbols.get('*')?.local) : symbol,
           )?.exportAs;
@@ -410,8 +418,8 @@ export class ScopeHoistingPackager {
   }
 
   getTopLevelName(name: string): string {
-    name = makeValidIdentifier(name);
-    if (this.globalNames.has(name)) {
+    name = name.replace(NON_ID_CONTINUE_RE, '');
+    if (!ID_START_RE.test(name) || this.globalNames.has(name)) {
       name = '_' + name;
     }
 
@@ -426,7 +434,7 @@ export class ScopeHoistingPackager {
   }
 
   getPropertyAccess(obj: string, property: string): string {
-    if (isValidIdentifier(property)) {
+    if (IDENTIFIER_RE.test(property)) {
       return `${obj}.${property}`;
     }
 
@@ -503,11 +511,7 @@ export class ScopeHoistingPackager {
     }
 
     let [depMap, replacements] = this.buildReplacements(asset, deps);
-    let [prepend, prependLines, append] = this.buildAssetPrelude(
-      asset,
-      deps,
-      replacements,
-    );
+    let [prepend, prependLines, append] = this.buildAssetPrelude(asset, deps);
     if (prependLines > 0) {
       sourceMap?.offsetLines(1, prependLines);
       code = prepend + code;
@@ -672,7 +676,7 @@ ${code}
       depMap
         .get(
           `${assetId}:${getSpecifier(dep)}${
-            !dep.meta.placeholder ? specifierType : ''
+            dep.meta.isESM ? specifierType : ''
           }`,
         )
         .push(dep);
@@ -699,24 +703,6 @@ ${code}
         continue;
       }
 
-      // Handle imports from other bundles in libraries.
-      if (this.bundle.env.isLibrary && !this.bundle.hasAsset(resolved)) {
-        let referencedBundle = this.bundleGraph.getReferencedBundle(
-          dep,
-          this.bundle,
-        );
-        if (
-          referencedBundle &&
-          referencedBundle.getMainEntry() === resolved &&
-          referencedBundle.type === 'js' &&
-          !this.bundleGraph.isAssetReferenced(referencedBundle, resolved)
-        ) {
-          this.addExternal(dep, replacements, referencedBundle);
-          this.externalAssets.add(resolved);
-          continue;
-        }
-      }
-
       for (let [imported, {local}] of dep.symbols) {
         if (local === '*') {
           continue;
@@ -762,11 +748,7 @@ ${code}
     return [depMap, replacements];
   }
 
-  addExternal(
-    dep: Dependency,
-    replacements?: Map<string, string>,
-    referencedBundle?: NamedBundle,
-  ) {
+  addExternal(dep: Dependency, replacements?: Map<string, string>) {
     if (this.bundle.env.outputFormat === 'global') {
       throw new ThrowableDiagnostic({
         diagnostic: {
@@ -784,16 +766,11 @@ ${code}
       });
     }
 
-    let specifier = dep.specifier;
-    if (referencedBundle) {
-      specifier = relativeBundlePath(this.bundle, referencedBundle);
-    }
-
     // Map of DependencySpecifier -> Map<ExportedSymbol, Identifier>>
-    let external = this.externals.get(specifier);
+    let external = this.externals.get(dep.specifier);
     if (!external) {
       external = new Map();
-      this.externals.set(specifier, external);
+      this.externals.set(dep.specifier, external);
     }
 
     for (let [imported, {local}] of dep.symbols) {
@@ -809,16 +786,9 @@ ${code}
       if (this.bundle.env.outputFormat === 'commonjs') {
         renamed = external.get('*');
         if (!renamed) {
-          if (referencedBundle) {
-            let entry = nullthrows(referencedBundle.getMainEntry());
-            renamed =
-              entry.symbols.get('*')?.local ??
-              `$${String(entry.meta.id)}$exports`;
-          } else {
-            renamed = this.getTopLevelName(
-              `$${this.bundle.publicId}$${specifier}`,
-            );
-          }
+          renamed = this.getTopLevelName(
+            `$${this.bundle.publicId}$${dep.specifier}`,
+          );
 
           external.set('*', renamed);
         }
@@ -837,67 +807,24 @@ ${code}
           replacements.set(local, replacement);
         }
       } else {
-        let property;
-        if (referencedBundle) {
-          let entry = nullthrows(referencedBundle.getMainEntry());
-          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;
-            imported =
-              referencedBundle?.env.outputFormat === 'esmodule'
-                ? 'default'
-                : '*';
-          } else {
-            if (imported === '*') {
-              let exportedSymbols = this.bundleGraph.getExportedSymbols(entry);
-              if (local === '*') {
-                // Re-export all symbols.
-                for (let exported of exportedSymbols) {
-                  if (exported.symbol) {
-                    external.set(exported.exportSymbol, exported.symbol);
-                  }
-                }
-                continue;
-              }
-            }
-            renamed = this.bundleGraph.getSymbolResolution(
-              entry,
-              imported,
-              this.bundle,
-            ).symbol;
-          }
-        }
-
         // Rename the specifier so that multiple local imports of the same imported specifier
         // are deduplicated. We have to prefix the imported name with the bundle id so that
         // local variables do not shadow it.
-        if (!renamed) {
-          if (this.exportedSymbols.has(local)) {
-            renamed = local;
-          } else if (imported === 'default' || imported === '*') {
-            renamed = this.getTopLevelName(
-              `$${this.bundle.publicId}$${specifier}`,
-            );
-          } else {
-            renamed = this.getTopLevelName(
-              `$${this.bundle.publicId}$${imported}`,
-            );
-          }
+        if (this.exportedSymbols.has(local)) {
+          renamed = local;
+        } else if (imported === 'default' || imported === '*') {
+          renamed = this.getTopLevelName(
+            `$${this.bundle.publicId}$${dep.specifier}`,
+          );
+        } else {
+          renamed = this.getTopLevelName(
+            `$${this.bundle.publicId}$${imported}`,
+          );
         }
 
         external.set(imported, renamed);
         if (local !== '*' && replacements) {
-          let replacement = renamed;
-          if (property === '*') {
-            replacement = renamed;
-          } else if (property === 'default') {
-            replacement = `($parcel$interopDefault(${renamed}))`;
-            this.usedHelpers.add('$parcel$interopDefault');
-          } else if (property) {
-            replacement = this.getPropertyAccess(renamed, property);
-          }
-          replacements.set(local, replacement);
+          replacements.set(local, renamed);
         }
       }
     }
@@ -922,7 +849,6 @@ ${code}
     resolved: Asset,
     imported: string,
     dep?: Dependency,
-    replacements?: Map<string, string>,
   ): string {
     let {
       asset: resolvedAsset,
@@ -985,7 +911,7 @@ ${code}
       exportSymbol === 'default' &&
       staticExports &&
       !isWrapped &&
-      (dep?.meta.kind === 'Import' || dep?.meta.kind === 'Export') &&
+      dep?.meta.isESM &&
       resolvedAsset.symbols.hasExportSymbol('*') &&
       resolvedAsset.symbols.hasExportSymbol('default') &&
       !resolvedAsset.symbols.hasExportSymbol('__esModule');
@@ -996,16 +922,13 @@ ${code}
     // namespace export symbol.
     let assetId = resolvedAsset.meta.id;
     invariant(typeof assetId === 'string');
-    let obj;
-    if (isWrapped && (!dep || dep?.meta.shouldWrap)) {
-      // Wrap in extra parenthesis to not change semantics, e.g.`new (parcelRequire("..."))()`.
-      obj = `(parcelRequire(${JSON.stringify(publicId)}))`;
-    } else if (isWrapped && dep) {
-      obj = `$${publicId}`;
-    } else {
-      obj = resolvedAsset.symbols.get('*')?.local || `$${assetId}$exports`;
-      obj = replacements?.get(obj) || obj;
-    }
+    let obj =
+      isWrapped && (!dep || dep?.meta.shouldWrap)
+        ? // Wrap in extra parenthesis to not change semantics, e.g.`new (parcelRequire("..."))()`.
+          `(parcelRequire(${JSON.stringify(publicId)}))`
+        : isWrapped && dep
+        ? `$${publicId}`
+        : resolvedAsset.symbols.get('*')?.local || `$${assetId}$exports`;
 
     if (imported === '*' || exportSymbol === '*' || isDefaultInterop) {
       // Resolve to the namespace object if requested or this is a CJS default interop reqiure.
@@ -1026,9 +949,8 @@ ${code}
       // we need to use a member access off the namespace object rather
       // than a direct reference. If importing default from a CJS module,
       // use a helper to check the __esModule flag at runtime.
-      let kind = dep?.meta.kind;
       if (
-        (!dep || kind === 'Import' || kind === 'Export') &&
+        (!dep || dep.meta?.isESM) &&
         exportSymbol === 'default' &&
         resolvedAsset.symbols.hasExportSymbol('*') &&
         this.needsDefaultInterop(resolvedAsset)
@@ -1041,7 +963,7 @@ ${code}
     } else if (!symbol) {
       invariant(false, 'Asset was skipped or not found.');
     } else {
-      return replacements?.get(symbol) || symbol;
+      return symbol;
     }
   }
 
@@ -1088,7 +1010,6 @@ ${code}
   buildAssetPrelude(
     asset: Asset,
     deps: Array<Dependency>,
-    replacements: Map<string, string>,
   ): [string, number, string] {
     let prepend = '';
     let prependLineCount = 0;
@@ -1121,7 +1042,6 @@ ${code}
             .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,
@@ -1130,11 +1050,7 @@ ${code}
         [...usedSymbols].some(s => !asset.symbols.hasExportSymbol(s))) ||
       // If the exports has this asset's namespace (e.g. ESM output from CJS input),
       // include the namespace object for the default export.
-      this.exportedSymbols.has(`$${assetId}$exports`) ||
-      // CommonJS library bundle entries always need a namespace.
-      (this.bundle.env.isLibrary &&
-        this.bundle.env.outputFormat === 'commonjs' &&
-        asset === this.bundle.getMainEntry());
+      this.exportedSymbols.has(`$${assetId}$exports`);
 
     // If the asset doesn't have static exports, should wrap, the namespace is used,
     // or we need default interop, then we need to synthesize a namespace object for
@@ -1201,13 +1117,7 @@ ${code}
               (!resolved.meta.hasCJSExports &&
                 resolved.symbols.hasExportSymbol('*'))
             ) {
-              let obj = this.getSymbolResolution(
-                asset,
-                resolved,
-                '*',
-                dep,
-                replacements,
-              );
+              let obj = this.getSymbolResolution(asset, resolved, '*', dep);
               append += `$parcel$exportWildcard($${assetId}$exports, ${obj});\n`;
               this.usedHelpers.add('$parcel$exportWildcard');
             } else {
@@ -1225,8 +1135,6 @@ ${code}
                   asset,
                   resolved,
                   symbol,
-                  undefined,
-                  replacements,
                 );
                 let get = this.buildFunctionExpression([], resolvedSymbol);
                 let set = asset.meta.hasCJSExports
@@ -1273,13 +1181,7 @@ ${code}
         // additional assignments after each mutation of the original binding.
         prepend += `\n${usedExports
           .map(exp => {
-            let resolved = this.getSymbolResolution(
-              asset,
-              asset,
-              exp,
-              undefined,
-              replacements,
-            );
+            let resolved = this.getSymbolResolution(asset, asset, exp);
             let get = this.buildFunctionExpression([], resolved);
             let isEsmExport = !!asset.symbols.get(exp)?.meta?.isEsm;
             let set =

package/src/utils.js

@@ -55,20 +55,3 @@ export function getSpecifier(dep: Dependency): string {
 
   return dep.specifier;
 }
-
-// https://262.ecma-international.org/6.0/#sec-names-and-keywords
-const IDENTIFIER_RE = /^[$_\p{ID_Start}][$_\u200C\u200D\p{ID_Continue}]*$/u;
-const ID_START_RE = /^[$_\p{ID_Start}]/u;
-const NON_ID_CONTINUE_RE = /[^$_\u200C\u200D\p{ID_Continue}]/gu;
-
-export function isValidIdentifier(id: string): boolean {
-  return IDENTIFIER_RE.test(id);
-}
-
-export function makeValidIdentifier(name: string): string {
-  name = name.replace(NON_ID_CONTINUE_RE, '');
-  if (!ID_START_RE.test(name)) {
-    name = '_' + name;
-  }
-  return name;
-}