Skip to content

Allow an import of "foo.js" to be matched by a file "foo.ts" #8895

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

Merged
8 commits merged into from
Jun 9, 2016
Merged

Allow an import of "foo.js" to be matched by a file "foo.ts" #8895

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fa16a99
Allow an import of "foo.js" to be matched by a file "foo.ts"
May 31, 2016
a0546a9
Improve loadModuleFromFile code
May 31, 2016
f4d6b67
Respond to PR comments
May 31, 2016
d4b8889
Respond to more PR comments
May 31, 2016
9179f4c
Fix test
Jun 1, 2016
9575b3c
Revert to old tryLoad implementation
Jun 1, 2016
a918730
factor out isJsxOrTsxExtension
Jun 6, 2016
704f987
Move to a conformance test
Jun 6, 2016
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
Improve loadModuleFromFile code
  • Loading branch information
Andy Hanson committed May 31, 2016
commit a0546a9310aa18a097fa8edb5276dc0c16fedfc2
21 changes: 11 additions & 10 deletions src/compiler/program.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,24 +628,25 @@ namespace ts {
}
}

if (state.skipTsx)
extensions = filter(extensions, ext => ext !== "tsx");

// First try to keep/add an extension: importing "./foo.ts" can be matched by a file "./foo.ts", and "./foo" by "./foo.d.ts"
const keepOrAddExtension = forEach(extensions, ext =>
tryLoad(fileExtensionIs(candidate, ext) ? candidate : candidate + ext));
const keepOrAddExtension = forEach(extensions, ext => {
if (state.skipTsx && (ext === ".jsx" || ext === ".tsx")) {
Copy link
Member

@DanielRosenwasser DanielRosenwasser May 31, 2016

Choose a reason for hiding this comment

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

If there isn't one, it would be useful to have a function to determine if the file extension is explicitly a JSX extension.

Copy link
Author

@ghost ghost May 31, 2016

Choose a reason for hiding this comment

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

Do you mean function isJsxLike(extension: string) { return extension === ".jsx" || extension === ".tsx"; }?

Copy link
Contributor

@mhegazy mhegazy Jun 1, 2016

Choose a reason for hiding this comment

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

do not think you need the extra lambda. just revert to the old tryLoad implementation.

return;
}
return tryLoad(fileExtensionIs(candidate, ext) ? candidate : candidate + ext);
});
if (keepOrAddExtension) {
Copy link
Member

@DanielRosenwasser DanielRosenwasser May 31, 2016

Choose a reason for hiding this comment

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

Newline above

return keepOrAddExtension;
}

// Then try stripping a ".js" or ".jsx" extension and replacing it with a different one, e.g. "./foo.js" can be matched by "./foo.ts" or "./foo.d.ts"
// Then try stripping a ".js" or ".jsx" extension and replacing it with a TypeScript one, e.g. "./foo.js" can be matched by "./foo.ts" or "./foo.d.ts"
return forEach(supportedJavascriptExtensions, jsExt => {
if (state.skipTsx && jsExt === ".jsx") {
return;
}
const extensionless = tryRemoveExtension(candidate, jsExt);
Copy link
Member

@DanielRosenwasser DanielRosenwasser May 31, 2016

Choose a reason for hiding this comment

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

Newline above

if (extensionless !== undefined) {
return forEach(supportedTypeScriptExtensions, ext => {
if (ext !== jsExt)
return tryLoad(extensionless + ext);
});
return forEach(supportedTypeScriptExtensions, tsExt => tryLoad(extensionless + tsExt));
}
});

Expand Down