@@ -10,8 +10,6 @@ interface GlobalConfig {
1010 '@embroider/core' ?: { active : boolean } ;
1111}
1212
13- type EngineInfoByRoute = Record < string , { name : string } > ;
14-
1513let Router : typeof EmberRouter ;
1614
1715interface GetRoute {
@@ -20,25 +18,40 @@ interface GetRoute {
2018}
2119
2220interface Internals {
21+ _engineInfoByRoute : Record < string , { name : string } > ;
2322 _routerMicrolib : {
2423 getRoute : GetRoute ;
2524 } ;
2625}
2726
27+ interface EmbroiderBundle {
28+ names : string [ ] ;
29+ loaded ?: true ;
30+ load : ( ) => Promise < void > ;
31+ }
32+
2833if ( macroCondition ( getGlobalConfig < GlobalConfig > ( ) [ '@embroider/core' ] ?. active ?? false ) ) {
2934 const waiter = buildWaiter ( '@embroider/router:lazy-route-waiter' ) ;
3035
3136 function embroiderBundles ( ) : {
32- _embroiderEngineBundles_ ?: { names : string [ ] ; loaded ?: true ; load : ( ) => Promise < void > } [ ] ;
33- _embroiderRouteBundles_ ?: { names : string [ ] ; loaded ?: true ; load : ( ) => Promise < void > } [ ] ;
37+ _embroiderEngineBundles_ ?: EmbroiderBundle [ ] ;
38+ _embroiderRouteBundles_ ?: EmbroiderBundle [ ] ;
3439 } {
3540 return window as ReturnType < typeof embroiderBundles > ;
3641 }
3742
3843 class EmbroiderRouter extends EmberRouter {
39- private lazyBundle ( routeName : string ) {
40- let engineInfoByRoute = ( this as unknown as { _engineInfoByRoute : EngineInfoByRoute } ) . _engineInfoByRoute ;
44+ private seenByRoute = new Set < string > ( ) ;
4145
46+ private lazyRoute ( this : this & Internals , routeName : string ) : EmbroiderBundle | undefined {
47+ let bundles = embroiderBundles ( ) ;
48+ if ( bundles . _embroiderRouteBundles_ ) {
49+ return bundles . _embroiderRouteBundles_ . find ( bundle => bundle . names . indexOf ( routeName ) !== - 1 ) ;
50+ }
51+ return undefined ;
52+ }
53+
54+ private lazyEngine ( this : this & Internals , routeName : string ) : EmbroiderBundle | undefined {
4255 // Here we map engine names to route names. We need to do this because
4356 // engines can be specified with "as" such as:
4457 //
@@ -48,28 +61,42 @@ if (macroCondition(getGlobalConfig<GlobalConfig>()['@embroider/core']?.active ??
4861 // router is dynamic and the string could be defined as anything. Luckly, this._engineInfoByRoute contains
4962 // mappings from routeName to the engines "original name" (which we know at build time).
5063 let bundles = embroiderBundles ( ) ;
51- let engine = engineInfoByRoute [ routeName ] ;
64+ let engine = this . _engineInfoByRoute [ routeName ] ;
5265 if ( engine && bundles . _embroiderEngineBundles_ ) {
5366 let engineName = engine . name ;
5467 return bundles . _embroiderEngineBundles_ . find ( bundle => bundle . names . indexOf ( engineName ) !== - 1 ) ;
5568 }
69+ return undefined ;
70+ }
5671
57- if ( bundles . _embroiderRouteBundles_ ) {
58- return bundles . _embroiderRouteBundles_ . find ( bundle => bundle . names . indexOf ( routeName ) !== - 1 ) ;
59- }
60-
61- return false ;
72+ private isEngine ( this : this & Internals , name : string ) : boolean {
73+ return Boolean ( this . _engineInfoByRoute [ name ] ) ;
6274 }
6375
6476 // This is necessary in order to prevent the premature loading of lazy routes
6577 // when we are merely trying to render a link-to that points at them.
6678 // Unfortunately the stock query parameter behavior pulls on routes just to
6779 // check what their previous QP values were.
68- _getQPMeta ( handlerInfo : { name : string } , ...rest : unknown [ ] ) {
69- let bundle = this . lazyBundle ( handlerInfo . name ) ;
80+ _getQPMeta ( this : this & Internals , handlerInfo : { name : string } , ...rest : unknown [ ] ) {
81+ let bundle = this . lazyRoute ( handlerInfo . name ) ;
7082 if ( bundle && ! bundle . loaded ) {
83+ // unloaded split routes
84+ return undefined ;
85+ }
86+
87+ if ( this . isEngine ( handlerInfo . name ) && ! this . seenByRoute . has ( handlerInfo . name ) ) {
88+ // unvisited engines, whether loaded or not, because the same bundle
89+ // could by mounted multiple places and engines expect to only run the
90+ // super._getQPMeta after they've been visited.
7191 return undefined ;
7292 }
93+
94+ bundle = this . lazyEngine ( handlerInfo . name ) ;
95+ if ( bundle && ! bundle . loaded ) {
96+ // unloaded lazy engines
97+ return undefined ;
98+ }
99+
73100 // @ts -expect-error extending private method
74101 return super . _getQPMeta ( handlerInfo , ...rest ) ;
75102 }
@@ -86,9 +113,10 @@ if (macroCondition(getGlobalConfig<GlobalConfig>()['@embroider/core']?.active ??
86113 return isSetup ;
87114 }
88115
89- private _handlerResolver ( original : ( name : string ) => unknown ) {
116+ private _handlerResolver ( this : this & Internals , original : ( name : string ) => unknown ) {
90117 let handler = ( ( name : string ) => {
91- const bundle = this . lazyBundle ( name ) ;
118+ const bundle = this . lazyRoute ( name ) ?? this . lazyEngine ( name ) ;
119+ this . seenByRoute . add ( name ) ;
92120 if ( ! bundle || bundle . loaded ) {
93121 return original ( name ) ;
94122 }
0 commit comments