-
Notifications
You must be signed in to change notification settings - Fork 15
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.
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
feat: resolve_import #79
Merged
Merged
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
// Copyright 2018-2024 the Deno authors. MIT license. | ||
|
||
use std::error::Error; | ||
use std::fmt; | ||
|
||
use url::Url; | ||
|
||
#[derive(Debug, Clone, PartialEq, Eq)] | ||
pub enum SpecifierError { | ||
InvalidUrl(url::ParseError), | ||
ImportPrefixMissing { | ||
specifier: String, | ||
referrer: Option<Url>, | ||
}, | ||
} | ||
|
||
impl Error for SpecifierError { | ||
fn source(&self) -> Option<&(dyn Error + 'static)> { | ||
match self { | ||
Self::InvalidUrl(ref err) => Some(err), | ||
_ => None, | ||
} | ||
} | ||
} | ||
|
||
impl fmt::Display for SpecifierError { | ||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { | ||
match self { | ||
Self::InvalidUrl(ref err) => write!(f, "invalid URL: {err}"), | ||
Self::ImportPrefixMissing { specifier, .. } => write!( | ||
f, | ||
"Relative import path \"{specifier}\" not prefixed with / or ./ or ../", | ||
), | ||
} | ||
} | ||
} | ||
|
||
/// Given a specifier string and a referring module specifier, try to resolve | ||
/// the target module specifier, erroring if it cannot be resolved. | ||
/// | ||
/// This function is useful for resolving specifiers in situations without an | ||
/// import map. | ||
pub fn resolve_import( | ||
specifier: &str, | ||
referrer: &Url, | ||
) -> Result<Url, SpecifierError> { | ||
match Url::parse(specifier) { | ||
// 1. Apply the URL parser to specifier. | ||
// If the result is not failure, return he result. | ||
Ok(url) => Ok(url), | ||
|
||
// 2. If specifier does not start with the character U+002F SOLIDUS (/), | ||
// the two-character sequence U+002E FULL STOP, U+002F SOLIDUS (./), | ||
// or the three-character sequence U+002E FULL STOP, U+002E FULL STOP, | ||
// U+002F SOLIDUS (../), return failure. | ||
Err(url::ParseError::RelativeUrlWithoutBase) | ||
if !(specifier.starts_with('/') | ||
|| specifier.starts_with("./") | ||
|| specifier.starts_with("../")) => | ||
{ | ||
Err(SpecifierError::ImportPrefixMissing { | ||
specifier: specifier.to_string(), | ||
referrer: Some(referrer.clone()), | ||
}) | ||
} | ||
|
||
// 3. Return the result of applying the URL parser to specifier with base | ||
// URL as the base URL. | ||
Err(url::ParseError::RelativeUrlWithoutBase) => { | ||
referrer.join(specifier).map_err(SpecifierError::InvalidUrl) | ||
} | ||
|
||
// If parsing the specifier as a URL failed for a different reason than | ||
// it being relative, always return the original error. We don't want to | ||
// return `ImportPrefixMissing` or `InvalidBaseUrl` if the real | ||
// problem lies somewhere else. | ||
Err(err) => Err(SpecifierError::InvalidUrl(err)), | ||
} | ||
} |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this on purpose or left by accident?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Accident. I don’t remember writing this lol