diff options
author | Bert Belder <bertbelder@gmail.com> | 2019-07-08 09:55:24 +0200 |
---|---|---|
committer | Bert Belder <bertbelder@gmail.com> | 2019-07-08 13:07:32 +0200 |
commit | 9b1997b8b6f82e17e42c43aae3621e2b932f5843 (patch) | |
tree | 3367eadf1cdbd7d1f6f3e1ba647d80d85a6d3caa /core/modules.rs | |
parent | 92ac616708cb067a1b895283913c5ecd25c6d873 (diff) |
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.
Diffstat (limited to 'core/modules.rs')
-rw-r--r-- | core/modules.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/modules.rs b/core/modules.rs index 8a229e770..c1fa5d733 100644 --- a/core/modules.rs +++ b/core/modules.rs @@ -643,11 +643,11 @@ mod tests { eprintln!(">> RESOLVING, S: {}, R: {}", specifier, referrer); - let output_specifier = match ModuleSpecifier::resolve(specifier, referrer) - { - Ok(specifier) => specifier, - Err(_e) => return Err(MockError::ResolveErr), - }; + let output_specifier = + match ModuleSpecifier::resolve_import(specifier, referrer) { + Ok(specifier) => specifier, + Err(..) => return Err(MockError::ResolveErr), + }; if mock_source_code(&output_specifier.to_string()).is_some() { Ok(output_specifier) |