Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
resolve: Improve type safety
  • Loading branch information
neurolag committed Sep 18, 2022
commit f6ea7b7ad05a7183ebdaece024a5894802f2adf4
47 changes: 24 additions & 23 deletions src/servicesHost.ts
Original file line number Diff line number Diff line change
Expand Up @@ -260,31 +260,32 @@ function makeResolvers<T extends typescript.ModuleResolutionHost>(
instance
);

const resolveModuleNames = (
moduleNames: string[],
containingFile: string,
_reusedNames?: string[] | undefined,
redirectedReference?: typescript.ResolvedProjectReference | undefined,
_?: typescript.CompilerOptions,
containingSourceFile?: typescript.SourceFile
): (typescript.ResolvedModule | undefined)[] => {
const resolvedModules = moduleNames.map(moduleName =>
resolveModule(
resolveSync,
resolveModuleName,
appendTsTsxSuffixesIfRequired,
scriptRegex,
moduleName,
containingFile,
redirectedReference,
containingSourceFile
)
);
const resolveModuleNames: typescript.ProgramHost<typescript.BuilderProgram>['resolveModuleNames'] =
(
moduleNames,
containingFile,
_reusedNames?,
redirectedReference?,
_?,
containingSourceFile?
): (typescript.ResolvedModule | undefined)[] => {
const resolvedModules = moduleNames.map(moduleName =>
resolveModule(
resolveSync,
resolveModuleName,
appendTsTsxSuffixesIfRequired,
scriptRegex,
moduleName,
containingFile,
redirectedReference,
containingSourceFile
)
);

populateDependencyGraph(resolvedModules, instance, containingFile);
populateDependencyGraph(resolvedModules, instance, containingFile);

return resolvedModules;
};
return resolvedModules;
};

const resolveTypeReferenceDirective = makeResolveTypeReferenceDirective(
compiler,
Expand Down