@@ -322,11 +322,17 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
322322
323323 /**
324324 * @param {boolean } hasAsyncRuntime if async module is used.
325+ * @param {boolean } sealed a call site builds a namespace from a known export list
326+ * @param {boolean } synthesized a call site builds one from the module's exports
325327 */
326- constructor ( hasAsyncRuntime ) {
328+ constructor ( hasAsyncRuntime , sealed , synthesized ) {
327329 super ( "make deferred namespace object" ) ;
328330 /** @type {boolean } */
329331 this . hasAsyncRuntime = hasAsyncRuntime ;
332+ /** @type {boolean } */
333+ this . sealed = sealed ;
334+ /** @type {boolean } */
335+ this . synthesized = synthesized ;
330336 }
331337
332338 /**
@@ -340,6 +346,10 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
340346 const lt = runtimeTemplate . renderLet ( ) ;
341347 const fn = RuntimeGlobals . makeDeferredNamespaceObject ;
342348 const hasAsync = this . hasAsyncRuntime ;
349+ // A build reaches only the shapes its call sites ask for, so the other
350+ // one's branches are dead weight in every bundle that ships this runtime.
351+ const sealed = this . sealed ;
352+ const synthesized = this . synthesized ;
343353 const init = `${ runtimeTemplate . optionalChaining ( "init" , "()" ) } ;` ;
344354 return `${ fn } = ${ runtimeTemplate . basicFunction (
345355 "moduleId, mode, exportNames" ,
@@ -369,20 +379,28 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
369379 "mode &= ~16;" ,
370380 // Only a real ES module namespace has the spec's exotic shape; a
371381 // synthesized one (JSON, asset, CommonJS interop) keeps the old form.
372- "if (!(mode & 8)) exportNames = undefined;" ,
382+ sealed && synthesized
383+ ? "if (!(mode & 8)) exportNames = undefined;"
384+ : "" ,
373385 `${ lt } byMode = __webpack_module_deferred_namespace_cache__[moduleId];` ,
374386 "if (byMode && byMode[mode] !== undefined) return byMode[mode];" ,
375387 "if (!byMode) byMode = __webpack_module_deferred_namespace_cache__[moduleId] = {};" ,
376- `${ cst } cachedModule = __webpack_module_cache__[moduleId];` ,
377- "if (cachedModule && cachedModule.error === undefined && !(mode & 8)) {" ,
378- Template . indent ( [
379- `${ lt } exports = cachedModule.exports;` ,
380- hasAsync
381- ? `if (${ RuntimeGlobals . asyncModuleExportSymbol } in exports) exports = exports[${ RuntimeGlobals . asyncModuleExportSymbol } ];`
382- : "" ,
383- `return byMode[mode] = ${ RuntimeGlobals . createFakeNamespaceObject } (exports, mode);`
384- ] ) ,
385- "}" ,
388+ synthesized
389+ ? `${ cst } cachedModule = __webpack_module_cache__[moduleId];`
390+ : "" ,
391+ synthesized
392+ ? "if (cachedModule && cachedModule.error === undefined && !(mode & 8)) {"
393+ : "" ,
394+ synthesized
395+ ? Template . indent ( [
396+ `${ lt } exports = cachedModule.exports;` ,
397+ hasAsync
398+ ? `if (${ RuntimeGlobals . asyncModuleExportSymbol } in exports) exports = exports[${ RuntimeGlobals . asyncModuleExportSymbol } ];`
399+ : "" ,
400+ `return byMode[mode] = ${ RuntimeGlobals . createFakeNamespaceObject } (exports, mode);`
401+ ] )
402+ : "" ,
403+ synthesized ? "}" : "" ,
386404 "" ,
387405 `${ lt } init = ${ runtimeTemplate . basicFunction ( "" , [
388406 // A deferred namespace that forces evaluation of a module that is
@@ -395,7 +413,9 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
395413 ? `if (${ RuntimeGlobals . asyncModuleExportSymbol } in ns) ns = ns[${ RuntimeGlobals . asyncModuleExportSymbol } ];`
396414 : "" ,
397415 "init = null;" ,
398- "if (mode & 8 || mode & 4 && ns.__esModule && typeof ns === 'object') {" ,
416+ synthesized
417+ ? "if (mode & 8 || mode & 4 && ns.__esModule && typeof ns === 'object') {"
418+ : "" ,
399419 Template . indent ( [
400420 // Drop only the read-side traps after init: with the
401421 // resolved namespace's own keys mirrored onto
@@ -416,20 +436,24 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
416436 // on the target instead of returning false.
417437 // A sealed target holds placeholder values, so the read traps stay to
418438 // keep the live bindings visible.
419- "if (!exportNames) {" ,
420- Template . indent ( [
421- "delete handler.get;" ,
422- "delete handler.has;" ,
423- "delete handler.ownKeys;" ,
424- "delete handler.getOwnPropertyDescriptor;"
425- ] ) ,
426- "}"
427- ] ) ,
428- "} else {" ,
429- Template . indent ( [
430- `ns = ${ RuntimeGlobals . createFakeNamespaceObject } (ns, mode);`
439+ sealed && synthesized ? "if (!exportNames) {" : "" ,
440+ synthesized
441+ ? Template . indent ( [
442+ "delete handler.get;" ,
443+ "delete handler.has;" ,
444+ "delete handler.ownKeys;" ,
445+ "delete handler.getOwnPropertyDescriptor;"
446+ ] )
447+ : "" ,
448+ sealed && synthesized ? "}" : ""
431449 ] ) ,
432- "}" ,
450+ synthesized ? "} else {" : "" ,
451+ synthesized
452+ ? Template . indent ( [
453+ `ns = ${ RuntimeGlobals . createFakeNamespaceObject } (ns, mode);`
454+ ] )
455+ : "" ,
456+ synthesized ? "}" : "" ,
433457 // Mirror own properties from the resolved namespace onto the proxy
434458 // target so that proxy invariants hold for callers that structurally
435459 // introspect via `Object.keys` / `Object.getOwnPropertyNames` /
@@ -443,18 +467,22 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
443467 // proposal, the [[StringTag]] of a Deferred Module Namespace
444468 // Exotic Object is "Deferred Module"), and the target was already
445469 // pre-populated with those values below.
446- `${ cst } keys = exportNames ? [] : Reflect.ownKeys(ns);` ,
447- "for (var i = 0; i < keys.length; i++) {" ,
448- Template . indent ( [
449- `${ cst } k = keys[i];` ,
450- 'if (k === "__esModule" || k === Symbol.toStringTag) continue;' ,
451- `if (!${ runtimeTemplate . objectHasOwn ( "ns_target" , "k" ) } ) {` ,
452- Template . indent ( [
453- "try { Object.defineProperty(ns_target, k, Reflect.getOwnPropertyDescriptor(ns, k)); } catch (_) {}"
454- ] ) ,
455- "}"
456- ] ) ,
457- "}"
470+ synthesized
471+ ? `${ cst } keys = ${ sealed ? "exportNames ? [] : " : "" } Reflect.ownKeys(ns);`
472+ : "" ,
473+ synthesized ? "for (var i = 0; i < keys.length; i++) {" : "" ,
474+ synthesized
475+ ? Template . indent ( [
476+ `${ cst } k = keys[i];` ,
477+ 'if (k === "__esModule" || k === Symbol.toStringTag) continue;' ,
478+ `if (!${ runtimeTemplate . objectHasOwn ( "ns_target" , "k" ) } ) {` ,
479+ Template . indent ( [
480+ "try { Object.defineProperty(ns_target, k, Reflect.getOwnPropertyDescriptor(ns, k)); } catch (_) {}"
481+ ] ) ,
482+ "}"
483+ ] )
484+ : "" ,
485+ synthesized ? "}" : ""
458486 ] ) } ;`,
459487 "" ,
460488 // The proxy target is a fresh placeholder, separate from
@@ -467,16 +495,22 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
467495 `${ cst } ns_target = { __proto__: null };` ,
468496 // With the export list known at build time the target carries the spec's
469497 // keys and is sealed, so `[[IsExtensible]]` is false up front.
470- "if (exportNames) for (var e = 0; e < exportNames.length; e++) ns_target[exportNames[e]] = undefined;" ,
498+ sealed
499+ ? `${ synthesized ? "if (exportNames) " : "" } for (var e = 0; e < exportNames.length; e++) ns_target[exportNames[e]] = undefined;`
500+ : "" ,
471501 // Pre-populate the synthetic deferred-namespace properties with
472502 // fully non-configurable, non-writable, non-enumerable descriptors
473503 // (matching the TC39 import-defer spec for Module Namespace
474504 // Exotic Objects). The trap returns the same descriptors below.
475505 // `__esModule` is not one of the spec's keys, so a sealed namespace omits
476506 // it; the synthesized form keeps it for interop.
477- 'if (!exportNames) Object.defineProperty(ns_target, "__esModule", { value: true });' ,
507+ synthesized
508+ ? `${ sealed ? "if (!exportNames) " : "" } Object.defineProperty(ns_target, "__esModule", { value: true });`
509+ : "" ,
478510 'Object.defineProperty(ns_target, Symbol.toStringTag, { value: "Deferred Module" });' ,
479- "if (exportNames) Object.seal(ns_target);" ,
511+ sealed
512+ ? `${ synthesized ? "if (exportNames) " : "" } Object.seal(ns_target);`
513+ : "" ,
480514 `${ lt } ns = ns_target;` ,
481515 `${ cst } handler = {` ,
482516 Template . indent ( [
@@ -502,14 +536,18 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
502536 init ,
503537 // A sealed namespace has exactly the spec's keys, so anything
504538 // else is absent rather than read off the exports object.
505- "if (exportNames) return name in ns_target ? ns[name] : undefined;" ,
506- "return ns[name];"
539+ sealed
540+ ? `${ synthesized ? "if (exportNames) " : "" } return name in ns_target ? ns[name] : undefined;`
541+ : "" ,
542+ synthesized ? "return ns[name];" : ""
507543 ] ) } ,`,
508544 `${ runtimeTemplate . method ( "has" , "_, name" , [
509545 "switch (name) {" ,
510546 Template . indent (
511547 [
512- 'case "__esModule": if (!exportNames) return true; break;' ,
548+ synthesized
549+ ? `case "__esModule": ${ sealed ? "if (!exportNames) " : "" } return true;${ sealed ? " break;" : "" } `
550+ : "" ,
513551 "case Symbol.toStringTag:" ,
514552 hasAsync
515553 ? `case ${ RuntimeGlobals . deferredModuleAsyncTransitiveDependenciesSymbol } :`
@@ -522,23 +560,31 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
522560 "}" ,
523561 'if (typeof name === "symbol") return name in ns_target;' ,
524562 init ,
525- "if (exportNames) return name in ns_target;" ,
526- "return name in ns;"
563+ sealed
564+ ? `${ synthesized ? "if (exportNames) " : "" } return name in ns_target;`
565+ : "" ,
566+ synthesized ? "return name in ns;" : ""
527567 ] ) } ,`,
528568 `${ runtimeTemplate . method ( "ownKeys" , "" , [
529569 init ,
530570 // The sealed target already carries the spec's keys, sorted.
531- "if (exportNames) return Reflect.ownKeys(ns_target);" ,
532- `${ cst } filtered = Reflect.ownKeys(ns).filter(${ runtimeTemplate . expressionFunction (
533- 'x !== "then" && x !== Symbol.toStringTag' ,
534- "x"
535- ) } );`,
536- `${ cst } keys = ${
537- runtimeTemplate . supportsSpread ( )
538- ? "[...filtered, Symbol.toStringTag]"
539- : "filtered.concat([Symbol.toStringTag])"
540- } ;`,
541- "return keys;"
571+ sealed
572+ ? `${ synthesized ? "if (exportNames) " : "" } return Reflect.ownKeys(ns_target);`
573+ : "" ,
574+ synthesized
575+ ? `${ cst } filtered = Reflect.ownKeys(ns).filter(${ runtimeTemplate . expressionFunction (
576+ 'x !== "then" && x !== Symbol.toStringTag' ,
577+ "x"
578+ ) } );`
579+ : "" ,
580+ synthesized
581+ ? `${ cst } keys = ${
582+ runtimeTemplate . supportsSpread ( )
583+ ? "[...filtered, Symbol.toStringTag]"
584+ : "filtered.concat([Symbol.toStringTag])"
585+ } ;`
586+ : "" ,
587+ synthesized ? "return keys;" : ""
542588 ] ) } ,`,
543589 `${ runtimeTemplate . method ( "getOwnPropertyDescriptor" , "_, name" , [
544590 "switch (name) {" ,
@@ -547,7 +593,9 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
547593 // (non-configurable, non-writable, non-enumerable) so the
548594 // proxy invariant holds for both the trap result and any
549595 // post-init forwarding via the deleted-handler path.
550- 'case "__esModule": if (!exportNames) return { value: true, writable: false, enumerable: false, configurable: false }; break;' ,
596+ synthesized
597+ ? `case "__esModule": ${ sealed ? "if (!exportNames) " : "" } return { value: true, writable: false, enumerable: false, configurable: false };${ sealed ? " break;" : "" } `
598+ : "" ,
551599 'case Symbol.toStringTag: return { value: "Deferred Module", writable: false, enumerable: false, configurable: false };' ,
552600 'case "then": return undefined;'
553601 ] ) ,
@@ -556,12 +604,18 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
556604 init ,
557605 // A namespace exposes data properties; webpack backs the exports
558606 // with getters, so the spec's shape is synthesized here.
559- "if (exportNames) return name in ns_target ? { value: ns[name], writable: true, enumerable: true, configurable: false } : undefined;" ,
560- `${ lt } desc = Reflect.getOwnPropertyDescriptor(ns, name);` ,
561- 'if (mode & 2 && name == "default" && !desc) {' ,
562- Template . indent ( "desc = { value: ns, configurable: true };" ) ,
563- "}" ,
564- "return desc;"
607+ sealed
608+ ? `${ synthesized ? "if (exportNames) " : "" } return name in ns_target ? { value: ns[name], writable: true, enumerable: true, configurable: false } : undefined;`
609+ : "" ,
610+ synthesized
611+ ? `${ lt } desc = Reflect.getOwnPropertyDescriptor(ns, name);`
612+ : "" ,
613+ synthesized ? 'if (mode & 2 && name == "default" && !desc) {' : "" ,
614+ synthesized
615+ ? Template . indent ( "desc = { value: ns, configurable: true };" )
616+ : "" ,
617+ synthesized ? "}" : "" ,
618+ synthesized ? "return desc;" : ""
565619 ] ) } ,`,
566620 // `defineProperty` always rejects, but per the TC39 spec it
567621 // must still trigger evaluation for string keys (the spec
0 commit comments