Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix type reference directive resolution #936

Merged
merged 2 commits into from
May 18, 2019
Merged

Fix type reference directive resolution #936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8f8f35
Fix type reference directive resolution
andrewbranch May 18, 2019
658d474
Bump package.json and CHANGELOG
andrewbranch May 18, 2019
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## v6.0.1

* [Fix issue with `resolveTypeReferenceDirective` causing errors like `Cannot find name 'it'` with Jest](https://github.com/TypeStrong/ts-loader/pull/936) (#934) (#919) - thanks @andrewbranch!

## v6.0.0

* [Drop support for node < 8.6 related to micromatch upgrade to 4](https://github.com/TypeStrong/ts-loader/pull/930); see: https://github.com/TypeStrong/ts-loader/issues/929
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ts-loader",
"version": "6.0.0",
"version": "6.0.1",
"description": "TypeScript loader for webpack",
"main": "index.js",
"types": "dist/types/index.d.ts",
Expand Down
21 changes: 14 additions & 7 deletions src/servicesHost.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ export function makeServicesHost(
fileExists,
readFile: readFileWithFallback,
realpath: compiler.sys.realpath,
directoryExists: compiler.sys.directoryExists
directoryExists: compiler.sys.directoryExists,
getCurrentDirectory: compiler.sys.getCurrentDirectory,
getDirectories: compiler.sys.getDirectories
};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So if I understand this correctly, the fix is the implementation of these:

    directoryExists: compiler.sys.directoryExists,
    getCurrentDirectory: compiler.sys.getCurrentDirectory,
    getDirectories: compiler.sys.getDirectories

?

That's interesting. I wish it was more "fail fast" here if it actually needed these...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, specifically getCurrentDirectory. I agree. I'll suggest something like this to the team.


const clearCache = enableFileCaching ? addCache(moduleResolutionHost) : null;
Expand Down Expand Up @@ -187,8 +189,11 @@ function makeResolvers(
): (typescript.ResolvedTypeReferenceDirective | undefined)[] =>
typeDirectiveNames.map(
directive =>
resolveTypeReferenceDirective(directive, containingFile)
.resolvedTypeReferenceDirective
resolveTypeReferenceDirective(
directive,
containingFile,
_redirectedReference
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This wasn't related to the particular repro provided, but it seemed like a place that might be broken for even edgier edge cases

).resolvedTypeReferenceDirective
);

const resolveModuleName = makeResolveModuleName(
Expand Down Expand Up @@ -500,7 +505,8 @@ export function makeWatchHost(

type ResolveTypeReferenceDirective = (
directive: string,
containingFile: string
containingFile: string,
redirectedReference?: typescript.ResolvedProjectReference
) => typescript.ResolvedTypeReferenceDirectiveWithFailedLookupLocations;

function makeResolveTypeReferenceDirective(
Expand All @@ -512,16 +518,17 @@ function makeResolveTypeReferenceDirective(
| undefined
): ResolveTypeReferenceDirective {
if (customResolveTypeReferenceDirective === undefined) {
return (directive: string, containingFile: string) =>
return (directive, containingFile, redirectedReference) =>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Contextual parameter types FTW 😄

compiler.resolveTypeReferenceDirective(
directive,
containingFile,
compilerOptions,
moduleResolutionHost
moduleResolutionHost,
redirectedReference
);
}

return (directive: string, containingFile: string) =>
return (directive, containingFile) =>
customResolveTypeReferenceDirective(
directive,
containingFile,
Expand Down