feat: Add --location and globalThis.location

cli/main.rs

@@ -792,12 +792,28 @@ async fn test_command(
   Ok(())
 }
 
+fn unwrap_or_exit<T>(result: Result<T, AnyError>) -> T {
+  match result {
+    Ok(value) => value,
+    Err(error) => {
+      let msg = format!(
+        "{}: {}",
+        colors::red_bold("error"),
+        error.to_string().trim()
+      );
+      eprintln!("{}", msg);
+      std::process::exit(1);
+    }
+  }
+}
+
 pub fn main() {
   #[cfg(windows)]
   colors::enable_ansi(); // For Windows 10
 
   let args: Vec<String> = env::args().collect();
-  let flags = flags::flags_from_vec(args);
+  let flags =
+    unwrap_or_exit(flags::flags_from_vec(args).map_err(AnyError::from));
 
   if let Some(ref v8_flags) = flags.v8_flags {
     let v8_flags_includes_help = v8_flags
@@ -936,9 +952,5 @@ pub fn main() {
     }
   };
 
-  let result = tokio_util::run_basic(fut);
-  if let Err(err) = result {
-    eprintln!("{}: {}", colors::red_bold("error"), err.to_string());
-    std::process::exit(1);
-  }
+  unwrap_or_exit(tokio_util::run_basic(fut));
 }

cli/ops/runtime.rs

@@ -35,6 +35,7 @@ fn op_start(
     "args": gs.flags.argv.clone(),
     "debugFlag": gs.flags.log_level.map_or(false, |l| l == log::Level::Debug),
     "denoVersion": version::DENO,
+    "location": gs.flags.location.as_ref().map(|url| url.as_str()),
     "noColor": !colors::use_color(),
     "pid": std::process::id(),
     "ppid": ppid(),

cli/ops/worker_host.rs

@@ -82,7 +82,7 @@ fn create_web_worker(
   let mut worker = WebWorker::new(
     name.clone(),
     permissions,
-    specifier,
+    specifier.clone(),
     program_state.clone(),
     has_deno_namespace,
   );
@@ -105,8 +105,8 @@ fn create_web_worker(
   // Instead of using name for log we use `worker-${id}` because
   // WebWorkers can have empty string as name.
   let script = format!(
-    "bootstrap.workerRuntime(\"{}\", {}, \"worker-{}\")",
-    name, worker.has_deno_namespace, worker_id
+    "bootstrap.workerRuntime(\"{}\", \"{}\", {}, \"worker-{}\")",
+    name, specifier, worker.has_deno_namespace, worker_id
   );
   worker.execute(&script)?;
 
@@ -230,6 +230,7 @@ fn op_create_worker(
   args: Value,
   _data: &mut [ZeroCopyBuf],
 ) -> Result<Value, AnyError> {
+  let program_state = super::program_state(state);
   let args: CreateWorkerArgs = serde_json::from_value(args)?;
 
   let specifier = args.specifier.clone();
@@ -247,14 +248,16 @@ fn op_create_worker(
   let worker_id = state.take::<WorkerId>();
   state.put::<WorkerId>(worker_id + 1);
 
-  let module_specifier = ModuleSpecifier::resolve_url(&specifier)?;
+  let module_specifier = match program_state.flags.location.as_ref() {
+    None => ModuleSpecifier::resolve_url(&specifier)?,
+    Some(url) => ModuleSpecifier::resolve_import(&specifier, url.as_str())?,
+  };
   let worker_name = args_name.unwrap_or_else(|| "".to_string());
-  let cli_state = super::program_state(state);
 
   let (join_handle, worker_handle) = run_worker_thread(
     worker_id,
     worker_name,
-    &cli_state,
+    &program_state,
     permissions,
     module_specifier,
     use_deno_namespace,

cli/rt/99_main.js

@@ -9,6 +9,7 @@ delete Object.prototype.__proto__;
   const util = window.__bootstrap.util;
   const eventTarget = window.__bootstrap.eventTarget;
   const globalInterfaces = window.__bootstrap.globalInterfaces;
+  const location = window.__bootstrap.location;
   const dispatchMinimal = window.__bootstrap.dispatchMinimal;
   const build = window.__bootstrap.build;
   const version = window.__bootstrap.version;
@@ -194,6 +195,8 @@ delete Object.prototype.__proto__;
 
   // https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope
   const windowOrWorkerGlobalScope = {
+    Location: location.locationConstructorDescriptor,
+    location: location.locationDescriptor,
     Blob: util.nonEnumerable(fetch.Blob),
     ByteLengthQueuingStrategy: util.nonEnumerable(
       streams.ByteLengthQueuingStrategy,
@@ -298,8 +301,19 @@ delete Object.prototype.__proto__;
       }
     });
 
-    const { args, noColor, pid, ppid, unstableFlag } = runtimeStart();
-
+    const {
+      args,
+      location: locationHref,
+      noColor,
+      pid,
+      ppid,
+      unstableFlag,
+    } = runtimeStart();
+
+    if (locationHref != null) {
+      location.setLocationHref(locationHref);
+      fetch.setBaseUrl(locationHref);
+    }
     registerErrors();
 
     const finalDenoNs = {
@@ -333,7 +347,7 @@ delete Object.prototype.__proto__;
     util.log("args", args);
   }
 
-  function bootstrapWorkerRuntime(name, useDenoNamespace, internalName) {
+  function bootstrapWorkerRuntime(name, url, useDenoNamespace, internalName) {
     if (hasBootstrapped) {
       throw new Error("Worker runtime already bootstrapped");
     }
@@ -351,6 +365,8 @@ delete Object.prototype.__proto__;
       internalName ?? name,
     );
 
+    location.setLocationHref(url);
+    fetch.setBaseUrl(url);
     registerErrors();
 
     const finalDenoNs = {

cli/rt/README.md

@@ -38,6 +38,8 @@ Some Web APIs are using ops under the hood, eg. `console`, `performance`.
   [Body](https://developer.mozilla.org/en-US/docs/Web/API/Body) and
   [Headers](https://developer.mozilla.org/en-US/docs/Web/API/Headers): modern
   Promise-based HTTP Request API.
+- [location](https://developer.mozilla.org/en-US/docs/Web/API/Window/location)
+  and [Location](https://developer.mozilla.org/en-US/docs/Web/API/Location).
 - [FormData](https://developer.mozilla.org/en-US/docs/Web/API/FormData): access
   to a `multipart/form-data` serialization.
 - [Performance](https://developer.mozilla.org/en-US/docs/Web/API/Performance):

cli/tests/070_location.ts

@@ -0,0 +1,10 @@
+// TODO(nayeemrmn): Add `Location` and `location` to `dlint`'s globals.
+// deno-lint-ignore-file no-undef
+console.log(Location);
+console.log(Location.prototype);
+console.log(location);
+try {
+  location.hostname = "bar";
+} catch (error) {
+  console.log(error);
+}

cli/tests/070_location.ts.out

@@ -0,0 +1,22 @@
+[WILDCARD][Function: Location]
+Location { [Symbol(Symbol.toStringTag)]: "Location" }
+Location {
+  hash: [Getter/Setter],
+  host: [Getter/Setter],
+  hostname: [Getter/Setter],
+  href: [Getter/Setter],
+  origin: [Getter],
+  password: [Getter/Setter],
+  pathname: [Getter/Setter],
+  port: [Getter/Setter],
+  protocol: [Getter/Setter],
+  search: [Getter/Setter],
+  username: [Getter/Setter],
+  ancestorOrigins: [Getter],
+  assign: [Function: assign],
+  reload: [Function: reload],
+  replace: [Function: replace],
+  toString: [Function: toString]
+}
+NotSupportedError: Cannot set "location.hostname".
+[WILDCARD]

cli/tests/071_location_unset.ts

@@ -0,0 +1,5 @@
+// TODO(nayeemrmn): Add `Location` and `location` to `dlint`'s globals.
+// deno-lint-ignore-file no-undef
+console.log(Location);
+console.log(Location.prototype);
+console.log(location);

cli/tests/071_location_unset.ts.out

@@ -0,0 +1,4 @@
+[WILDCARD][Function: Location]
+Location { [Symbol(Symbol.toStringTag)]: "Location" }
+error: Uncaught ReferenceError: Access to "location", run again with --location <href>.
+[WILDCARD]

cli/tests/072_location_relative_fetch.ts

@@ -0,0 +1,2 @@
+const response = await fetch("fetch/hello.txt");
+console.log(await response.text());

cli/tests/072_location_relative_fetch.ts.out

@@ -0,0 +1,2 @@
+[WILDCARD]Hello, world!
+

cli/tests/complex_permissions_test.ts

@@ -10,8 +10,8 @@ const test: { [key: string]: (...args: any[]) => void | Promise<void> } = {
       Deno.writeFileSync(file, new Uint8Array(0), { append: true })
     );
   },
-  netFetch(hosts: string[]): void {
-    hosts.forEach((host) => fetch(host));
+  netFetch(urls: string[]): void {
+    urls.forEach((url) => fetch(url));
   },
   netListen(endpoints: string[]): void {
     endpoints.forEach((endpoint) => {

cli/tests/fetch/hello.txt

@@ -0,0 +1 @@
+Hello, world!

cli/tests/integration_tests.rs

@@ -1154,7 +1154,7 @@ fn bundle_import_map_no_check() {
     .current_dir(util::root_path())
     .arg("bundle")
     .arg("--no-check")
-    .arg("--importmap")
+    .arg("--import-map")
     .arg(import_map_path)
     .arg("--unstable")
     .arg(import)
@@ -1521,7 +1521,7 @@ fn repl_test_pty_unpaired_braces() {
 }
 
 #[test]
-fn run_watch_with_importmap_and_relative_paths() {
+fn run_watch_with_import_map_and_relative_paths() {
   fn create_relative_tmp_file(
     directory: &TempDir,
     filename: &'static str,
@@ -1554,7 +1554,7 @@ fn run_watch_with_importmap_and_relative_paths() {
     .arg("run")
     .arg("--unstable")
     .arg("--watch")
-    .arg("--importmap")
+    .arg("--import-map")
     .arg(&import_map_path)
     .arg(&file_to_watch)
     .env("NO_COLOR", "1")
@@ -2165,6 +2165,12 @@ fn workers() {
     .current_dir(util::tests_path())
     .arg("test")
     .arg("--reload")
+    .arg("--location")
+    .arg(
+      url::Url::from_directory_path(util::tests_path())
+        .unwrap()
+        .as_str(),
+    )
     .arg("--allow-net")
     .arg("--allow-read")
     .arg("--unstable")
@@ -2406,6 +2412,23 @@ itest!(_067_test_no_run_type_error {
   exit_code: 1,
 });
 
+itest!(_070_location {
+  args: "run --location https://foo/bar?baz#bat 070_location.ts",
+  output: "070_location.ts.out",
+});
+
+itest!(_071_location_unset {
+  args: "run 071_location_unset.ts",
+  output: "071_location_unset.ts.out",
+  exit_code: 1,
+});
+
+itest!(_072_location_relative_fetch {
+  args: "run --location http://127.0.0.1:4545/cli/tests/ --allow-net 072_location_relative_fetch.ts",
+  output: "072_location_relative_fetch.ts.out",
+  http_server: true,
+});
+
 itest!(_073_worker_error {
   args: "run -A 073_worker_error.ts",
   output: "073_worker_error.ts.out",

cli/tests/subdir/worker_location.ts

@@ -0,0 +1,4 @@
+onmessage = function (): void {
+  postMessage(self.location.href);
+  close();
+};

cli/tests/unit/fetch_test.ts

@@ -196,14 +196,6 @@ unitTest({ perms: { net: true } }, async function responseClone(): Promise<
   }
 });
 
-unitTest({ perms: { net: true } }, async function fetchEmptyInvalid(): Promise<
-  void
-> {
-  await assertThrowsAsync(async () => {
-    await fetch("");
-  }, URIError);
-});
-
 unitTest(
   { perms: { net: true } },
   async function fetchMultipartFormDataSuccess(): Promise<void> {

cli/tests/unit/request_test.ts

@@ -1,5 +1,5 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-import { assert, assertEquals, assertThrows, unitTest } from "./test_util.ts";
+import { assert, assertEquals, unitTest } from "./test_util.ts";
 
 unitTest(function fromInit(): void {
   const req = new Request("http://foo/", {
@@ -46,8 +46,10 @@ unitTest(function methodNonString(): void {
 });
 
 unitTest(function requestRelativeUrl(): void {
-  // TODO(nayeemrmn): Base from `--location` when implemented and set.
-  assertThrows(() => new Request("relative-url"), TypeError, "Invalid URL.");
+  assertEquals(
+    new Request("relative-url").url,
+    "http://js-unit-tests/foo/relative-url",
+  );
 });
 
 unitTest(async function cloneRequestBodyStream(): Promise<void> {

cli/tests/unit/unit_test_runner.ts

@@ -97,6 +97,7 @@ function spawnWorkerRunner(
     Deno.execPath(),
     "run",
     "--unstable", // TODO(ry) be able to test stable vs unstable
+    "--location=http://js-unit-tests/foo/bar",
     "-A",
     "cli/tests/unit/unit_test_runner.ts",
     "--worker",

cli/tests/workers_test.ts

@@ -358,3 +358,41 @@ Deno.test({
     w.terminate();
   },
 });
+
+Deno.test({
+  name: "worker location",
+  fn: async function (): Promise<void> {
+    const promise = createResolvable();
+    const workerModuleHref =
+      new URL("subdir/worker_location.ts", import.meta.url).href;
+    const w = new Worker(workerModuleHref, { type: "module" });
+    w.onmessage = (e): void => {
+      assertEquals(e.data, workerModuleHref);
+      promise.resolve();
+    };
+    w.postMessage("Hello, world!");
+    await promise;
+    w.terminate();
+  },
+});
+
+Deno.test({
+  name: "worker with relative specifier",
+  fn: async function (): Promise<void> {
+    // TODO(nayeemrmn): Add `Location` and `location` to `dlint`'s globals.
+    // deno-lint-ignore no-undef
+    assertEquals(location.href, new URL(".", import.meta.url).href);
+    const promise = createResolvable();
+    const w = new Worker(
+      "./subdir/test_worker.ts",
+      { type: "module", name: "tsWorker" },
+    );
+    w.onmessage = (e): void => {
+      assertEquals(e.data, "Hello, world!");
+      promise.resolve();
+    };
+    w.postMessage("Hello, world!");
+    await promise;
+    w.terminate();
+  },
+});

cli/tools/installer.rs

@@ -187,6 +187,10 @@ pub fn install(
 
   let mut executable_args = vec!["run".to_string()];
   executable_args.extend_from_slice(&flags.to_permission_args());
+  if let Some(url) = flags.location.as_ref() {
+    executable_args.push("--location".to_string());
+    executable_args.push(url.to_string());
+  }
   if let Some(ca_file) = flags.ca_file {
     executable_args.push("--cert".to_string());
     executable_args.push(ca_file)