@@ -338,15 +338,16 @@ func (p *fileLoader) resolveImportsAndModuleAugmentations(file *ast.SourceFile,
338
338
isJavaScriptFile := ast .IsSourceFileJS (file )
339
339
isExternalModuleFile := ast .IsExternalModule (file )
340
340
341
- compilerOptions := p .opts .Config .CompilerOptions () // !!! sheetal this should probably be options for file
342
- if isJavaScriptFile || (! file .IsDeclarationFile && (compilerOptions .GetIsolatedModules () || isExternalModuleFile )) {
343
- if compilerOptions .ImportHelpers .IsTrue () {
341
+ redirect := p .projectReferenceFileMapper .getRedirectForResolution (file )
342
+ optionsForFile := module .GetCompilerOptionsWithRedirect (p .opts .Config .CompilerOptions (), redirect )
343
+ if isJavaScriptFile || (! file .IsDeclarationFile && (optionsForFile .GetIsolatedModules () || isExternalModuleFile )) {
344
+ if optionsForFile .ImportHelpers .IsTrue () {
344
345
specifier := p .createSyntheticImport (externalHelpersModuleNameText , file )
345
346
moduleNames = append (moduleNames , specifier )
346
347
importHelpersImportSpecifier = specifier
347
348
}
348
349
349
- jsxImport := ast .GetJSXRuntimeImport (ast .GetJSXImplicitImportBase (compilerOptions , file ), compilerOptions )
350
+ jsxImport := ast .GetJSXRuntimeImport (ast .GetJSXImplicitImportBase (optionsForFile , file ), optionsForFile )
350
351
if jsxImport != "" {
351
352
specifier := p .createSyntheticImport (jsxImport , file )
352
353
moduleNames = append (moduleNames , specifier )
@@ -360,9 +361,7 @@ func (p *fileLoader) resolveImportsAndModuleAugmentations(file *ast.SourceFile,
360
361
if len (moduleNames ) != 0 {
361
362
toParse = make ([]string , 0 , len (moduleNames ))
362
363
363
- redirect := p .projectReferenceFileMapper .getRedirectForResolution (file )
364
364
resolutions := p .resolveModuleNames (moduleNames , file , meta , redirect )
365
- optionsForFile := module .GetCompilerOptionsWithRedirect (compilerOptions , redirect )
366
365
367
366
resolutionsInFile = make (module.ModeAwareCache [* module.ResolvedModule ], len (resolutions ))
368
367
0 commit comments