Skip to content

Commit

Permalink
Fix resolve_module() when module_specifier is an absolute file path
Browse files Browse the repository at this point in the history
  • Loading branch information
piscisaureus committed Jul 22, 2018
1 parent 3c2dbcc commit cc14df4
Showing 1 changed file with 16 additions and 9 deletions.
25 changes: 16 additions & 9 deletions src/handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,16 @@ fn resolve_module(
//let containing_file = src_file_to_url(containing_file);
//let base_url = Url::parse(&containing_file)?;

let j: Url = if containing_file.as_str().ends_with("/") {
let base = Url::from_directory_path(&containing_file).unwrap();
base.join(module_specifier)?
} else if containing_file == "." {
Url::from_file_path(module_specifier).unwrap()
} else {
let base = Url::from_file_path(&containing_file).unwrap();
base.join(module_specifier)?
};
let j: Url =
if containing_file == "." || Path::new(module_specifier).is_absolute() {
Url::from_file_path(module_specifier).unwrap()
} else if containing_file.as_str().ends_with("/") {
let base = Url::from_directory_path(&containing_file).unwrap();
base.join(module_specifier)?
} else {
let base = Url::from_file_path(&containing_file).unwrap();
base.join(module_specifier)?
};

let mut p = j.to_file_path()
.unwrap()
Expand Down Expand Up @@ -146,6 +147,12 @@ fn test_resolve_module() {
add_root!("/Users/rld/src/deno/hello.js"),
add_root!("/Users/rld/src/deno/hello.js"),
),
(
add_root!("/this/module/got/imported.js"),
add_root!("/that/module/did/it.js"),
add_root!("/this/module/got/imported.js"),
add_root!("/this/module/got/imported.js"),
),
/*
(
"http:https://localhost:4545/testdata/subdir/print_hello.ts",
Expand Down

0 comments on commit cc14df4

Please sign in to comment.