From 658ec2aaf9c7e0d0b4ded4e97a3d89dc2fa25806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Mon, 25 Nov 2019 15:33:23 +0100
Subject: better error message for missing module (#3402)

---
 cli/ops/compiler.rs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'cli/ops/compiler.rs')

diff --git a/cli/ops/compiler.rs b/cli/ops/compiler.rs
index fdb62ca32..b45f6d937 100644
--- a/cli/ops/compiler.rs
+++ b/cli/ops/compiler.rs
@@ -51,7 +51,7 @@ fn op_cache(
 #[derive(Deserialize)]
 struct FetchSourceFilesArgs {
   specifiers: Vec<String>,
-  referrer: String,
+  referrer: Option<String>,
 }
 
 fn op_fetch_source_files(
@@ -65,14 +65,23 @@ fn op_fetch_source_files(
   // to this. Need a test to demonstrate the hole.
   let is_dyn_import = false;
 
+  let (referrer, ref_specifier) = if let Some(referrer) = args.referrer {
+    let specifier = ModuleSpecifier::resolve_url(&referrer)
+      .expect("Referrer is not a valid specifier");
+    (referrer, Some(specifier))
+  } else {
+    // main script import
+    (".".to_string(), None)
+  };
+
   let mut futures = vec![];
   for specifier in &args.specifiers {
     let resolved_specifier =
-      state.resolve(specifier, &args.referrer, false, is_dyn_import)?;
+      state.resolve(specifier, &referrer, false, is_dyn_import)?;
     let fut = state
       .global_state
       .file_fetcher
-      .fetch_source_file_async(&resolved_specifier);
+      .fetch_source_file_async(&resolved_specifier, ref_specifier.clone());
     futures.push(fut);
   }
 
-- 
cgit v1.2.3