File tree Expand file tree Collapse file tree 1 file changed +11
-2
lines changed
libs/angular-three/src/lib/di Expand file tree Collapse file tree 1 file changed +11
-2
lines changed Original file line number Diff line number Diff line change @@ -7,13 +7,22 @@ export function createRunInContext() {
7
7
const originalGet = envInjector . get . bind ( envInjector ) ;
8
8
9
9
return < TReturn > ( cb : ( ) => TReturn ) : TReturn => {
10
+ let tryFromNodeInjector = false ;
10
11
envInjector . get = ( ...args : Parameters < EnvironmentInjector [ 'get' ] > ) => {
11
12
try {
12
- const fromNodeInjector = nodeInjector . get ( ...( args as Parameters < Injector [ 'get' ] > ) ) ;
13
- if ( fromNodeInjector ) return fromNodeInjector ;
13
+ if ( ! tryFromNodeInjector ) {
14
+ tryFromNodeInjector = true ;
15
+ const fromNodeInjector = nodeInjector . get ( ...( args as Parameters < Injector [ 'get' ] > ) ) ;
16
+ if ( fromNodeInjector ) {
17
+ tryFromNodeInjector = false ;
18
+ return fromNodeInjector ;
19
+ }
20
+ }
14
21
return originalGet ( ...args ) ;
15
22
} catch ( e ) {
16
23
return originalGet ( ...args ) ;
24
+ } finally {
25
+ tryFromNodeInjector = false ;
17
26
}
18
27
} ;
19
28
You can’t perform that action at this time.
0 commit comments