Compare package.json paths with correct sensitivity in getLocalModuleSpecifier #57973
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@typescript-bot pack this |
typescript-bot
added
the
For Uncommitted Bug
andrewbranch
approved these changes
Mar 27, 2024
jakebailey
commented
Mar 27, 2024
src/compiler/moduleSpecifiers.ts
Outdated
Comment on lines
553
to
554
| nearestTargetPackageJson &&= toPath(nearestTargetPackageJson, projectDirectory, getCanonicalFileName); | ||
| nearestSourcePackageJson &&= toPath(nearestSourcePackageJson, projectDirectory, getCanonicalFileName); |
There was a problem hiding this comment.
Not clear if getNearestAncestorDirectoryWithPackageJson should just always return Path.
There was a problem hiding this comment.
Or if i should just comparePaths?
There was a problem hiding this comment.
This is used elsewhere and a toPath might have other negative affects at those use sites.
There was a problem hiding this comment.
If you mean my Path comment, it's only used when reading a file so shouldn't actually affect anything, but it sounds like the comparison one may just be better.
There was a problem hiding this comment.
I'd say just use comparePaths. We use it throughout tryGetModuleNameFromExportsOrImports against a path that comes from getNearestAncestorDirectoryWithPackageJson as well, so it would be consistent.
There was a problem hiding this comment.
Updated to use a helper; slightly different than the one you suggested but I was having trouble understanding what I was reading...
|
Hey @jakebailey, I've packed this into an installable tgz. You can install it for testing by referencing it in your and then running There is also a playground for this build and an npm module you can use via |
jakebailey
changed the title
jakebailey
changed the title
|
@typescript-bot test it |
RyanCavanaugh
approved these changes
Mar 27, 2024
|
@jakebailey Here they are:
tscComparison Report - baseline..pr
System info unknown
Hosts
Scenarios
Developer Information: |
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
Hey @jakebailey, the results of running the DT tests are ready. Everything looks the same! |
|
@typescript-bot cherry-pick this to release-5.4 |
|
Hey, @jakebailey! I've created #57976 for you. |
|
@jakebailey Here are the results of running the user tests comparing Everything looks good! |
rbuckton
approved these changes
Mar 28, 2024
| function packageJsonPathsAreEqual(a: string | undefined, b: string | undefined, ignoreCase?: boolean) { | ||
| if (a === b) return true; | ||
| if (a === undefined || b === undefined) return false; | ||
| return comparePaths(a, b, ignoreCase) === Comparison.EqualTo; |
There was a problem hiding this comment.
dont you need to pass current directory for this to work correctly
There was a problem hiding this comment.
These paths are already absolute, it seems, so nothing broke...
There was a problem hiding this comment.
Checked the other use in this file and they don't pass in the working dir either (also for paths from this host method)
|
@jakebailey Here are the results of running the top 400 repos comparing Everything looks good! |
|
Fixes #57802 |
typescript-bot
added
For Milestone Bug
DanielRosenwasser
pushed a commit
that referenced
this pull request
Mar 28, 2024
…e-5.4 (#57976) Co-authored-by: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #57956
Fixes #57926
Fixes #57802
Closes #57961
Thanks @xlianghang for the test.
See the second commit for the change.