Add rewriteRelativeImportExtension helper - #270
#270Merged
andrewbranch merged 9 commits intoOct 14, 2024
mainmicrosoft/tslib:mainfrom
rewriteRelativeImportExtensionmicrosoft/tslib:rewriteRelativeImportExtensionCopy head branch name to clipboard
Merged
Add rewriteRelativeImportExtension helper#270andrewbranch merged 9 commits intomainmicrosoft/tslib:mainfrom rewriteRelativeImportExtensionmicrosoft/tslib:rewriteRelativeImportExtensionCopy head branch name to clipboard
andrewbranch merged 9 commits into
mainmicrosoft/tslib:mainfrom
rewriteRelativeImportExtensionmicrosoft/tslib:rewriteRelativeImportExtensionCopy head branch name to clipboard
Conversation
rbuckton
suggested changes
Sep 23, 2024
rbuckton
suggested changes
Sep 24, 2024
andrewbranch
commented
Sep 24, 2024
rbuckton
reviewed
Sep 24, 2024
| export function __rewriteRelativeImportExtension(path, preserveJsx) { | ||
| if (typeof path === "string" && /^\.\.?\//.test(path)) { | ||
| return path.replace(/\.(tsx)$|(\.d)?(\.[^./]+?)?\.([cm])?ts$/i, function (m, tsx, d, ext, cm) { | ||
| return tsx ? preserveJsx ? ".jsx" : ".js" : d && (ext && !cm || !ext) ? m : ((d || "") + (ext || "") + "." + (cm || "").toLowerCase() + "js"); |
Contributor
There was a problem hiding this comment.
Suggested change
| return tsx ? preserveJsx ? ".jsx" : ".js" : d && (ext && !cm || !ext) ? m : ((d || "") + (ext || "") + "." + (cm || "").toLowerCase() + "js"); | |
| return tsx ? preserveJsx ? ".jsx" : ".js" : d && !(ext && cm) ? m : ((d || "") + (ext || "") + "." + (cm || "").toLowerCase() + "js"); |
To reduce the amount of || "" that you're doing, you could move the quantifiers inside of the capture groups so that they capture empty strings instead of undefined:
/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i
Also, to clarify the d && (ext && !cm || !ext) case: is this saying that d.ts (no ext and no cm) remains .d.ts, .d.cts (no ext but has cm) remains .d.cts, but .d.css.cts (has ext and cm) becomes .d.css.cjs?
Member
Author
There was a problem hiding this comment.
Yes, that’s right. .d.css.cts is not a recognized declaration file extension (even though it looks suspiciously like one), so we would have to treat it as any other *.cts file name. A real fishy edge case, but correct for today’s compiler, anyway.
rbuckton
reviewed
Sep 24, 2024
rbuckton
approved these changes
Sep 25, 2024
| export function __rewriteRelativeImportExtension(path, preserveJsx) { | ||
| if (typeof path === "string" && /^\.\.?\//.test(path)) { | ||
| return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) { | ||
| return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js"); |
Contributor
There was a problem hiding this comment.
Saving one character probably won't matter too much, but this is equivalent
Suggested change
| return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js"); | |
| return tsx ? preserveJsx ? ".jsx" : ".js" : d && !(ext && cm) ? m : (d + ext + "." + cm.toLowerCase() + "js"); |
This was referenced Nov 11, 2024
Merged
1 task
1 task
4 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Counterpart to microsoft/TypeScript#59767