@@ -35,26 +35,6 @@ const Dependency = require("../graph/Dependency");
3535 * @property {Module } originModule the lazy barrel module
3636 */
3737
38- /**
39- * Collects the export names a dependency group requests from its target.
40- * @param {Dependency[] } dependencies dependency group resolving to one module
41- * @returns {Set<string> | true } requested export names, true for all
42- */
43- function getForwardedIds ( dependencies ) {
44- /** @type {Set<string> } */
45- const ids = new Set ( ) ;
46- for ( const dependency of dependencies ) {
47- // TODO in the next major release: remove
48- // It may be missing on custom dependency types not extending the base Dependency
49- if ( ! ( "getForwardId" in dependency ) ) continue ;
50-
51- const id = dependency . getForwardId ( ) ;
52- if ( id === true ) return true ;
53- if ( id !== null ) ids . add ( id ) ;
54- }
55- return ids ;
56- }
57-
5838/**
5939 * Tracks the deferred (not yet factorized/built) dependencies of a
6040 * side-effect-free barrel module and which export names resolve to them.
@@ -419,10 +399,18 @@ class LazyBarrelController {
419399 const modules = this . _modules ;
420400 const state = modules . get ( module ) ;
421401
422- const getRequestedIds = ( ) => {
423- const directIds = getForwardedIds ( dependencies ) ;
424- if ( directIds !== true && directIds . size !== 0 ) return directIds ;
402+ /**
403+ * @returns {Set<string> | true } requested export names, true for all
404+ */
405+ const getForwardedIds = ( ) => {
406+ /** @type {Set<string> } */
407+ const ids = new Set ( ) ;
425408 for ( const dependency of dependencies ) {
409+ // TODO in the next major release: remove
410+ // It may be missing on custom dependency types not extending the base Dependency
411+ if ( ! ( "getForwardId" in dependency ) ) continue ;
412+
413+ // star re-export: forward the barrel's names, merged with named re-exports of the same request
426414 if (
427415 "getLazyUntil" in dependency &&
428416 dependency . getLazyUntil ( ) === Dependency . LAZY_UNTIL_FALLBACK
@@ -432,15 +420,19 @@ class LazyBarrelController {
432420 const parentState =
433421 parent === undefined ? undefined : modules . get ( parent ) ;
434422 if ( parentState !== undefined ) {
435- return parentState . forwardedIds ;
423+ if ( parentState . forwardedIds === true ) return true ;
424+ for ( const id of parentState . forwardedIds ) ids . add ( id ) ;
425+ continue ;
436426 }
437427 }
428+ const id = dependency . getForwardId ( ) ;
429+ if ( id === true ) return true ;
430+ if ( id !== null ) ids . add ( id ) ;
438431 }
439- if ( directIds === true || directIds . size !== 0 ) return directIds ;
440- return directIds ;
432+ return ids ;
441433 } ;
442434 if ( state === undefined ) {
443- const forwardedIds = getRequestedIds ( ) ;
435+ const forwardedIds = getForwardedIds ( ) ;
444436 if ( forwardedIds !== true && forwardedIds . size === 0 ) return ;
445437 modules . set ( module , {
446438 forwardedIds,
@@ -449,7 +441,7 @@ class LazyBarrelController {
449441 return ;
450442 }
451443
452- const forwardedIds = getRequestedIds ( ) ;
444+ const forwardedIds = getForwardedIds ( ) ;
453445 if ( forwardedIds !== true && forwardedIds . size === 0 ) return ;
454446 if ( state . forwardedIds !== true ) {
455447 if ( forwardedIds === true ) state . forwardedIds = true ;
0 commit comments