core: clearly define when module lookup is path-based vs URL-based
The rules are now as follows:
* In `import` statements, as mandated by the WHATWG specification,
the import specifier is always treated as a URL.
If it is a relative URL, it must start with either / or ./ or ../
* A script name passed to deno as a command line argument may be either
an absolute URL or a local path.
- If the name starts with a valid URI scheme followed by a colon, e.g.
'http:', 'https:', 'file:', 'foo+bar:', it always interpreted as a
URL (even if Deno doesn't support the indicated protocol).
- Otherwise, the script name is interpreted as a local path. The local
path may be relative, and operating system semantics determine how
it is resolved. Prefixing a relative path with ./ is not required.
2019-07-08 03:55:24 -04:00
|
|
|
use std::env::current_dir;
|
2019-06-30 13:45:59 -04:00
|
|
|
use std::error::Error;
|
2019-06-12 15:00:08 -04:00
|
|
|
use std::fmt;
|
2019-07-30 10:34:57 -04:00
|
|
|
use std::path::PathBuf;
|
2019-06-30 13:45:59 -04:00
|
|
|
use url::ParseError;
|
2019-06-12 15:00:08 -04:00
|
|
|
use url::Url;
|
|
|
|
|
2019-06-30 13:45:59 -04:00
|
|
|
/// Error indicating the reason resolving a module specifier failed.
|
2019-07-30 10:34:57 -04:00
|
|
|
#[derive(Clone, Debug, Eq, PartialEq)]
|
2019-06-30 13:45:59 -04:00
|
|
|
pub enum ModuleResolutionError {
|
|
|
|
InvalidUrl(ParseError),
|
|
|
|
InvalidBaseUrl(ParseError),
|
2019-07-30 10:34:57 -04:00
|
|
|
InvalidPath(PathBuf),
|
2019-11-26 12:14:04 -05:00
|
|
|
ImportPrefixMissing(String, Option<String>),
|
2019-06-30 13:45:59 -04:00
|
|
|
}
|
|
|
|
use ModuleResolutionError::*;
|
|
|
|
|
|
|
|
impl Error for ModuleResolutionError {
|
|
|
|
fn source(&self) -> Option<&(dyn Error + 'static)> {
|
|
|
|
match self {
|
|
|
|
InvalidUrl(ref err) | InvalidBaseUrl(ref err) => Some(err),
|
|
|
|
_ => None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl fmt::Display for ModuleResolutionError {
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
|
|
match self {
|
|
|
|
InvalidUrl(ref err) => write!(f, "invalid URL: {}", err),
|
|
|
|
InvalidBaseUrl(ref err) => {
|
|
|
|
write!(f, "invalid base URL for relative import: {}", err)
|
|
|
|
}
|
2019-07-30 10:34:57 -04:00
|
|
|
InvalidPath(ref path) => write!(f, "invalid module path: {:?}", path),
|
2019-11-26 12:14:04 -05:00
|
|
|
ImportPrefixMissing(ref specifier, ref maybe_referrer) => {
|
|
|
|
let msg = format!(
|
|
|
|
"relative import path \"{}\" not prefixed with / or ./ or ../",
|
|
|
|
specifier
|
|
|
|
);
|
|
|
|
let msg = if let Some(referrer) = maybe_referrer {
|
|
|
|
format!("{} Imported from \"{}\"", msg, referrer)
|
|
|
|
} else {
|
|
|
|
msg
|
|
|
|
};
|
|
|
|
|
|
|
|
write!(f, "{}", msg)
|
|
|
|
}
|
2019-06-30 13:45:59 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-08-07 12:55:39 -04:00
|
|
|
#[derive(Debug, Clone, Eq, Hash, PartialEq)]
|
2019-06-12 15:00:08 -04:00
|
|
|
/// Resolved module specifier
|
|
|
|
pub struct ModuleSpecifier(Url);
|
|
|
|
|
|
|
|
impl ModuleSpecifier {
|
2019-08-09 19:33:59 -04:00
|
|
|
fn is_dummy_specifier(specifier: &str) -> bool {
|
|
|
|
specifier == "<unknown>"
|
|
|
|
}
|
|
|
|
|
2019-07-08 17:04:07 -04:00
|
|
|
pub fn as_url(&self) -> &Url {
|
|
|
|
&self.0
|
2019-06-12 15:00:08 -04:00
|
|
|
}
|
2019-06-12 19:55:59 -04:00
|
|
|
|
2019-08-07 12:55:39 -04:00
|
|
|
pub fn as_str(&self) -> &str {
|
|
|
|
self.0.as_str()
|
|
|
|
}
|
|
|
|
|
2019-06-12 15:00:08 -04:00
|
|
|
/// Resolves module using this algorithm:
|
|
|
|
/// https://html.spec.whatwg.org/multipage/webappapis.html#resolve-a-module-specifier
|
core: clearly define when module lookup is path-based vs URL-based
The rules are now as follows:
* In `import` statements, as mandated by the WHATWG specification,
the import specifier is always treated as a URL.
If it is a relative URL, it must start with either / or ./ or ../
* A script name passed to deno as a command line argument may be either
an absolute URL or a local path.
- If the name starts with a valid URI scheme followed by a colon, e.g.
'http:', 'https:', 'file:', 'foo+bar:', it always interpreted as a
URL (even if Deno doesn't support the indicated protocol).
- Otherwise, the script name is interpreted as a local path. The local
path may be relative, and operating system semantics determine how
it is resolved. Prefixing a relative path with ./ is not required.
2019-07-08 03:55:24 -04:00
|
|
|
pub fn resolve_import(
|
2019-06-12 15:00:08 -04:00
|
|
|
specifier: &str,
|
|
|
|
base: &str,
|
2019-06-30 13:45:59 -04:00
|
|
|
) -> Result<ModuleSpecifier, ModuleResolutionError> {
|
|
|
|
let url = match Url::parse(specifier) {
|
|
|
|
// 1. Apply the URL parser to specifier.
|
|
|
|
// If the result is not failure, return he result.
|
|
|
|
Ok(url) => url,
|
2019-06-12 15:00:08 -04:00
|
|
|
|
2019-06-30 13:45:59 -04:00
|
|
|
// 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(ParseError::RelativeUrlWithoutBase)
|
|
|
|
if !(specifier.starts_with('/')
|
|
|
|
|| specifier.starts_with("./")
|
|
|
|
|| specifier.starts_with("../")) =>
|
|
|
|
{
|
2019-11-26 12:14:04 -05:00
|
|
|
let maybe_referrer = if base.is_empty() {
|
|
|
|
None
|
|
|
|
} else {
|
|
|
|
Some(base.to_string())
|
|
|
|
};
|
|
|
|
return Err(ImportPrefixMissing(specifier.to_string(), maybe_referrer));
|
2019-06-30 13:45:59 -04:00
|
|
|
}
|
2019-06-12 15:00:08 -04:00
|
|
|
|
2019-06-30 13:45:59 -04:00
|
|
|
// 3. Return the result of applying the URL parser to specifier with base
|
|
|
|
// URL as the base URL.
|
|
|
|
Err(ParseError::RelativeUrlWithoutBase) => {
|
2019-08-09 19:33:59 -04:00
|
|
|
let base = if ModuleSpecifier::is_dummy_specifier(base) {
|
|
|
|
// Handle <unknown> case, happening under e.g. repl.
|
|
|
|
// Use CWD for such case.
|
|
|
|
|
|
|
|
// Forcefully join base to current dir.
|
|
|
|
// Otherwise, later joining in Url would be interpreted in
|
|
|
|
// the parent directory (appending trailing slash does not work)
|
|
|
|
let path = current_dir().unwrap().join(base);
|
|
|
|
Url::from_file_path(path).unwrap()
|
|
|
|
} else {
|
|
|
|
Url::parse(base).map_err(InvalidBaseUrl)?
|
|
|
|
};
|
2019-06-30 13:45:59 -04:00
|
|
|
base.join(&specifier).map_err(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
|
core: clearly define when module lookup is path-based vs URL-based
The rules are now as follows:
* In `import` statements, as mandated by the WHATWG specification,
the import specifier is always treated as a URL.
If it is a relative URL, it must start with either / or ./ or ../
* A script name passed to deno as a command line argument may be either
an absolute URL or a local path.
- If the name starts with a valid URI scheme followed by a colon, e.g.
'http:', 'https:', 'file:', 'foo+bar:', it always interpreted as a
URL (even if Deno doesn't support the indicated protocol).
- Otherwise, the script name is interpreted as a local path. The local
path may be relative, and operating system semantics determine how
it is resolved. Prefixing a relative path with ./ is not required.
2019-07-08 03:55:24 -04:00
|
|
|
// return `ImportPrefixMissing` or `InvalidBaseUrl` if the real
|
2019-06-30 13:45:59 -04:00
|
|
|
// problem lies somewhere else.
|
2019-10-03 09:16:06 -04:00
|
|
|
Err(err) => return Err(InvalidUrl(err)),
|
2019-06-30 13:45:59 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
Ok(ModuleSpecifier(url))
|
2019-06-12 15:00:08 -04:00
|
|
|
}
|
|
|
|
|
2020-01-02 07:48:46 -05:00
|
|
|
/// Converts a string representing an absolute URL into a ModuleSpecifier.
|
core: clearly define when module lookup is path-based vs URL-based
The rules are now as follows:
* In `import` statements, as mandated by the WHATWG specification,
the import specifier is always treated as a URL.
If it is a relative URL, it must start with either / or ./ or ../
* A script name passed to deno as a command line argument may be either
an absolute URL or a local path.
- If the name starts with a valid URI scheme followed by a colon, e.g.
'http:', 'https:', 'file:', 'foo+bar:', it always interpreted as a
URL (even if Deno doesn't support the indicated protocol).
- Otherwise, the script name is interpreted as a local path. The local
path may be relative, and operating system semantics determine how
it is resolved. Prefixing a relative path with ./ is not required.
2019-07-08 03:55:24 -04:00
|
|
|
pub fn resolve_url(
|
|
|
|
url_str: &str,
|
2019-06-30 13:45:59 -04:00
|
|
|
) -> Result<ModuleSpecifier, ModuleResolutionError> {
|
core: clearly define when module lookup is path-based vs URL-based
The rules are now as follows:
* In `import` statements, as mandated by the WHATWG specification,
the import specifier is always treated as a URL.
If it is a relative URL, it must start with either / or ./ or ../
* A script name passed to deno as a command line argument may be either
an absolute URL or a local path.
- If the name starts with a valid URI scheme followed by a colon, e.g.
'http:', 'https:', 'file:', 'foo+bar:', it always interpreted as a
URL (even if Deno doesn't support the indicated protocol).
- Otherwise, the script name is interpreted as a local path. The local
path may be relative, and operating system semantics determine how
it is resolved. Prefixing a relative path with ./ is not required.
2019-07-08 03:55:24 -04:00
|
|
|
Url::parse(url_str)
|
|
|
|
.map(ModuleSpecifier)
|
|
|
|
.map_err(ModuleResolutionError::InvalidUrl)
|
|
|
|
}
|
2019-06-30 13:45:59 -04:00
|
|
|
|
core: clearly define when module lookup is path-based vs URL-based
The rules are now as follows:
* In `import` statements, as mandated by the WHATWG specification,
the import specifier is always treated as a URL.
If it is a relative URL, it must start with either / or ./ or ../
* A script name passed to deno as a command line argument may be either
an absolute URL or a local path.
- If the name starts with a valid URI scheme followed by a colon, e.g.
'http:', 'https:', 'file:', 'foo+bar:', it always interpreted as a
URL (even if Deno doesn't support the indicated protocol).
- Otherwise, the script name is interpreted as a local path. The local
path may be relative, and operating system semantics determine how
it is resolved. Prefixing a relative path with ./ is not required.
2019-07-08 03:55:24 -04:00
|
|
|
/// Takes a string representing either an absolute URL or a file path,
|
|
|
|
/// as it may be passed to deno as a command line argument.
|
|
|
|
/// The string is interpreted as a URL if it starts with a valid URI scheme,
|
|
|
|
/// e.g. 'http:' or 'file:' or 'git+ssh:'. If not, it's interpreted as a
|
|
|
|
/// file path; if it is a relative path it's resolved relative to the current
|
|
|
|
/// working directory.
|
|
|
|
pub fn resolve_url_or_path(
|
|
|
|
specifier: &str,
|
|
|
|
) -> Result<ModuleSpecifier, ModuleResolutionError> {
|
|
|
|
if Self::specifier_has_uri_scheme(specifier) {
|
|
|
|
Self::resolve_url(specifier)
|
|
|
|
} else {
|
|
|
|
Self::resolve_path(specifier)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Converts a string representing a relative or absolute path into a
|
|
|
|
/// ModuleSpecifier. A relative path is considered relative to the current
|
|
|
|
/// working directory.
|
|
|
|
fn resolve_path(
|
|
|
|
path_str: &str,
|
|
|
|
) -> Result<ModuleSpecifier, ModuleResolutionError> {
|
|
|
|
let path = current_dir().unwrap().join(path_str);
|
2019-07-30 10:34:57 -04:00
|
|
|
Url::from_file_path(path.clone())
|
core: clearly define when module lookup is path-based vs URL-based
The rules are now as follows:
* In `import` statements, as mandated by the WHATWG specification,
the import specifier is always treated as a URL.
If it is a relative URL, it must start with either / or ./ or ../
* A script name passed to deno as a command line argument may be either
an absolute URL or a local path.
- If the name starts with a valid URI scheme followed by a colon, e.g.
'http:', 'https:', 'file:', 'foo+bar:', it always interpreted as a
URL (even if Deno doesn't support the indicated protocol).
- Otherwise, the script name is interpreted as a local path. The local
path may be relative, and operating system semantics determine how
it is resolved. Prefixing a relative path with ./ is not required.
2019-07-08 03:55:24 -04:00
|
|
|
.map(ModuleSpecifier)
|
2019-07-30 10:34:57 -04:00
|
|
|
.map_err(|()| ModuleResolutionError::InvalidPath(path))
|
core: clearly define when module lookup is path-based vs URL-based
The rules are now as follows:
* In `import` statements, as mandated by the WHATWG specification,
the import specifier is always treated as a URL.
If it is a relative URL, it must start with either / or ./ or ../
* A script name passed to deno as a command line argument may be either
an absolute URL or a local path.
- If the name starts with a valid URI scheme followed by a colon, e.g.
'http:', 'https:', 'file:', 'foo+bar:', it always interpreted as a
URL (even if Deno doesn't support the indicated protocol).
- Otherwise, the script name is interpreted as a local path. The local
path may be relative, and operating system semantics determine how
it is resolved. Prefixing a relative path with ./ is not required.
2019-07-08 03:55:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns true if the input string starts with a sequence of characters
|
|
|
|
/// that could be a valid URI scheme, like 'https:', 'git+ssh:' or 'data:'.
|
|
|
|
///
|
|
|
|
/// According to RFC 3986 (https://tools.ietf.org/html/rfc3986#section-3.1),
|
|
|
|
/// a valid scheme has the following format:
|
|
|
|
/// scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )
|
|
|
|
///
|
|
|
|
/// We additionally require the scheme to be at least 2 characters long,
|
|
|
|
/// because otherwise a windows path like c:/foo would be treated as a URL,
|
|
|
|
/// while no schemes with a one-letter name actually exist.
|
|
|
|
fn specifier_has_uri_scheme(specifier: &str) -> bool {
|
|
|
|
let mut chars = specifier.chars();
|
|
|
|
let mut len = 0usize;
|
|
|
|
// THe first character must be a letter.
|
|
|
|
match chars.next() {
|
|
|
|
Some(c) if c.is_ascii_alphabetic() => len += 1,
|
|
|
|
_ => return false,
|
|
|
|
}
|
|
|
|
// Second and following characters must be either a letter, number,
|
|
|
|
// plus sign, minus sign, or dot.
|
|
|
|
loop {
|
|
|
|
match chars.next() {
|
|
|
|
Some(c) if c.is_ascii_alphanumeric() || "+-.".contains(c) => len += 1,
|
|
|
|
Some(':') if len >= 2 => return true,
|
|
|
|
_ => return false,
|
|
|
|
}
|
|
|
|
}
|
2019-06-12 15:00:08 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl fmt::Display for ModuleSpecifier {
|
|
|
|
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
|
|
|
self.0.fmt(f)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-06-12 19:55:59 -04:00
|
|
|
impl From<Url> for ModuleSpecifier {
|
|
|
|
fn from(url: Url) -> Self {
|
|
|
|
ModuleSpecifier(url)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-06-12 15:00:08 -04:00
|
|
|
impl PartialEq<String> for ModuleSpecifier {
|
|
|
|
fn eq(&self, other: &String) -> bool {
|
|
|
|
&self.to_string() == other
|
|
|
|
}
|
|
|
|
}
|
core: clearly define when module lookup is path-based vs URL-based
The rules are now as follows:
* In `import` statements, as mandated by the WHATWG specification,
the import specifier is always treated as a URL.
If it is a relative URL, it must start with either / or ./ or ../
* A script name passed to deno as a command line argument may be either
an absolute URL or a local path.
- If the name starts with a valid URI scheme followed by a colon, e.g.
'http:', 'https:', 'file:', 'foo+bar:', it always interpreted as a
URL (even if Deno doesn't support the indicated protocol).
- Otherwise, the script name is interpreted as a local path. The local
path may be relative, and operating system semantics determine how
it is resolved. Prefixing a relative path with ./ is not required.
2019-07-08 03:55:24 -04:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_resolve_import() {
|
|
|
|
let tests = vec![
|
2019-06-25 16:14:36 -04:00
|
|
|
(
|
|
|
|
"./005_more_imports.ts",
|
|
|
|
"http://deno.land/core/tests/006_url_imports.ts",
|
|
|
|
"http://deno.land/core/tests/005_more_imports.ts",
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"../005_more_imports.ts",
|
|
|
|
"http://deno.land/core/tests/006_url_imports.ts",
|
|
|
|
"http://deno.land/core/005_more_imports.ts",
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"http://deno.land/core/tests/005_more_imports.ts",
|
|
|
|
"http://deno.land/core/tests/006_url_imports.ts",
|
|
|
|
"http://deno.land/core/tests/005_more_imports.ts",
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"data:text/javascript,export default 'grapes';",
|
|
|
|
"http://deno.land/core/tests/006_url_imports.ts",
|
|
|
|
"data:text/javascript,export default 'grapes';",
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"blob:https://whatwg.org/d0360e2f-caee-469f-9a2f-87d5b0456f6f",
|
|
|
|
"http://deno.land/core/tests/006_url_imports.ts",
|
|
|
|
"blob:https://whatwg.org/d0360e2f-caee-469f-9a2f-87d5b0456f6f",
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"javascript:export default 'artichokes';",
|
|
|
|
"http://deno.land/core/tests/006_url_imports.ts",
|
|
|
|
"javascript:export default 'artichokes';",
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"data:text/plain,export default 'kale';",
|
|
|
|
"http://deno.land/core/tests/006_url_imports.ts",
|
|
|
|
"data:text/plain,export default 'kale';",
|
|
|
|
),
|
core: clearly define when module lookup is path-based vs URL-based
The rules are now as follows:
* In `import` statements, as mandated by the WHATWG specification,
the import specifier is always treated as a URL.
If it is a relative URL, it must start with either / or ./ or ../
* A script name passed to deno as a command line argument may be either
an absolute URL or a local path.
- If the name starts with a valid URI scheme followed by a colon, e.g.
'http:', 'https:', 'file:', 'foo+bar:', it always interpreted as a
URL (even if Deno doesn't support the indicated protocol).
- Otherwise, the script name is interpreted as a local path. The local
path may be relative, and operating system semantics determine how
it is resolved. Prefixing a relative path with ./ is not required.
2019-07-08 03:55:24 -04:00
|
|
|
(
|
|
|
|
"/dev/core/tests/005_more_imports.ts",
|
|
|
|
"file:///home/yeti",
|
|
|
|
"file:///dev/core/tests/005_more_imports.ts",
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"//zombo.com/1999.ts",
|
|
|
|
"https://cherry.dev/its/a/thing",
|
|
|
|
"https://zombo.com/1999.ts",
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"http://deno.land/this/url/is/valid",
|
|
|
|
"base is clearly not a valid url",
|
|
|
|
"http://deno.land/this/url/is/valid",
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"//server/some/dir/file",
|
|
|
|
"file:///home/yeti/deno",
|
|
|
|
"file://server/some/dir/file",
|
|
|
|
),
|
|
|
|
// This test is disabled because the url crate does not follow the spec,
|
|
|
|
// dropping the server part from the final result.
|
|
|
|
// (
|
|
|
|
// "/another/path/at/the/same/server",
|
|
|
|
// "file://server/some/dir/file",
|
|
|
|
// "file://server/another/path/at/the/same/server",
|
|
|
|
// ),
|
|
|
|
];
|
|
|
|
|
|
|
|
for (specifier, base, expected_url) in tests {
|
|
|
|
let url = ModuleSpecifier::resolve_import(specifier, base)
|
|
|
|
.unwrap()
|
|
|
|
.to_string();
|
|
|
|
assert_eq!(url, expected_url);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_resolve_import_error() {
|
|
|
|
use url::ParseError::*;
|
|
|
|
use ModuleResolutionError::*;
|
|
|
|
|
|
|
|
let tests = vec![
|
2019-06-25 16:14:36 -04:00
|
|
|
(
|
|
|
|
"005_more_imports.ts",
|
|
|
|
"http://deno.land/core/tests/006_url_imports.ts",
|
2019-11-26 12:14:04 -05:00
|
|
|
ImportPrefixMissing(
|
|
|
|
"005_more_imports.ts".to_string(),
|
|
|
|
Some("http://deno.land/core/tests/006_url_imports.ts".to_string()),
|
|
|
|
),
|
2019-06-25 16:14:36 -04:00
|
|
|
),
|
|
|
|
(
|
|
|
|
".tomato",
|
|
|
|
"http://deno.land/core/tests/006_url_imports.ts",
|
2019-11-26 12:14:04 -05:00
|
|
|
ImportPrefixMissing(
|
|
|
|
".tomato".to_string(),
|
|
|
|
Some("http://deno.land/core/tests/006_url_imports.ts".to_string()),
|
|
|
|
),
|
2019-06-25 16:14:36 -04:00
|
|
|
),
|
|
|
|
(
|
|
|
|
"..zucchini.mjs",
|
|
|
|
"http://deno.land/core/tests/006_url_imports.ts",
|
2019-11-26 12:14:04 -05:00
|
|
|
ImportPrefixMissing(
|
|
|
|
"..zucchini.mjs".to_string(),
|
|
|
|
Some("http://deno.land/core/tests/006_url_imports.ts".to_string()),
|
|
|
|
),
|
2019-06-25 16:14:36 -04:00
|
|
|
),
|
|
|
|
(
|
|
|
|
r".\yam.es",
|
|
|
|
"http://deno.land/core/tests/006_url_imports.ts",
|
2019-11-26 12:14:04 -05:00
|
|
|
ImportPrefixMissing(
|
|
|
|
r".\yam.es".to_string(),
|
|
|
|
Some("http://deno.land/core/tests/006_url_imports.ts".to_string()),
|
|
|
|
),
|
2019-06-25 16:14:36 -04:00
|
|
|
),
|
|
|
|
(
|
|
|
|
r"..\yam.es",
|
|
|
|
"http://deno.land/core/tests/006_url_imports.ts",
|
2019-11-26 12:14:04 -05:00
|
|
|
ImportPrefixMissing(
|
|
|
|
r"..\yam.es".to_string(),
|
|
|
|
Some("http://deno.land/core/tests/006_url_imports.ts".to_string()),
|
|
|
|
),
|
2019-06-25 16:14:36 -04:00
|
|
|
),
|
core: clearly define when module lookup is path-based vs URL-based
The rules are now as follows:
* In `import` statements, as mandated by the WHATWG specification,
the import specifier is always treated as a URL.
If it is a relative URL, it must start with either / or ./ or ../
* A script name passed to deno as a command line argument may be either
an absolute URL or a local path.
- If the name starts with a valid URI scheme followed by a colon, e.g.
'http:', 'https:', 'file:', 'foo+bar:', it always interpreted as a
URL (even if Deno doesn't support the indicated protocol).
- Otherwise, the script name is interpreted as a local path. The local
path may be relative, and operating system semantics determine how
it is resolved. Prefixing a relative path with ./ is not required.
2019-07-08 03:55:24 -04:00
|
|
|
(
|
|
|
|
"https://eggplant:b/c",
|
|
|
|
"http://deno.land/core/tests/006_url_imports.ts",
|
|
|
|
InvalidUrl(InvalidPort),
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"https://eggplant@/c",
|
|
|
|
"http://deno.land/core/tests/006_url_imports.ts",
|
|
|
|
InvalidUrl(EmptyHost),
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"./foo.ts",
|
|
|
|
"/relative/base/url",
|
|
|
|
InvalidBaseUrl(RelativeUrlWithoutBase),
|
|
|
|
),
|
|
|
|
];
|
|
|
|
|
|
|
|
for (specifier, base, expected_err) in tests {
|
|
|
|
let err = ModuleSpecifier::resolve_import(specifier, base).unwrap_err();
|
|
|
|
assert_eq!(err, expected_err);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_resolve_url_or_path() {
|
|
|
|
// Absolute URL.
|
2019-06-25 16:14:36 -04:00
|
|
|
let mut tests: Vec<(&str, String)> = vec![
|
|
|
|
(
|
|
|
|
"http://deno.land/core/tests/006_url_imports.ts",
|
|
|
|
"http://deno.land/core/tests/006_url_imports.ts".to_string(),
|
|
|
|
),
|
|
|
|
(
|
|
|
|
"https://deno.land/core/tests/006_url_imports.ts",
|
|
|
|
"https://deno.land/core/tests/006_url_imports.ts".to_string(),
|
|
|
|
),
|
|
|
|
];
|
core: clearly define when module lookup is path-based vs URL-based
The rules are now as follows:
* In `import` statements, as mandated by the WHATWG specification,
the import specifier is always treated as a URL.
If it is a relative URL, it must start with either / or ./ or ../
* A script name passed to deno as a command line argument may be either
an absolute URL or a local path.
- If the name starts with a valid URI scheme followed by a colon, e.g.
'http:', 'https:', 'file:', 'foo+bar:', it always interpreted as a
URL (even if Deno doesn't support the indicated protocol).
- Otherwise, the script name is interpreted as a local path. The local
path may be relative, and operating system semantics determine how
it is resolved. Prefixing a relative path with ./ is not required.
2019-07-08 03:55:24 -04:00
|
|
|
|
|
|
|
// The local path tests assume that the cwd is the deno repo root.
|
|
|
|
let cwd = current_dir().unwrap();
|
|
|
|
let cwd_str = cwd.to_str().unwrap();
|
|
|
|
|
|
|
|
if cfg!(target_os = "windows") {
|
|
|
|
// Absolute local path.
|
|
|
|
let expected_url = "file:///C:/deno/tests/006_url_imports.ts";
|
|
|
|
tests.extend(vec![
|
|
|
|
(
|
|
|
|
r"C:/deno/tests/006_url_imports.ts",
|
|
|
|
expected_url.to_string(),
|
|
|
|
),
|
|
|
|
(
|
|
|
|
r"C:\deno\tests\006_url_imports.ts",
|
|
|
|
expected_url.to_string(),
|
|
|
|
),
|
|
|
|
(
|
|
|
|
r"\\?\C:\deno\tests\006_url_imports.ts",
|
|
|
|
expected_url.to_string(),
|
|
|
|
),
|
|
|
|
// Not supported: `Url::from_file_path()` fails.
|
|
|
|
// (r"\\.\C:\deno\tests\006_url_imports.ts", expected_url.to_string()),
|
|
|
|
// Not supported: `Url::from_file_path()` performs the wrong conversion.
|
|
|
|
// (r"//./C:/deno/tests/006_url_imports.ts", expected_url.to_string()),
|
|
|
|
]);
|
|
|
|
|
|
|
|
// Rooted local path without drive letter.
|
|
|
|
let expected_url = format!(
|
|
|
|
"file:///{}:/deno/tests/006_url_imports.ts",
|
|
|
|
cwd_str.get(..1).unwrap(),
|
|
|
|
);
|
|
|
|
tests.extend(vec![
|
|
|
|
(r"/deno/tests/006_url_imports.ts", expected_url.to_string()),
|
2019-12-23 09:59:44 -05:00
|
|
|
(r"\deno\tests\006_url_imports.ts", expected_url),
|
core: clearly define when module lookup is path-based vs URL-based
The rules are now as follows:
* In `import` statements, as mandated by the WHATWG specification,
the import specifier is always treated as a URL.
If it is a relative URL, it must start with either / or ./ or ../
* A script name passed to deno as a command line argument may be either
an absolute URL or a local path.
- If the name starts with a valid URI scheme followed by a colon, e.g.
'http:', 'https:', 'file:', 'foo+bar:', it always interpreted as a
URL (even if Deno doesn't support the indicated protocol).
- Otherwise, the script name is interpreted as a local path. The local
path may be relative, and operating system semantics determine how
it is resolved. Prefixing a relative path with ./ is not required.
2019-07-08 03:55:24 -04:00
|
|
|
]);
|
|
|
|
|
|
|
|
// Relative local path.
|
|
|
|
let expected_url = format!(
|
|
|
|
"file:///{}/tests/006_url_imports.ts",
|
|
|
|
cwd_str.replace("\\", "/")
|
|
|
|
);
|
|
|
|
tests.extend(vec![
|
|
|
|
(r"tests/006_url_imports.ts", expected_url.to_string()),
|
|
|
|
(r"tests\006_url_imports.ts", expected_url.to_string()),
|
2019-12-23 09:59:44 -05:00
|
|
|
(r"./tests/006_url_imports.ts", (*expected_url).to_string()),
|
|
|
|
(r".\tests\006_url_imports.ts", (*expected_url).to_string()),
|
core: clearly define when module lookup is path-based vs URL-based
The rules are now as follows:
* In `import` statements, as mandated by the WHATWG specification,
the import specifier is always treated as a URL.
If it is a relative URL, it must start with either / or ./ or ../
* A script name passed to deno as a command line argument may be either
an absolute URL or a local path.
- If the name starts with a valid URI scheme followed by a colon, e.g.
'http:', 'https:', 'file:', 'foo+bar:', it always interpreted as a
URL (even if Deno doesn't support the indicated protocol).
- Otherwise, the script name is interpreted as a local path. The local
path may be relative, and operating system semantics determine how
it is resolved. Prefixing a relative path with ./ is not required.
2019-07-08 03:55:24 -04:00
|
|
|
]);
|
|
|
|
|
|
|
|
// UNC network path.
|
|
|
|
let expected_url = "file://server/share/deno/cool";
|
|
|
|
tests.extend(vec![
|
|
|
|
(r"\\server\share\deno\cool", expected_url.to_string()),
|
|
|
|
(r"\\server/share/deno/cool", expected_url.to_string()),
|
|
|
|
// Not supported: `Url::from_file_path()` performs the wrong conversion.
|
|
|
|
// (r"//server/share/deno/cool", expected_url.to_string()),
|
|
|
|
]);
|
|
|
|
} else {
|
|
|
|
// Absolute local path.
|
|
|
|
let expected_url = "file:///deno/tests/006_url_imports.ts";
|
|
|
|
tests.extend(vec![
|
|
|
|
("/deno/tests/006_url_imports.ts", expected_url.to_string()),
|
|
|
|
("//deno/tests/006_url_imports.ts", expected_url.to_string()),
|
|
|
|
]);
|
|
|
|
|
|
|
|
// Relative local path.
|
|
|
|
let expected_url = format!("file://{}/tests/006_url_imports.ts", cwd_str);
|
|
|
|
tests.extend(vec![
|
|
|
|
("tests/006_url_imports.ts", expected_url.to_string()),
|
2019-12-23 09:59:44 -05:00
|
|
|
("./tests/006_url_imports.ts", expected_url),
|
core: clearly define when module lookup is path-based vs URL-based
The rules are now as follows:
* In `import` statements, as mandated by the WHATWG specification,
the import specifier is always treated as a URL.
If it is a relative URL, it must start with either / or ./ or ../
* A script name passed to deno as a command line argument may be either
an absolute URL or a local path.
- If the name starts with a valid URI scheme followed by a colon, e.g.
'http:', 'https:', 'file:', 'foo+bar:', it always interpreted as a
URL (even if Deno doesn't support the indicated protocol).
- Otherwise, the script name is interpreted as a local path. The local
path may be relative, and operating system semantics determine how
it is resolved. Prefixing a relative path with ./ is not required.
2019-07-08 03:55:24 -04:00
|
|
|
]);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (specifier, expected_url) in tests {
|
|
|
|
let url = ModuleSpecifier::resolve_url_or_path(specifier)
|
|
|
|
.unwrap()
|
|
|
|
.to_string();
|
|
|
|
assert_eq!(url, expected_url);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_resolve_url_or_path_error() {
|
|
|
|
use url::ParseError::*;
|
|
|
|
use ModuleResolutionError::*;
|
|
|
|
|
|
|
|
let mut tests = vec![
|
|
|
|
("https://eggplant:b/c", InvalidUrl(InvalidPort)),
|
|
|
|
("https://:8080/a/b/c", InvalidUrl(EmptyHost)),
|
|
|
|
];
|
|
|
|
if cfg!(target_os = "windows") {
|
2019-07-30 10:34:57 -04:00
|
|
|
let p = r"\\.\c:/stuff/deno/script.ts";
|
|
|
|
tests.push((p, InvalidPath(PathBuf::from(p))));
|
core: clearly define when module lookup is path-based vs URL-based
The rules are now as follows:
* In `import` statements, as mandated by the WHATWG specification,
the import specifier is always treated as a URL.
If it is a relative URL, it must start with either / or ./ or ../
* A script name passed to deno as a command line argument may be either
an absolute URL or a local path.
- If the name starts with a valid URI scheme followed by a colon, e.g.
'http:', 'https:', 'file:', 'foo+bar:', it always interpreted as a
URL (even if Deno doesn't support the indicated protocol).
- Otherwise, the script name is interpreted as a local path. The local
path may be relative, and operating system semantics determine how
it is resolved. Prefixing a relative path with ./ is not required.
2019-07-08 03:55:24 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
for (specifier, expected_err) in tests {
|
|
|
|
let err = ModuleSpecifier::resolve_url_or_path(specifier).unwrap_err();
|
|
|
|
assert_eq!(err, expected_err);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_specifier_has_uri_scheme() {
|
|
|
|
let tests = vec![
|
|
|
|
("http://foo.bar/etc", true),
|
|
|
|
("HTTP://foo.bar/etc", true),
|
|
|
|
("http:ftp:", true),
|
|
|
|
("http:", true),
|
|
|
|
("hTtP:", true),
|
|
|
|
("ftp:", true),
|
|
|
|
("mailto:spam@please.me", true),
|
|
|
|
("git+ssh://git@github.com/denoland/deno", true),
|
|
|
|
("blob:https://whatwg.org/mumbojumbo", true),
|
|
|
|
("abc.123+DEF-ghi:", true),
|
|
|
|
("abc.123+def-ghi:@", true),
|
|
|
|
("", false),
|
|
|
|
(":not", false),
|
|
|
|
("http", false),
|
|
|
|
("c:dir", false),
|
|
|
|
("X:", false),
|
|
|
|
("./http://not", false),
|
|
|
|
("1abc://kinda/but/no", false),
|
|
|
|
("schluẞ://no/more", false),
|
|
|
|
];
|
|
|
|
|
|
|
|
for (specifier, expected) in tests {
|
|
|
|
let result = ModuleSpecifier::specifier_has_uri_scheme(specifier);
|
|
|
|
assert_eq!(result, expected);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|