@@ -12,6 +12,7 @@ const HelperRuntimeModule = require("./HelperRuntimeModule");
1212/** @import { ModuleId } from "../ChunkGraph" */
1313/** @import Module, { RuntimeRequirements, ExportsType } from "../Module" */
1414/** @import ModuleGraph from "../ModuleGraph" */
15+ /** @import { RuntimeSpec } from "../util/runtime" */
1516
1617/**
1718 * @typedef {object } DeferredCycleState
@@ -490,20 +491,23 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
490491 `${ runtimeTemplate . method ( "get" , "_, name" , [
491492 "switch (name) {" ,
492493 Template . indent ( [
493- 'case "__esModule": return true;' ,
494+ 'case "__esModule": if (!exportNames) return true; break ;' ,
494495 'case Symbol.toStringTag: return "Deferred Module";' ,
495496 'case "then": return undefined;'
496497 ] ) ,
497498 "}" ,
498499 'if (typeof name === "symbol") return ns_target[name];' ,
499500 init ,
501+ // A sealed namespace has exactly the spec's keys, so anything
502+ // else is absent rather than read off the exports object.
503+ "if (exportNames) return exportNames.indexOf(name) < 0 ? undefined : ns[name];" ,
500504 "return ns[name];"
501505 ] ) } ,`,
502506 `${ runtimeTemplate . method ( "has" , "_, name" , [
503507 "switch (name) {" ,
504508 Template . indent (
505509 [
506- 'case "__esModule":' ,
510+ 'case "__esModule": if (!exportNames) return true; break; ' ,
507511 "case Symbol.toStringTag:" ,
508512 hasAsync
509513 ? `case ${ RuntimeGlobals . deferredModuleAsyncTransitiveDependenciesSymbol } :`
@@ -516,6 +520,7 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
516520 "}" ,
517521 'if (typeof name === "symbol") return name in ns_target;' ,
518522 init ,
523+ "if (exportNames) return exportNames.indexOf(name) >= 0;" ,
519524 "return name in ns;"
520525 ] ) } ,`,
521526 `${ runtimeTemplate . method ( "ownKeys" , "" , [
@@ -549,7 +554,7 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
549554 init ,
550555 // A namespace exposes data properties; webpack backs the exports
551556 // with getters, so the spec's shape is synthesized here.
552- "if (exportNames && exportNames.indexOf(name) >= 0) return { value: ns[name], writable: true, enumerable: true, configurable: false };" ,
557+ "if (exportNames) return exportNames.indexOf(name) < 0 ? undefined : { value: ns[name], writable: true, enumerable: true, configurable: false };" ,
553558 `${ lt } desc = Reflect.getOwnPropertyDescriptor(ns, name);` ,
554559 'if (mode & 2 && name == "default" && !desc) {' ,
555560 Template . indent ( "desc = { value: ns, configurable: true };" ) ,
@@ -588,12 +593,42 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
588593 }
589594}
590595
596+ /**
597+ * The module's export names, sorted, when the graph knows them exhaustively.
598+ * Bails out when a name is emitted mangled, since the runtime reads them off
599+ * the exports object.
600+ * @param {ModuleGraph } moduleGraph the module graph
601+ * @param {Module } module the deferred module
602+ * @param {RuntimeSpec } runtime the runtime
603+ * @returns {string[] | null } sorted export names, or null when unknown
604+ */
605+ const getKnownExportNames = ( moduleGraph , module , runtime ) => {
606+ const exportsInfo = moduleGraph . getExportsInfo ( module ) ;
607+ if ( exportsInfo . otherExportsInfo . provided !== false ) return null ;
608+ const names = [ ] ;
609+ for ( const exportInfo of exportsInfo . orderedExports ) {
610+ // `false` is a definitive "not an export" (webpack records `__esModule`
611+ // that way); anything but a definitive answer means the list is unknown.
612+ if ( exportInfo . provided === false ) continue ;
613+ if ( exportInfo . provided !== true ) return null ;
614+ // A namespace never exposes `then`, so it is not one of the spec's keys.
615+ if ( exportInfo . name === "then" ) continue ;
616+ const usedName = exportInfo . getUsedName ( exportInfo . name , runtime ) ;
617+ if ( typeof usedName === "string" && usedName !== exportInfo . name ) {
618+ return null ;
619+ }
620+ names . push ( exportInfo . name ) ;
621+ }
622+ return names . sort ( ) ;
623+ } ;
624+
591625module . exports . MakeDeferredNamespaceObjectRuntimeModule =
592626 MakeDeferredNamespaceObjectRuntimeModule ;
593627module . exports . MakeOptimizedDeferredNamespaceObjectRuntimeModule =
594628 MakeOptimizedDeferredNamespaceObjectRuntimeModule ;
595629module . exports . getDeferredCycleModuleIds = getDeferredCycleModuleIds ;
596630module . exports . getDeferredCycleModules = getDeferredCycleModules ;
631+ module . exports . getKnownExportNames = getKnownExportNames ;
597632module . exports . getMakeDeferredNamespaceModeFromExportsType =
598633 getMakeDeferredNamespaceModeFromExportsType ;
599634module . exports . getOptimizedDeferredModule = getOptimizedDeferredModule ;
0 commit comments